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

[SCM] Debian package checker branch, master, updated. 2.5.4-100-gd78e791



The following commit has been merged in the master branch:
commit d78e7918b7a9fa93049b5c4fe4d78110ae597aae
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jan 22 14:10:04 2012 +0100

    Removed dh_dhelp-is-deprecated tag
    
    The debhelper package no longer ships dh_dhelp (not even in Squeeze).
    According to lintian.d.o, the tag is no longer emitted.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/debhelper b/checks/debhelper
index 09fa822..d14f2b8 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -100,9 +100,6 @@ while (<RULES>) {
     if (m/^\s+-?(dh_\S+)/) {
         my $dhcommand = $1;
 
-        if ($dhcommand eq 'dh_dhelp') {
-            tag 'dh_dhelp-is-deprecated', "line $.";
-        }
         if ($dhcommand eq 'dh_suidregister') {
             tag 'dh_suidregister-is-obsolete', "line $.";
         }
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index c35a4a2..5c8da88 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -63,17 +63,6 @@ Info: This package contains debian/*.ex and/or debian/ex.* files
  package's details and renamed for use by various debhelper commands.
  If they are not being used, they should be removed.
 
-Tag: dh_dhelp-is-deprecated
-Severity: normal
-Certainty: certain
-Info: This package calls dh_dhelp in its <tt>debian/rules</tt> file.
- dh_dhelp is deprecated as it is not part of the canonical debhelper suite
- and due to be removed since it supports only one single documentation
- system (dhelp).
- .
- Simply use dh_installdocs, which creates doc-base files and supports all of
- the documentation systems that way.
-
 Tag: dh_suidregister-is-obsolete
 Severity: normal
 Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index 3e8f104..fa2ecf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ lintian (2.5.5) UNRELEASED; urgency=low
       - preinst-uses-dpkg-maintscript-helper-without-predepends
       - shlib-in-multi-arch-foreign-package
     + Removed:
+      - dh_dhelp-is-deprecated
       - maintainer-script-calls-deprecated-wm-menu-config
       - maintainer-script-does-not-check-for-existence-of-wm-menu-config
       - uploader-address-missing
@@ -36,7 +37,7 @@ lintian (2.5.5) UNRELEASED; urgency=low
   * checks/debconf:
     + [RA] Recognize Perl uses of debconf templates via metaget or
       settitle.
-  * checks/debhelper:
+  * checks/debhelper{,.desc}:
     + [NT] Do not check executable debhelper files for brace
       expansion if compat is 9 (or greater).  It may be allowed by
       tool interpreting the file.
@@ -45,6 +46,9 @@ lintian (2.5.5) UNRELEASED; urgency=low
       reports.  (Closes: #651572, #651330)
     + [NT] Added various dh-exec related checks.  Thanks to Gergely
       Nagy for the patches.  (Closes: #653071)
+    + [NT] Removed tag for using dh_dhelp.  It is not shipped in
+      debhelper anymore (not even Squeeze) and the tag is not
+      emitted anymore (according to lintian.d.o).
   * checks/fields{,.desc}:
     + [JW] Properly handle uploader names with commas.
       (Closes: #485705)
diff --git a/t/COVERAGE b/t/COVERAGE
index c2690f9..7f0c7c4 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
 Last generated 2012-01-22
-Coverage: 789/957 (82.45%), w. legacy tests: 895/957 (93.52%)
+Coverage: 788/956 (82.43%), w. legacy tests: 894/956 (93.51%)
 
 The following tags are not tested by the test suite:
 
diff --git a/t/tests/debhelper-deprecated/debian/debian/rules b/t/tests/debhelper-deprecated/debian/debian/rules
index 7efe7b3..9b0f6e8 100755
--- a/t/tests/debhelper-deprecated/debian/debian/rules
+++ b/t/tests/debhelper-deprecated/debian/debian/rules
@@ -23,7 +23,6 @@ binary-indep:
 	dh_installdocs
 	dh_installmanpages
 	dh_desktop
-	-dh_dhelp
 	dh_scrollkeeper
 	-dh_python # Should trigger a tag
 	-dh_python$(VERSION) # This should not
diff --git a/t/tests/debhelper-deprecated/desc b/t/tests/debhelper-deprecated/desc
index 1dda2b9..cd996b0 100644
--- a/t/tests/debhelper-deprecated/desc
+++ b/t/tests/debhelper-deprecated/desc
@@ -4,7 +4,6 @@ Version: 1.0
 Description: Test for use of deprecated dh_* commands
 Test-For:
  dh_desktop-is-deprecated
- dh_dhelp-is-deprecated
  dh_installmanpages-is-obsolete
  dh_pycentral-is-obsolete
  dh_python-is-obsolete
diff --git a/t/tests/debhelper-deprecated/tags b/t/tests/debhelper-deprecated/tags
index 5f05181..e74a6f7 100644
--- a/t/tests/debhelper-deprecated/tags
+++ b/t/tests/debhelper-deprecated/tags
@@ -1,8 +1,7 @@
 W: debhelper-deprecated source: dh_desktop-is-deprecated line 25
-W: debhelper-deprecated source: dh_dhelp-is-deprecated line 26
 W: debhelper-deprecated source: dh_installmanpages-is-obsolete line 24
-W: debhelper-deprecated source: dh_pycentral-is-obsolete line 31
-W: debhelper-deprecated source: dh_python-is-obsolete line 28
-W: debhelper-deprecated source: dh_scrollkeeper-is-deprecated line 27
-W: debhelper-deprecated source: dh_suidregister-is-obsolete line 41
-W: debhelper-deprecated source: dh_undocumented-is-obsolete line 42
+W: debhelper-deprecated source: dh_pycentral-is-obsolete line 30
+W: debhelper-deprecated source: dh_python-is-obsolete line 27
+W: debhelper-deprecated source: dh_scrollkeeper-is-deprecated line 26
+W: debhelper-deprecated source: dh_suidregister-is-obsolete line 40
+W: debhelper-deprecated source: dh_undocumented-is-obsolete line 41

-- 
Debian package checker


Reply to: