[SCM] Debian package checker branch, master, updated. 2.2.0-46-ge210ecf
The following commit has been merged in the master branch:
commit e210ecfd0e454bab3d2c645ba034547cb9877c6c
Author: Russ Allbery <rra@debian.org>
Date: Sat Jan 31 18:33:27 2009 -0800
Changelog and description tweaks to debhelper checks
Add changelog entries for the debhelper checks. Shorten the tag names
slightly and improve the long description. Tweak the test suite
accordingly and note that one of the new checks also checks another tag.
diff --git a/checks/debhelper b/checks/debhelper
index a4069be..a5f4c0c 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -176,7 +176,7 @@ if (-f 'debfiles/compat') {
if ($compat) {
chomp $compat;
if ($compat !~ m/^\d+$/) {
- tag 'debhelper-compat-is-not-a-number', $compat;
+ tag 'debhelper-compat-not-a-number', $compat;
$compat =~ s/[^\d]//g;
$compatnan = 1;
}
@@ -193,7 +193,7 @@ if (-f 'debfiles/compat') {
}
}
if ($needversiondepends !~ m/^\d+$/ and not $compatnan) {
- tag 'debhelper-compatibility-version-is-not-a-number', $needversiondepends;
+ tag 'debhelper-compatibility-level-not-a-number', $needversiondepends;
$needversiondepends =~ s/[^\d]//g;
$compatnan = 1;
}
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index 8688396..268dae2 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -162,12 +162,18 @@ Info: The source package declares a weak dependecy on ${misc:Depends} in
is one that ensures the package's installation, is required so that the
additional commands are available to the maintainer scripts when they are run.
-Tag: debhelper-compat-is-not-a-number
-Severity: serious
-Certainty: possible
-Info: The compat version specified in <tt>debian/compat</tt> is not a number.
+Tag: debhelper-compat-not-a-number
+Severity: important
+Certainty: certain
+Ref: debhelper(7)
+Info: The debhelper compatibility level specified in
+ <tt>debian/compat</tt> is not a number.
-Tag: debhelper-compatibility-version-is-not-a-number
-Severity: serious
+Tag: debhelper-compatibility-level-not-a-number
+Severity: important
Certainty: possible
-Info: The compatibility version specified in <tt>debian/rules</tt> is not a number.
+Info: The debhelper compatibility level specified in <tt>debian/rules</tt>
+ is not a number. If you're using make functions or other more complex
+ methods to generate the compatibility level, write the output into
+ <tt>debian/compat</tt> instead of setting DH_COMPAT. The latter should
+ be available for a user to override temporarily.
diff --git a/debian/changelog b/debian/changelog
index 846e1b3..39ea5ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ lintian (2.2.1) UNRELEASED; urgency=low
+ Added
- copyright-refers-to-symlink-license (pedantic)
- copyright-refers-to-versionless-license-file
+ - debhelper-compat-not-a-number
+ - debhelper-compatibility-level-not-a-number
- duplicate-font-file
- font-in-non-font-package
@@ -11,9 +13,14 @@ lintian (2.2.1) UNRELEASED; urgency=low
+ [RA] Add checks for references to the versionless FSF license files,
pedantic if the package license allows relicensing under later
versions. Patch from Raphael Geissert. (Closes: #497346)
- * checks/debhelper:
+ * checks/debhelper{,.desc}:
+ [RA] Use binary_field() to read control fields for binary packages.
Patch from Raphael Geissert.
+ + [RA] Read only the first line of debian/compat, matching debhelper's
+ behavior. Improve the parsing of DH_COMPAT to pick up values that
+ aren't numbers. Warn of compatibility levels that aren't numbers.
+ Use the same compatibility level that debhelper would use in some
+ other checks. Patch from Raphael Geissert. (Closes: #513767)
* checks/fields:
+ [RA] Allow but do not require a libmodule-build-perl dependency if
the Build script is referenced in clean. Thanks, Charles Plessy and
@@ -37,6 +44,9 @@ lintian (2.2.1) UNRELEASED; urgency=low
requesting generation of a symbols file.
+ [RA] Provide details on how to manually check some of the shared
library problems that Lintian diagnoses. (Closes: #513086)
+ * checks/standards-version:
+ + [RA] Be robust against unparsable timestamps in changelog files.
+ Patch from Raphael Geissert.
* checks/version-substvars:
+ [RA] Use binary_field() to read control fields for binary packages.
Patch from Raphael Geissert.
diff --git a/t/COVERAGE b/t/COVERAGE
index 8e66d8a..7d69a58 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,4 +1,4 @@
-Last generated 2009-01-24
+Last generated 2009-02-01
The following tags are not tested by the test suite:
@@ -338,7 +338,6 @@ debconf using-first-person-in-templates
debconf using-imperative-form-in-templates
debconf using-question-in-extended-description-in-templates
-debhelper declares-possibly-conflicting-debhelper-compat-versions
debhelper uses-dh-python-with-no-pycompat
debian-readme readme-debian-contains-debmake-default-email-address
diff --git a/t/tests/debhelper-compat/desc b/t/tests/debhelper-compat/desc
index 503ee69..832c64f 100644
--- a/t/tests/debhelper-compat/desc
+++ b/t/tests/debhelper-compat/desc
@@ -2,4 +2,4 @@ Testname: debhelper-compat
Sequence: 6000
Version: 1.0
Description: Test the content of debian/compat
-Test-For: debhelper-compat-is-not-a-number
+Test-For: debhelper-compat-not-a-number
diff --git a/t/tests/debhelper-compat/tags b/t/tests/debhelper-compat/tags
index 283d75a..f5c9357 100644
--- a/t/tests/debhelper-compat/tags
+++ b/t/tests/debhelper-compat/tags
@@ -1 +1 @@
-E: debhelper-compat source: debhelper-compat-is-not-a-number [7-
+E: debhelper-compat source: debhelper-compat-not-a-number [7-
diff --git a/t/tests/debhelper-dh-compat/desc b/t/tests/debhelper-dh-compat/desc
index 678c159..0d3ff35 100644
--- a/t/tests/debhelper-dh-compat/desc
+++ b/t/tests/debhelper-dh-compat/desc
@@ -2,4 +2,7 @@ Testname: debhelper-dh-compat
Sequence: 6000
Version: 1.0
Description: Test the value of DH_COMPAT
-Test-For: debhelper-compatibility-version-is-not-a-number
+Test-For:
+ debhelper-compatibility-level-not-a-number
+ debian-rules-sets-DH_COMPAT
+ declares-possibly-conflicting-debhelper-compat-versions
diff --git a/t/tests/debhelper-dh-compat/tags b/t/tests/debhelper-dh-compat/tags
index bac2af5..6d6a9b6 100644
--- a/t/tests/debhelper-dh-compat/tags
+++ b/t/tests/debhelper-dh-compat/tags
@@ -1,4 +1,4 @@
-E: debhelper-dh-compat source: debhelper-compatibility-version-is-not-a-number '{3'
+E: debhelper-dh-compat source: debhelper-compatibility-level-not-a-number '{3'
E: debhelper-dh-compat source: declares-possibly-conflicting-debhelper-compat-versions rules='{3' compat=7
W: debhelper-dh-compat source: debian-rules-sets-DH_COMPAT line 3
W: debhelper-dh-compat source: package-uses-deprecated-debhelper-compat-version 3
--
Debian package checker
Reply to: