[SCM] Debian package checker branch, master, updated. 2.5.1-34-g9810820

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 9810820e5f151acc3803541a390239974864e1b2
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Jul 5 21:45:03 2011 +0200

    Fixed false-positive by detecting dh_python-ply as dh_python

diff --git a/checks/debhelper b/checks/debhelper
index 24dfa8c..f9d7eaa 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -83,9 +83,8 @@ while (<RULES>) {
         $maybe_skipping--;
     }
 
-    if (m/^\s+-?(dh_\w+)(.)?/) {
+    if (m/^\s+-?(dh_\S+)/) {
         my $dhcommand = $1;
-        my $trail = $2//'';
 
 	if ($dhcommand eq 'dh_dhelp') {
 	    tag 'dh_dhelp-is-deprecated', "line $.";
@@ -96,9 +95,7 @@ while (<RULES>) {
 	if ($dhcommand eq 'dh_undocumented') {
 	    tag 'dh_undocumented-is-obsolete', "line $.";
 	}
-	# Some use dh_python$(VER) to run dh_python2 and dh_python3,
-	# so ignore this if it is followed by a $
-	if ($dhcommand eq 'dh_python' and $trail ne '$') {
+	if ($dhcommand eq 'dh_python') {
 	    tag 'dh_python-is-obsolete', "line $.";
 	}
 	if ($dhcommand eq 'dh_pycentral') {
diff --git a/debian/changelog b/debian/changelog
index 8c33fbb..cfc54e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,9 @@ lintian (2.5.2) UNRELEASED; urgency=low
       a Makefile variable is used to choose between dh_python2
       and dh_python3.  Thanks to Leonid Borisenko for the report.
       (Closes: #631662)
+    + [NT] Do not trigger deprecation warning for dh_python-ply,
+      which Lintian incorrectly identified as dh_python.  Thanks
+      to Daniele Tricoli for the report.  (Closes: #632693)
   * checks/filename-length{,.desc}:
     + [NT] New file that checks the length of the package file
       names.  (Closes: #631656)
diff --git a/t/tests/debhelper-deprecated/debian/debian/rules b/t/tests/debhelper-deprecated/debian/debian/rules
index 97cb658..90f723a 100755
--- a/t/tests/debhelper-deprecated/debian/debian/rules
+++ b/t/tests/debhelper-deprecated/debian/debian/rules
@@ -26,6 +26,7 @@ binary-indep:
 	dh_scrollkeeper
 	-dh_python # Should trigger a tag
 	-dh_python$(VERSION) # This should not
+	-dh_python-ply # neither should this
 	-dh_pycentral
 # Check not warning about deprecated commands in optional portions, but
 # commands that have been toast for a long time are still warned about.
diff --git a/t/tests/debhelper-deprecated/tags b/t/tests/debhelper-deprecated/tags
index cd604fc..6ed2c28 100644
--- a/t/tests/debhelper-deprecated/tags
+++ b/t/tests/debhelper-deprecated/tags
@@ -1,7 +1,7 @@
 W: debhelper-deprecated source: dh_desktop-is-deprecated line 24
 W: debhelper-deprecated source: dh_dhelp-is-deprecated line 25
-W: debhelper-deprecated source: dh_pycentral-is-obsolete line 29
+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 39
-W: debhelper-deprecated source: dh_undocumented-is-obsolete line 40
+W: debhelper-deprecated source: dh_suidregister-is-obsolete line 40
+W: debhelper-deprecated source: dh_undocumented-is-obsolete line 41

-- 
Debian package checker