[SCM] Debian package checker branch, master, updated. 2.2.2-8-g7146de6
The following commit has been merged in the master branch:
commit 7146de6f7f306599963208464e4123871090a50f
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Fri Feb 6 09:45:23 2009 +0000
Remove support for non-US, which has been obsolete for a long time.
The non-US archive section was obsoleted nearly four years and three
stable releases ago. As it's no longer a valid section, there's
also little point in complaining about its capitalisation.
Also remove the non-us testset package. There were a couple of tags
which were only being tested here, which have been moved to the debug
testset package in the short term but should be merged in to the new
style testset.
diff --git a/checks/common_data.pm b/checks/common_data.pm
index 6105b4e..e9de364 100644
--- a/checks/common_data.pm
+++ b/checks/common_data.pm
@@ -71,7 +71,7 @@ use vars qw
%known_non_us_parts = map { $_ => 1 } ('non-free', 'contrib', 'main' );
%known_archive_parts = map { $_ => 1 }
- ('non-free', 'contrib', 'non-US', 'non-us' );
+ ('non-free', 'contrib');
%known_prios = map { $_ => 1 }
('required', 'important', 'standard', 'optional', 'extra');
diff --git a/checks/fields b/checks/fields
index f17e4c0..b130f93 100644
--- a/checks/fields
+++ b/checks/fields
@@ -332,12 +332,7 @@ if (not defined $info->field('section')) {
} else {
my @parts = split /\//, $section, 2;
- if ($parts[0] =~ /non-US/i) {
- tag "non-us-spelling", "" if ($parts[0] ne "non-US");
- if ($parts[1] and not $known_non_us_parts{$parts[1]}) {
- tag "unknown-section", "$section";
- }
- } elsif (scalar @parts > 1) {
+ if (scalar @parts > 1) {
tag "unknown-section", "$section" unless $known_archive_parts{$parts[0]};
tag "unknown-section", "$section" unless $known_sections{$parts[1]};
} elsif ($parts[0] eq 'unknown') {
diff --git a/checks/fields.desc b/checks/fields.desc
index 104fae5..64913f5 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -415,11 +415,6 @@ Info: This package has the Essential flag set. New Essential packages
be discussed on debian-devel first.
Ref: policy 3.8
-Tag: non-us-spelling
-Severity: minor
-Certainty: certain
-Info: Although non-us works for a section name, non-US is preferred.
-
Tag: doc-package-depends-on-main-package
Severity: normal
Certainty: possible
diff --git a/debian/changelog b/debian/changelog
index ef9ccce..e36fdbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
lintian (2.2.3) UNRELEASED; urgency=low
+ * Summary of tag changes:
+ + Removed
+ - non-us-spelling
+
+ * checks/common-data.pm:
+ + [ADB] Remove the obsolete non-US from the list of recognised archive
+ sections.
* checks/copyright-file:
+ [RA] Treat License: GPL-2+ as "GPL version 2 or later" for the
purposes of the check for a correctly versioned license reference.
@@ -10,6 +17,9 @@ lintian (2.2.3) UNRELEASED; urgency=low
no practical effect on the Debian package. Wishlist implies that
a wishlist bug against the package would be appropriate, which
seems too strong.
+ * checks/fields{,.desc}:
+ + [ADB] Remove checks for the capitalisation of the obsolete non-US
+ archive section.
* checks/files:
+ [ADB] Don't report duplicate-font-file for udebs. Patch by Raphael
Geissert. (Closes: #514095)
diff --git a/testset/debug/debian/changelog b/testset/debug/debian/changelog
index d00c574..3e50d33 100644
--- a/testset/debug/debian/changelog
+++ b/testset/debug/debian/changelog
@@ -1,6 +1,12 @@
debug (1.0) unstable; urgency=low
* NMU.
+ (uploaded by the maintainer and with repeated version number)
+
+ -- Russ Allbery <rra@debian.org> Tue, 4 Apr 2006 20:27:22 +0000
+
+debug (1.0) unstable; urgency=low
+
* Initial version.
-- Russ Allbery <rra@debian.org> Sat, 4 Mar 2006 21:31:06 -0800
diff --git a/testset/debug/debian/rules b/testset/debug/debian/rules
index a40c380..26e777e 100755
--- a/testset/debug/debian/rules
+++ b/testset/debug/debian/rules
@@ -35,7 +35,7 @@ binary-arch: DH_OPTIONS=-a
binary-arch: build-stamp install
dh_testdir
dh_testroot
- dh_installchangelogs
+ dh_installchangelogs -N hello-dbg
dh_installdocs
DH_OPTIONS= dh_strip -phello --dbg-package=hello-dbg
DH_OPTIONS= dh_strip -plibhello0 --dbg-package=libhello0-dbg
diff --git a/testset/non-us/debian/changelog b/testset/non-us/debian/changelog
deleted file mode 100644
index 41a9f5b..0000000
--- a/testset/non-us/debian/changelog
+++ /dev/null
@@ -1,11 +0,0 @@
-non-us (1) unstable; urgency=low
-
- * Another initial version.
-
- -- Russ Allbery <rra@debian.org> Mon, 03 Dec 2007 23:42:09 -0800
-
-non-us (1) unstable; urgency=low
-
- * Initial version
-
- -- Sean 'Shaleh' Perry <shaleh@debian.org> Wed, 31 Jan 2001 14:27:20 -0800
diff --git a/testset/non-us/debian/control b/testset/non-us/debian/control
deleted file mode 100644
index 54dc300..0000000
--- a/testset/non-us/debian/control
+++ /dev/null
@@ -1,47 +0,0 @@
-Source: non-us
-Priority: optional
-Maintainer: Lintian Maintainer <lintian-maint@debian.org>
-Uploaders: Sean 'Shaleh' Perry <shaleh@debian.org>,
- Russ Allbery <rra@debian.org>
-Standards-Version: 3.1.1
-
-Package: patented-app
-Architecture: all
-Section: non-us
-Description: test for non-us checks
- non-US test.
- .
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package.
-
-Package: crypto-app
-Architecture: all
-Section: non-US
-Description: proper non-US app
- A proper non-US app.
- .
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package.
-
-Package: broken-crypto
-Architecture: all
-Section: non-US/admin
-Description: broken non-US app
- A broken non-US app.
- .
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package.
-
-Package: nonfree-crypto-app
-Architecture: all
-Section: non-US/non-free
-Description: proper non-US/non-free app
- A proper non-US/non-free app.
- .
- This is a test package designed to exercise some feature or tag of
- Lintian. It is part of the Lintian test suite and may do very odd
- things. It should not be installed like a regular package.
-
diff --git a/testset/non-us/debian/rules b/testset/non-us/debian/rules
deleted file mode 100755
index e4b34c1..0000000
--- a/testset/non-us/debian/rules
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/make -f
-
-PATENT=patented-app
-CRYPTO=crypto-app
-BROKEN=broken-crypto
-NONFREE=nonfree-crypto-app
-
-build:
-
-binary-arch:
-
-binary-indep:
- # patented-app
- install -d debian/$(PATENT)-tmp/DEBIAN
- install -d debian/$(PATENT)-tmp/usr/share/doc/$(PATENT)
- gzip -9c debian/changelog > debian/$(PATENT)-tmp/usr/share/doc/$(PATENT)/changelog.gz
- dpkg-gencontrol -isp -p$(PATENT) -Pdebian/$(PATENT)-tmp
- dpkg --build debian/$(PATENT)-tmp ..
-
- # crypto-app
- install -d debian/$(CRYPTO)-tmp/DEBIAN
- install -d debian/$(CRYPTO)-tmp/usr/share/doc/$(CRYPTO)
- echo '© 2000' > debian/$(CRYPTO)-tmp/usr/share/doc/$(CRYPTO)/copyright
- dpkg-gencontrol -isp -p$(CRYPTO) -Pdebian/$(CRYPTO)-tmp
- dpkg --build debian/$(CRYPTO)-tmp ..
-
- # broken-crypto
- install -d debian/$(BROKEN)-tmp/DEBIAN
- dpkg-gencontrol -isp -p$(BROKEN) -Pdebian/$(BROKEN)-tmp
- dpkg --build debian/$(BROKEN)-tmp ..
-
- # nonfree-crypto-app
- install -d debian/$(NONFREE)-tmp/DEBIAN
- dpkg-gencontrol -isp -p$(NONFREE) -Pdebian/$(NONFREE)-tmp
- dpkg --build debian/$(NONFREE)-tmp ..
-
-binary: binary-arch binary-indep
-
-clean:
-
-.PHONY: build binary-arch binary-indep binary clean
diff --git a/testset/tags.debug b/testset/tags.debug
index 5cc53bb..1ca31de 100644
--- a/testset/tags.debug
+++ b/testset/tags.debug
@@ -1,5 +1,6 @@
E: debug source: build-depends-indep-without-arch-indep
E: debug source: version-substvar-for-external-package libhello0-dbg -> libhello
+E: hello-dbg: changelog-file-missing-in-native-package
E: hello: pkg-has-symbols-control-file-but-no-shared-libs
E: hello: statically-linked-binary ./usr/bin/hello.dbg
E: hello: unstripped-binary-or-object ./usr/bin/hello.dbg
@@ -24,11 +25,16 @@ W: debug source: dbg-package-missing-depends hi-dbg
W: debug source: dbg-package-missing-depends libhello0-dbg
W: debug source: debhelper-script-needs-versioned-build-depends dh_icons (>= 5.0.51~)
W: debug source: debian-rules-sets-DH_COMPAT line 5
-W: debug source: timewarp-standards-version (2006-03-05 < 2006-04-26)
+W: debug source: timewarp-standards-version (2006-04-04 < 2006-04-26)
+W: hello-hello-dbg: latest-debian-changelog-entry-without-new-version
W: hello: binary-without-manpage usr/bin/hello
W: hello: binary-without-manpage usr/bin/hello.dbg
+W: hello: latest-debian-changelog-entry-without-new-version
+W: hi-dbg: latest-debian-changelog-entry-without-new-version
W: libhello0-dbg: debug-file-should-use-detached-symbols ./usr/lib/debug/lib/libhello.so.0.0
+W: libhello0-dbg: latest-debian-changelog-entry-without-new-version
W: libhello0-dbg: shared-lib-without-dependency-information ./usr/lib/libhello.so.dbg
+W: libhello0: latest-debian-changelog-entry-without-new-version
W: libhello0: symbols-declares-dependency-on-other-package hello-dbg
W: libhello0: symbols-declares-dependency-on-other-package libhello0c2 (>= 1.2)
W: libhello0: symbols-declares-dependency-on-other-package libhello2 #MINVER#
diff --git a/testset/tags.non-us b/testset/tags.non-us
deleted file mode 100644
index 9156baf..0000000
--- a/testset/tags.non-us
+++ /dev/null
@@ -1,13 +0,0 @@
-E: broken-crypto: no-copyright-file
-E: crypto-app: changelog-file-missing-in-native-package
-E: non-us source: section-category-mismatch Package broken-crypto
-E: non-us source: section-category-mismatch Package nonfree-crypto-app
-E: nonfree-crypto-app: no-copyright-file
-E: patented-app: no-copyright-file
-I: crypto-app: no-md5sums-control-file
-I: patented-app: no-md5sums-control-file
-W: broken-crypto: unknown-section non-US/admin
-W: non-us source: ancient-standards-version 3.1.1 (current is 3.8.0)
-W: non-us source: no-section-field-for-source
-W: patented-app: latest-debian-changelog-entry-without-new-version
-W: patented-app: non-us-spelling
--
Debian package checker
Reply to: