[SCM] Debian package checker branch, master, updated. 2.5.10-117-gc015b55
The following commit has been merged in the master branch:
commit c015b55098a5cc7a990c474f5705f3681fcc845d
Author: Niels Thykier <niels@thykier.net>
Date: Tue Aug 14 23:30:46 2012 +0200
c/debhelper: Bump PEDANTIC_COMPAT to 8
Bump the PEDANTIC_COMPAT to 8 as it is satisfied in all supported
versions of Debian. Also drop the check for missing versioned
dependency for "override" targets as it is guaranteed to be available
in debhelper 8+.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/debhelper b/checks/debhelper
index e285dba..9d5bc61 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -29,7 +29,7 @@ use Lintian::Util qw(fail slurp_entire_file);
# If compat is less than or equal to this, then a missing version
# for this level is only a pedantic issue.
-use constant PEDANTIC_COMPAT => 7;
+use constant PEDANTIC_COMPAT => 8;
# If there is no debian/compat file present but cdbs is being used, cdbs will
# create one automatically. Currently it always uses compatibility level 5.
@@ -48,7 +48,6 @@ my $dh_addons_manual = Lintian::Data->new ('debhelper/dh_addons-manual', qr/\|\|
# one of these commands must have a dependency on that version of debhelper or
# newer.
my %versions = (
- dh_bugfiles => '7.2.3~',
dh_installgsettings => '8.1.3~',
dh_ucf => '8.1.5~',
);
@@ -70,7 +69,6 @@ my $seenversiondepends = '0';
my $compat = 0;
my $usescdbs = '';
my $seendhcleank = '';
-my $overridetargets = 0;
my %missingbdeps;
my %missingbdeps_addons;
@@ -205,7 +203,6 @@ while (<RULES>) {
$level = $1 if ($level);
} elsif (/^override_dh_/) {
$needbuilddepends = 1;
- $overridetargets = 1;
} elsif (m,^include\s+/usr/share/cdbs/, or m,^include\s+/usr/share/R/debian/r-cran.mk,o){
$inclcdbs = 1;
}
@@ -420,15 +417,6 @@ if (@versioncheck) {
}
}
-if ($overridetargets) {
- my $required = '7.0.50~';
- my $needed = "debhelper (>= $required)";
- unless ($bdepends->implies($needed)) {
- tag 'debhelper-overrides-need-versioned-build-depends',
- "(>= $required)";
- }
-}
-
if ($seenmaintscript) {
my $required = '8.1.0~';
my $needed = "debhelper (>= $required)";
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index 5fe5c72..76be965 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -199,21 +199,6 @@ Info: The given debhelper script was introduced in a later version of
assumes a newer version should explicitly declare so for the sake of
etch backports.
-Tag: debhelper-overrides-need-versioned-build-depends
-Severity: normal
-Certainty: certain
-Ref: dh(1)
-Info: The override targets facility in debhelper, involving debian/rules
- targets that begin with "override_dh_", was introduced in a later version
- of debhelper than the package Build-Depends on. The package Build-Depends
- should be updated to require at least debhelper 7.0.50. Giving the version
- followed by <tt>~</tt> is recommended so that backports will satisfy the
- dependency.
- .
- lenny was released with debhelper version 7.0.15, so every package that
- assumes a newer version should explicitly declare so for the sake of lenny
- backports.
-
Tag: debhelper-maintscript-needs-versioned-build-depends
Severity: normal
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 85f36f9..f6a5f64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ lintian (2.5.11) UNRELEASED; urgency=low
+ Removed:
- apparently-truncated-elf-binary
- data.tar.xz-member-without-dpkg-pre-depends
+ - debhelper-overrides-need-versioned-build-depends
- no-source-field
- preinst-uses-dpkg-maintscript-helper-without-predepends
@@ -24,6 +25,11 @@ lintian (2.5.11) UNRELEASED; urgency=low
+ [NT] Detect MS-DOS executables as windows binaries.
* checks/deb-format{,.desc}:
+ [NT] Retire data.tar.xz tag. (Closes: #680391)
+ * checks/debhelper{,.desc}:
+ + [JW,NT] Consider missing versioned builde-depennds on
+ debhelper for compat 8 (or less) a pedantic issue.
+ (Closes: #681894)
+ + [NT] Retire debhelper-overrides-need-versioned-build-depends.
* checks/fields{,.desc}:
+ [NT] Mention that cme can automate fixing some perl
related tags. Thanks to gregor herrmann for the report
diff --git a/t/COVERAGE b/t/COVERAGE
index ad3a420..c41f19c 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2012-07-25
-Coverage (Tags): 878/962 (91.27%), w. legacy tests: 945/962 (98.23%)
+Last generated 2012-08-14
+Coverage (Tags): 877/961 (91.26%), w. legacy tests: 944/961 (98.23%)
Coverage (Checks): 33/41 (80.49%), w. legacy tests: 36/41 (87.80%)
The following tags are not tested by the test suite:
diff --git a/t/tests/debhelper-dh-depends/debian/debian/rules b/t/tests/debhelper-dh-depends/debian/debian/rules
index a2b3604..22dcfaa 100755
--- a/t/tests/debhelper-dh-depends/debian/debian/rules
+++ b/t/tests/debhelper-dh-depends/debian/debian/rules
@@ -31,7 +31,7 @@ binary-indep: install-stamp
dh_icons
dh_installifupdown
dh_lintian
- dh_bugfiles
+ -dh_ucf
dh binary-indep --remaining
.PHONY: binary binary-arch binary-indep build clean install
diff --git a/t/tests/debhelper-dh-depends/tags b/t/tests/debhelper-dh-depends/tags
index e5201a5..e581b98 100644
--- a/t/tests/debhelper-dh-depends/tags
+++ b/t/tests/debhelper-dh-depends/tags
@@ -1 +1 @@
-W: debhelper-dh-depends source: debhelper-script-needs-versioned-build-depends dh_bugfiles (>= 7.2.3~)
+W: debhelper-dh-depends source: debhelper-script-needs-versioned-build-depends dh_ucf (>= 8.1.5~)
diff --git a/t/tests/debhelper-no-depends/debian/debian/compat b/t/tests/debhelper-no-depends/debian/debian/compat
index 45a4fb7..ec63514 100644
--- a/t/tests/debhelper-no-depends/debian/debian/compat
+++ b/t/tests/debhelper-no-depends/debian/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/t/tests/debhelper-no-depends/tags b/t/tests/debhelper-no-depends/tags
index cafc814..2b9043b 100644
--- a/t/tests/debhelper-no-depends/tags
+++ b/t/tests/debhelper-no-depends/tags
@@ -5,5 +5,5 @@ E: debhelper-no-depends source: missing-build-dependency-for-dh_-command dh_gtkm
E: debhelper-no-depends source: missing-build-dependency-for-dh_-command dh_lisp => dh-lisp
E: debhelper-no-depends source: package-uses-debhelper-but-lacks-build-depends
W: debhelper-no-depends source: debhelper-but-no-misc-depends debhelper-no-depends
-W: debhelper-no-depends source: package-needs-versioned-debhelper-build-depends 8
+W: debhelper-no-depends source: package-needs-versioned-debhelper-build-depends 9
W: debhelper-no-depends source: weak-dependency-on-misc-depends debhelper-suggests
diff --git a/t/tests/debhelper-override-depends/debian/debian/compat b/t/tests/debhelper-override-depends/debian/debian/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/t/tests/debhelper-override-depends/debian/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/t/tests/debhelper-override-depends/debian/debian/control.in b/t/tests/debhelper-override-depends/debian/debian/control.in
deleted file mode 100644
index 6a076f1..0000000
--- a/t/tests/debhelper-override-depends/debian/debian/control.in
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: {$srcpkg}
-Priority: extra
-Section: {$section}
-Maintainer: {$author}
-Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7)
-
-Package: {$srcpkg}
-Architecture: {$architecture}
-Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
-Description: {$description}
- 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. It may
- be an empty package.
diff --git a/t/tests/debhelper-override-depends/debian/debian/rules b/t/tests/debhelper-override-depends/debian/debian/rules
deleted file mode 100755
index e45c278..0000000
--- a/t/tests/debhelper-override-depends/debian/debian/rules
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/make -f
-%:
- dh $@
-
-override_dh_auto_build:
diff --git a/t/tests/debhelper-override-depends/desc b/t/tests/debhelper-override-depends/desc
deleted file mode 100644
index 1977b77..0000000
--- a/t/tests/debhelper-override-depends/desc
+++ /dev/null
@@ -1,5 +0,0 @@
-Testname: debhelper-override-depends
-Sequence: 6000
-Version: 1.0
-Description: Test dependency requirements for debhelper overrides
-Test-For: debhelper-overrides-need-versioned-build-depends
diff --git a/t/tests/debhelper-override-depends/tags b/t/tests/debhelper-override-depends/tags
deleted file mode 100644
index 9c32d00..0000000
--- a/t/tests/debhelper-override-depends/tags
+++ /dev/null
@@ -1 +0,0 @@
-W: debhelper-override-depends source: debhelper-overrides-need-versioned-build-depends (>= 7.0.50~)
--
Debian package checker
Reply to: