X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_python;h=857504f7163c09879107ea15b6267cee78f5013b;hb=94f711ab1af4966a8c1099578752cddb0345e3db;hp=3bd2ac7aff427fed19a25257b99076c98fdac591;hpb=90f4f5db1d9f9c5af67fa5e58f89211dc00c7fb2;p=debhelper.git

diff --git a/dh_python b/dh_python
index 3bd2ac7..857504f 100755
--- a/dh_python
+++ b/dh_python
@@ -16,6 +16,10 @@ B<dh_python> [S<I<debhelper options>>] [B<-n>] [B<-V> I<version>] [S<I<module di
 
 =head1 DESCRIPTION
 
+Note: This program is deprecated. You should use dh_pysupport or
+dh_pycentral instead. This program will do nothing if debian/pycompat
+or a Python-Version control file field exists.
+
 dh_python is a debhelper program that is responsible for generating the
 ${python:Depends} substitutions and adding them to substvars files. It
 will also add a postinst and a prerm script if required.
@@ -69,6 +73,18 @@ Python policy, version 0.3.7
 
 init();
 
+if (-e "debian/pycompat") {
+	warning("Doing nothing since dh_pycompat exists; dh_pysupport or dh_pycentral should do the work. You can remove dh_python from your rules file.");
+	exit 0;
+}
+elsif (`grep Python-Version: debian/control`) {
+	warning("Doing nothing since Python-Version is set; dh_pysupport or dh_pycentral should do the work. You can remove dh_python from your rules file.");
+	exit 0;
+}
+else {
+	warning("This program is deprecated, you should use dh_pysupport or dh_pycentral instead.");
+}
+
 my $python = 'python';
 
 # The current python major version
@@ -96,7 +112,6 @@ foreach (@python_allversions) {
 # Check for -V
 my $usepython = "python$python_version";
 if($dh{V_FLAG_SET}) {
-	$python_version = $dh{V_FLAG};
 	$usepython = $dh{V_FLAG};
 	$usepython =~ s/^/python/;
 	if (! grep { $_ eq $usepython } @python_allversions) {
@@ -140,8 +155,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		}
 	}
 	if ($package !~ /^python[0-9].[0-9]-/) {
-		push @dirs, "usr/lib/python$python_version/site-packages" ;
-		push @dirs_so, "usr/lib/python$python_version/site-packages" ;
+		push @dirs, "usr/lib/$usepython/site-packages";
+		push @dirs_so, "usr/lib/$usepython/site-packages";
 		$look_for_pythonXY = 0;
 	}