[debhelper-devel] [debhelper] 01/01: Remove remains of dh_pysupport

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch drop-pysupport-remains
in repository debhelper.

commit 46eaf49b1db0e851962b872038b2cb3a14c69909
Author: Niels Thykier <niels at thykier.net>
Date:   Fri May 5 19:22:56 2017 +0000

    Remove remains of dh_pysupport
    
    There is no point in loading a sequence that conditionally adds a tool
    that no longer exists.  Just give a deprecation warning for people
    still explicitly loading it and drop the rest.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Sequence/python_support.pm | 9 ++-------
 debhelper.pod                               | 4 ++++
 dh                                          | 8 +-------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Debian/Debhelper/Sequence/python_support.pm b/Debian/Debhelper/Sequence/python_support.pm
index eaedc22..38d6a86 100644
--- a/Debian/Debhelper/Sequence/python_support.pm
+++ b/Debian/Debhelper/Sequence/python_support.pm
@@ -1,16 +1,11 @@
 #!/usr/bin/perl
-# debhelper sequence file for python-support
+# Obsolete debhelper sequence file for python-support
 
 use warnings;
 use strict;
 use Debian::Debhelper::Dh_Lib;
 
-# Test if dh_pysupport is available before inserting it.
-# (This would not be needed if this file was contained in the python-support
-# package.)
-if (-x "/usr/bin/dh_pysupport") {
-	insert_before("dh_installinit", "dh_pysupport");
-}
+deprecated_functionality('python_support sequence does nothing as dh_pysupport is no longer available', 11);
 
 1
 
diff --git a/debhelper.pod b/debhelper.pod
index 89eb634..08e1ea4 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -432,6 +432,10 @@ in --libexecdir when using autoconf.
 
 B<dh> does not default to enabling --with=python-support
 
+(Obsolete: As the B<dh_pysupport> tool was removed from Debian jessie.
+Since debhelper/10.3, B<dh> no longer enables this sequence add-on
+regardless of compat level)
+
 =item -
 
 All of the B<dh_auto_>I<*> debhelper programs and B<dh> set
diff --git a/dh b/dh
index efa2643..bd1591b 100755
--- a/dh
+++ b/dh
@@ -130,8 +130,7 @@ after a particular debhelper command is run.
 		chmod 4755 debian/foo/usr/bin/foo
 
 Python tools are not run by dh by default, due to the continual change
-in that area. (Before compatibility level v9, dh does run B<dh_pysupport>.)
-Here is how to use B<dh_python2>.
+in that area. Here is how to use B<dh_python2>.
 
 	#!/usr/bin/make -f
 	%:
@@ -283,11 +282,6 @@ matches, the last one in the sequence will be used.
 # Stash this away before init modifies it.
 my @ARGV_orig=@ARGV;
 
-if (compat(8, 1)) {
-	# python-support was enabled by default before v9.
-	# (and comes first so python-central loads later and can disable it).
-	unshift @ARGV, "--with=python-support";
-}
 if (not compat(9, 1)) {
 	# Enable autoreconf'ing by default in compat 10 or later.  Use the
 	# sequence add-on so existing --without=autoreconf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git