[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.0-rc1-18-gd831bb1



The following commit has been merged in the master branch:
commit d831bb1a93e9b26c29119778c4878c050c731adb
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Mar 22 21:58:39 2011 +0100

    Removed dh commands that are satisfied in oldstable

diff --git a/checks/debhelper b/checks/debhelper
index 30e5199..d4b1e53 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -45,16 +45,7 @@ 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                 => '7',
-       dh_auto_configure  => '7',
-       dh_auto_build      => '7',
-       dh_auto_clean      => '7',
-       dh_auto_install    => '7',
-       dh_bugfiles        => '7.2.3~',
-       dh_icons           => '5.0.51~',
-       dh_installifupdown => '5.0.44~',
-       dh_lintian         => '6.0.7~',
-       dh_prep            => '7');
+    = (dh_bugfiles        => '7.2.3~');
 
 sub run {
 
@@ -151,7 +142,6 @@ while (<RULES>) {
 	$seencommand = 1;
 	$needbuilddepends = 1;
 	$needtomodifyscripts = 1;
-	push (@versioncheck, 'dh');
     } elsif (m,^include\s+/usr/share/cdbs/1/rules/debhelper.mk,) {
 	$seencommand = 1;
 	$needbuilddepends = 1;
diff --git a/debian/changelog b/debian/changelog
index 5284e2a..0820889 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ lintian (2.5.0~rc2) UNRELEASED; urgency=low
       replaces package-lacks-versioned-build-depends-on-debhelper old
       task of warning if a missing versioned depends may lead to a build
       failure.  Currently this is only emitted for compat 8 (or higher).
+    + [NT] Stopped emitting tags for using dh_* (and dh) if these scripts
+      is in debhelper 7 (or earlier).
   * checks/fields{,.desc}:
     + [NT] Recognise Multi-Arch as a known binary field.  (Closes: #617816)
     + [NT] Fixed typo in a tag description.
diff --git a/t/tests/debhelper-dh-depends/debian/debian/rules b/t/tests/debhelper-dh-depends/debian/debian/rules
index 1c04f36..ddf20e4 100755
--- a/t/tests/debhelper-dh-depends/debian/debian/rules
+++ b/t/tests/debhelper-dh-depends/debian/debian/rules
@@ -28,6 +28,7 @@ binary-indep: install-stamp
 	dh_icons
 	dh_installifupdown
 	dh_lintian
+	dh_bugfiles
 	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 90eadce..e5201a5 100644
--- a/t/tests/debhelper-dh-depends/tags
+++ b/t/tests/debhelper-dh-depends/tags
@@ -1,9 +1 @@
-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)
+W: debhelper-dh-depends source: debhelper-script-needs-versioned-build-depends dh_bugfiles (>= 7.2.3~)
diff --git a/testset/tags.debug b/testset/tags.debug
index 8f4ee1d..a842199 100644
--- a/testset/tags.debug
+++ b/testset/tags.debug
@@ -26,7 +26,6 @@ W: debug source: dbg-package-missing-depends hi-dbg
 W: debug source: dbg-package-missing-depends libhello0-dbg
 W: debug source: debhelper-but-no-misc-depends hello-hello-dbg
 W: debug source: debhelper-but-no-misc-depends hi-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-04-04 < 2006-04-26)
 W: hello-hello-dbg: latest-debian-changelog-entry-without-new-version

-- 
Debian package checker


Reply to: