The following commit has been merged in the master branch:
commit eaa52fe448e16e36d2e22235c0353f56ce84f090
Author: Russ Allbery <[email protected]>
Date: Sat Jan 3 14:51:44 2009 -0800
Add dh_auto_* and dh_prep to debhelper version checks
* checks/debhelper{,.desc}:
+ [RA] Add dh_auto_* and dh_prep to the debhelper scripts that require
a particular version of debhelper.
+ [RA] De-duplicate the list of scripts with specific version
requirements before issuing tags.
diff --git a/checks/debhelper b/checks/debhelper
index a32fe0f..1737b72 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -42,11 +42,15 @@ my $filename_configs = Lintian::Data->new
('debhelper/filename-config-files');
# one of these commands must have a dependency on that version of debhelper or
# newer.
my %versions
- = (dh_icons => '5.0.51~',
+ = (dh => '7',
+ dh_auto_configure => '7',
+ dh_auto_build => '7',
+ dh_auto_clean => '7',
+ dh_auto_install => '7',
+ dh_icons => '5.0.51~',
dh_installifupdown => '5.0.44~',
dh_lintian => '6.0.7~',
- dh => '7');
-
+ dh_prep => '7');
sub run {
@@ -271,6 +275,8 @@ if ($needversiondepends < 4) {
} elsif ($needversiondepends > 5 and ! Dep::implies($bdepends,
Dep::parse("debhelper (>= $needversiondepends)"))) {
tag "package-lacks-versioned-build-depends-on-debhelper",
$needversiondepends;
} elsif (@versioncheck) {
+ my %seen;
+ @versioncheck = grep { !$seen{$_}++ } @versioncheck;
for my $program (@versioncheck) {
my $required = $versions{$program};
tag 'debhelper-script-needs-versioned-build-depends', $program, "(>=
$required)"
diff --git a/debian/changelog b/debian/changelog
index 56959aa..5e03f2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,10 @@ lintian (2.1.4) UNRELEASED; urgency=low
+ [ADB] Warn about packages declaring a debhelper compatibility level
of 7 or above and using dh_clean -k, which has been deprecated in
favour of dh_prep.
+ + [RA] Add dh_auto_* and dh_prep to the debhelper scripts that require
+ a particular version of debhelper.
+ + [RA] De-duplicate the list of scripts with specific version
+ requirements before issuing tags.
* checks/fields:
+ [RA] dh-make-php provides a CDBS rule fragment and hence should go
into Build-Depends, not Build-Depends-Indep. Thanks, Mathieu
diff --git a/t/COVERAGE b/t/COVERAGE
index 5b57dd5..c639a89 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,4 +1,4 @@
-Last generated 2009-01-01
+Last generated 2009-01-03
The following tags are not tested by the test suite:
@@ -367,7 +367,6 @@ debconf using-first-person-in-templates
debconf using-imperative-form-in-templates
debconf using-question-in-extended-description-in-templates
-debhelper debhelper-script-needs-versioned-build-depends
debhelper declares-possibly-conflicting-debhelper-compat-versions
debhelper uses-dh-python-with-no-pycompat
diff --git a/t/tests/6000_debhelper-dh-depends.desc
b/t/tests/6000_debhelper-dh-depends.desc
new file mode 100644
index 0000000..bd9bd65
--- /dev/null
+++ b/t/tests/6000_debhelper-dh-depends.desc
@@ -0,0 +1,4 @@
+Testname: debhelper-dh-depends
+Version: 1.0
+Description: Test required dependencies for dh* scripts
+Test-For: debhelper-script-needs-versioned-build-depends
diff --git a/debian/compat b/t/tests/debhelper-dh-depends/debian/debian/compat
similarity index 100%
copy from debian/compat
copy to t/tests/debhelper-dh-depends/debian/debian/compat
diff --git a/t/templates/skel/debian/control.in
b/t/tests/debhelper-dh-depends/debian/debian/control.in
similarity index 92%
copy from t/templates/skel/debian/control.in
copy to t/tests/debhelper-dh-depends/debian/debian/control.in
index f8f5c04..719f55b 100644
--- a/t/templates/skel/debian/control.in
+++ b/t/tests/debhelper-dh-depends/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 5)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/debhelper-dh-depends/debian/debian/rules
b/t/tests/debhelper-dh-depends/debian/debian/rules
new file mode 100755
index 0000000..1c04f36
--- /dev/null
+++ b/t/tests/debhelper-dh-depends/debian/debian/rules
@@ -0,0 +1,33 @@
+#!/usr/bin/make -f
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+ dh_auto_configure
+ dh_auto_build
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ dh_auto_clean
+ dh_clean
+
+install: install-stamp
+install-stamp: build-stamp
+ dh_testdir
+ dh_testroot
+ dh_prep
+ dh_auto_install
+ touch $@
+
+binary: binary-arch binary-indep
+binary-arch:
+binary-indep: install-stamp
+ dh binary-indep --until dh_prep
+ dh_icons
+ dh_installifupdown
+ dh_lintian
+ 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
new file mode 100644
index 0000000..90eadce
--- /dev/null
+++ b/t/tests/debhelper-dh-depends/tags
@@ -0,0 +1,9 @@
+W: debhelper-dh-depends source: debhelper-script-needs-versioned-build-depends
dh (>= 7)
+W: debhelper-dh-depends source: debhelper-script-needs-versioned-build-depends
dh_auto_build (>= 7)
+W: debhelper-dh-depends source: debhelper-script-needs-versioned-build-depends
dh_auto_clean (>= 7)
+W: debhelper-dh-depends source: debhelper-script-needs-versioned-build-depends
dh_auto_configure (>= 7)
+W: debhelper-dh-depends source: debhelper-script-needs-versioned-build-depends
dh_auto_install (>= 7)
+W: debhelper-dh-depends source: debhelper-script-needs-versioned-build-depends
dh_icons (>= 5.0.51~)
+W: debhelper-dh-depends source: debhelper-script-needs-versioned-build-depends
dh_installifupdown (>= 5.0.44~)
+W: debhelper-dh-depends source: debhelper-script-needs-versioned-build-depends
dh_lintian (>= 6.0.7~)
+W: debhelper-dh-depends source: debhelper-script-needs-versioned-build-depends
dh_prep (>= 7)
--
Debian package checker
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
