r1941: * ACK last three NMUs with thanks to Raphael Hertzog for making the best of

  a difficult situation.
* Revert all dh_python changes. Closes: #381389, #378604
* Conflict with python-support << 0.5.3 and python-central << 0.5.5.
* Make dh_python do nothing if debian/pycompat is found.
  The new versions of dh_pysupport or dh_pycentral will take care of
  everything dh_python used to do in this situation.
* dh_python is now deprecated. Closes: #358392, #253582, #189474
* Non-maintainer upload.
* Update of dh_python
  - when buidling for a non-standard Python version, generate more
    reasonable Depends like "python (>= X.Y) | pythonX.Y"
    Closes: #375576
  - fix handling of private extensions. Closes: #375948
  - fix parsing of XS-Python-Version, it didn't work if only fixed versions
    were listed in XS-Python-Version.
  - fix use of unitialized value. Closes: #374776
  - fix typos in POD documentation. Closes: #375936
* Non-maintainer upload.
* Update of dh_python
  - vastly refactored, easier to understand, and the difference
    between old policy and new policy is easier to grasp
  - it supports an -X option which can be used to not scan some files
  - uses debian/pyversions as reference source of information for
    dependencies but also parse the XS-Python-Version header as fallback.
  - ${python:Versions}'s default value is XS-Python-Version's value
    instead of "all" when the package doesn't depend on a
    specific python version. Closes: #373853
  - always generate ${python:Provides} and leave the responsibility to the
    maintainer to not use ${python:Provides} if he doesn't want the
    provides.
  - uses debian/pycompat or DH_PYCOMPAT as reference field to run in new
    policy mode. The presence of XS-Python-Version will also trigger the
    new policy mode (this is for short-term compatibility, it may be removed in
    the not too-distant future).
    DH_PYCOMPAT=1 is the default mode and is compatible to the old policy.
    DH_PYCOMPAT=2 is the new mode and is compatible with the new policy.
* Use "grep ^Version:" instead of "grep Version:" on the output of
  dpkg-parsechangelog since the above changelog entry matched "Version:" and
  thus made the build fail.
* Non-maintainer upload.
* Integrate the new dh_python implementing the new Python policy. Closes: #370833

1 files changed, 6 insertions, 4 deletions

diff --git a/t/size b/t/size
index ce613f8e..f661db64 100755
--- a/t/size
+++ b/t/size
@@ -3,13 +3,15 @@
 # Debhelper is supposed to consist of small, simple, easy to understand
 # programs. Programs growing in size and complexity without bounds is a
 # bug.
-use Test;
+use Test::More;
 
-my @progs=grep { -x $_ } glob("dh_*");
+# exclude dh_python since it's deprecated
+my @progs=grep { -x $_ && !/dh_python/ } glob("dh_*");
 
 plan(tests => (@progs + @progs));
 
 foreach my $file (@progs) {
+
 	my $lines=0;
 	my $maxlength=0;
 	open(IN, $file) || die "open: $!";
@@ -23,6 +25,6 @@ foreach my $file (@progs) {
 	}
 	close IN;
 	print "# $file has $lines lines, max length is $maxlength\n";
-	ok($lines < 150);
-	ok($maxlength < 160);
+	ok($lines < 150, $file);
+	ok($maxlength < 160, $file);
 }