[SCM] Debian package checker branch, master, updated. 2.5.0-24-g396d3c8

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

The following commit has been merged in the master branch:
commit 396d3c877974606219b17c3b1389774407afb1b2
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Jun 2 22:26:11 2011 +0200

    Removed obsolete uses-dh-python-with-no-pycompat tag

diff --git a/checks/debhelper b/checks/debhelper
index 6bd3279..1f11c91 100644
--- a/checks/debhelper
+++ b/checks/debhelper
@@ -61,8 +61,6 @@ my $level;
 my $seenversiondepends = '0';
 my $compat = 0;
 my $usescdbs = '';
-my $seendhpython = '';
-my $usescdbspython = '';
 my $seendhcleank = '';
 my $overridetargets = 0;
 my %missingbdeps;
@@ -170,11 +168,6 @@ while (<RULES>) {
     } elsif (m,^include\s+/usr/share/cdbs/,){
 	$inclcdbs = 1;
     }
-    if (/^\s+dh_python\s/) {
-        $seendhpython = 1;
-    } elsif (m,^include\s+/usr/share/cdbs/1/class/python-distutils.mk,) {
-        $usescdbspython = 1;
-    }
 }
 close RULES;
 
@@ -381,20 +374,6 @@ if(scalar(@indebfiles)){
     tag 'temporary-debhelper-file', "$f$otext";
 }
 
-# Check for Python policy usage and the required debhelper dependency for
-# dh_python policy support.  Assume people who intentionally set pycompat to
-# something earlier than 2 know what they're doing.  Skip CDBS packages since
-# CDBS creates pycompat internally at build time.
-if ($seendhpython && !$usescdbspython) {
-    if (open(PYCOMPAT, '<', 'debfiles/pycompat')) {
-	local $/;
-	my $pycompat = <PYCOMPAT>;
-	close PYCOMPAT;
-    } else {
-	tag 'uses-dh-python-with-no-pycompat';
-    }
-}
-
 }
 
 1;
diff --git a/checks/debhelper.desc b/checks/debhelper.desc
index b969a13..09a457e 100644
--- a/checks/debhelper.desc
+++ b/checks/debhelper.desc
@@ -165,14 +165,6 @@ Info: The debhelper compatibility version used by this package is marked
  <tt>debian/rules</tt>.  If it is not set in either place, debhelper
  defaults to the deprecated compatibility version 1.
 
-Tag: uses-dh-python-with-no-pycompat
-Severity: normal
-Certainty: possible
-Info: This package uses dh_python but apparently does not tell it to use
- the current Python policy by putting 2 in <tt>debian/pycompat</tt>.  This
- may mean that the package has not been converted to the current Python
- policy, in which case it probably should be.
-
 Tag: debhelper-but-no-misc-depends
 Severity: normal
 Certainty: possible
diff --git a/debian/changelog b/debian/changelog
index 43689ff..f03a939 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,10 +5,12 @@ lintian (2.5.1) UNRELEASED; urgency=low
       - dh_pycentral-is-obsolete
       - dh_python-is-obsolete
       - non-empty-dependency_libs-in-la-file
+    + Removed:
+      - uses-dh-python-with-no-pycompat
 
   * checks/debhelper{,.desc}:
     + [NT] Recognise that dh_python and dh_pycentral are now obsolete.
-      (Closes: #541978)
+      (Closes: #496902, #541978)
   * checks/fields{,.desc}:
     + [NT] Allow "all" and "any" to appear together in the Architecture
       field of a .dsc file.  (Closes: #626775)
diff --git a/t/COVERAGE b/t/COVERAGE
index 5ca9724..42f14ec 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,4 +1,4 @@
-Last generated 2011-04-27
+Last generated 2011-06-02
 
 The following tags are not tested by the test suite:
 
@@ -214,8 +214,6 @@ debconf using-first-person-in-templates
 debconf using-imperative-form-in-templates
 debconf using-question-in-extended-description-in-templates
 
-debhelper uses-dh-python-with-no-pycompat
-
 fields build-depends-indep-without-arch-indep
 fields dbg-package-missing-depends
 fields debug-package-should-be-priority-extra
@@ -524,4 +522,3 @@ scripts
   setuid-binary
   shell-script-fails-syntax-check
   suid-perl-script-but-no-perl-suid-dep
-  uses-dh-python-with-no-pycompat
diff --git a/t/tests/debhelper-deprecated/desc b/t/tests/debhelper-deprecated/desc
index 0bd547c..850e513 100644
--- a/t/tests/debhelper-deprecated/desc
+++ b/t/tests/debhelper-deprecated/desc
@@ -5,6 +5,7 @@ Description: Test for use of deprecated dh_* commands
 Test-For:
  dh_desktop-is-deprecated
  dh_dhelp-is-deprecated
+ dh_pycentral-is-obsolete
  dh_python-is-obsolete
  dh_scrollkeeper-is-deprecated
  dh_suidregister-is-obsolete
diff --git a/testset/tags.scripts b/testset/tags.scripts
index f5fca62..11a20d1 100644
--- a/testset/tags.scripts
+++ b/testset/tags.scripts
@@ -41,7 +41,6 @@ W: scripts source: maintainer-script-lacks-debhelper-token debian/postinst
 W: scripts source: maintainer-script-lacks-debhelper-token debian/postrm
 W: scripts source: package-uses-deprecated-debhelper-compat-version 1
 W: scripts source: patch-system-but-no-source-readme
-W: scripts source: uses-dh-python-with-no-pycompat
 W: scripts: binary-without-manpage usr/bin/envfoo
 W: scripts: binary-without-manpage usr/bin/guile-bizarre
 W: scripts: binary-without-manpage usr/bin/jruby-broken

-- 
Debian package checker