[SCM] Debian package checker branch, master, updated. 2.5.3-7-ge365bdd
The following commit has been merged in the master branch:
commit e365bddbb7b9069cc59659469723299f102f1d0e
Author: Niels Thykier <niels@thykier.net>
Date: Wed Sep 14 14:43:47 2011 +0200
Check versions on dependencies for some dh_commands
diff --git a/checks/debhelper b/checks/debhelper
index 533ea1e..b3ca709 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -41,12 +41,16 @@ my $maint_commands = Lintian::Data->new ('debhelper/maint_commands');
my $dh_commands_depends = Lintian::Data->new ('debhelper/dh_commands', '=');
my $filename_configs = Lintian::Data->new ('debhelper/filename-config-files');
my $dh_alt_deps = Lintian::Data->new ('debhelper/alt-dh_commands', '\|\|');
+my $dh_ver_deps = Lintian::Data->new ('debhelper/dh_commands-versions', qr/\|\|/o);
# The version at which debhelper commands were introduced. Packages that use
# one of these commands must have a dependency on that version of debhelper or
# newer.
-my %versions
- = (dh_bugfiles => '7.2.3~');
+my %versions = (
+ dh_bugfiles => '7.2.3~',
+ dh_installgsettings => '8.1.3~',
+ dh_ucf => '8.1.5~',
+);
sub run {
@@ -130,7 +134,10 @@ while (<RULES>) {
# maintainer knows what they're doing and don't check build
# dependencies.
unless ($maybe_skipping) {
- if ($dh_commands_depends->known($dhcommand)) {
+ if ($dh_ver_deps->known ($dhcommand)) {
+ my $dep = $dh_ver_deps->value($dhcommand);
+ $missingbdeps{$dep} = $dhcommand;
+ } elsif ($dh_commands_depends->known($dhcommand)) {
my $dep = $dh_commands_depends->value($dhcommand);
my $alt = $dh_alt_deps->value($dhcommand)//'';
diff --git a/data/debhelper/alt-dh_commands b/data/debhelper/alt-dh_commands
index 9c8acf5..4af13a1 100644
--- a/data/debhelper/alt-dh_commands
+++ b/data/debhelper/alt-dh_commands
@@ -1,7 +1,11 @@
# Manually maintained list of dh_commands provided by additional
-# packages beyond the primary one. The format is:
+# packages beyond the primary one. The format is:
#
-# dh_X || dep1 | dep2
+# dh_X||dep1 | dep2
+#
+# Note spaces are not allowed around the "||"-separator
+#
+# Please do not use this together with dh_commands-versions.
#
# Please keep this sorted.
diff --git a/data/debhelper/dh_commands-versions b/data/debhelper/dh_commands-versions
new file mode 100644
index 0000000..9b403f0
--- /dev/null
+++ b/data/debhelper/dh_commands-versions
@@ -0,0 +1,25 @@
+# Manually maintained list of dh_commands that requires a versioned
+# dependency *AND* are not provided by debhelper. Commands provided
+# by debhelper is handled in checks/debhelper.
+#
+# dh_X||dependency
+#
+# Note spaces are not allowed around the "||"-separator.
+#
+# The dh_X is the dh_command and the dependency is the full dependency
+# (including both package and version). This overrules any thing
+# listed in dh_commands (which is auto-generated). Please do not use
+# this together with alt-dh_commands!
+#
+# Please keep this sorted.
+
+dh_dpatch_patch||dpatch (>= 2.0.32~)
+dh_dpatch_unpatch||dpatch (>= 2.0.32~)
+dh_haskell_extra_depends||haskell-devscripts (>= 0.8.8~)
+dh_lv2config||lv2core (>= 4.0-2~)
+dh_pyppd||pyppd (>= 0.4.9-3~)
+dh_python-ply||python-ply (>= 3.4-1~)
+dh_sphinxdoc||python-sphinx (>= 1.0.7+dfsg)
+dh_xsf_substvars||xserver-xorg-dev (>= 2:1.9.4-1~)
+
+
diff --git a/debian/changelog b/debian/changelog
index 2c37056..392295a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
lintian (2.5.4) UNRELEASED; urgency=low
+ * checks/dehelper:
+ + [JW,NT] Check for versioned dependencies for some dh_commands.
+ (Closes: #641035)
+
* data/debhelper/{dh_commands,maint_commands,miscDepends_commands}:
+ [NT] Refreshed.
+ * data/debhelper/dh_commands-versions:
+ + [NT] New file.
* lib/Lab.pm:
+ [NT] Updated it to use Lintian::Output::verbosity_level rather
diff --git a/t/tests/debhelper-deprecated/debian/debian/control.in b/t/tests/debhelper-deprecated/debian/debian/control.in
index bbf55b3..e877baa 100644
--- a/t/tests/debhelper-deprecated/debian/debian/control.in
+++ b/t/tests/debhelper-deprecated/debian/debian/control.in
@@ -3,7 +3,7 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~), python-central
+Build-Depends: debhelper (>= 7.0.50~), python-central, python-ply (>= 3.4-1~)
Package: {$srcpkg}
Architecture: {$architecture}
diff --git a/t/tests/debhelper-no-depends/debian/debian/rules b/t/tests/debhelper-no-depends/debian/debian/rules
index 4bb88d6..fba393d 100755
--- a/t/tests/debhelper-no-depends/debian/debian/rules
+++ b/t/tests/debhelper-no-depends/debian/debian/rules
@@ -9,6 +9,8 @@ binary-indep:
-dh_clideps
-dh_gtkmodules
dh_lisp || true
+ # Should trigger a versioned dependency requirement for dpatch
+ -dh_dpatch_patch
# We don't warn about commands inside make conditionals, so none of these
# get any warnings.
ifeq "$(USE_DH_PYTHON2)" "y"
diff --git a/t/tests/debhelper-no-depends/tags b/t/tests/debhelper-no-depends/tags
index 15ba194..9894003 100644
--- a/t/tests/debhelper-no-depends/tags
+++ b/t/tests/debhelper-no-depends/tags
@@ -1,5 +1,6 @@
E: debhelper-no-depends source: missing-build-dependency debhelper
E: debhelper-no-depends source: missing-build-dependency-for-dh_-command dh_clideps=cli-common-dev
+E: debhelper-no-depends source: missing-build-dependency-for-dh_-command dh_dpatch_patch=dpatch (>= 2.0.32~)
E: debhelper-no-depends source: missing-build-dependency-for-dh_-command dh_gtkmodules=libgtk2.0-dev
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
--
Debian package checker
Reply to: