X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_python;h=722d81354f5fa0af6d0ea95ccf29d8bce3cc700d;hb=fb8f18f4a98669c3b85e1bd7920fbabfc00b886e;hp=9fbedc4ced02ceec4ea73ae7626d7e9d2cde2d3c;hpb=0a9afa6c5a1d57d596aa07d32052661ff146d3bf;p=debhelper.git

diff --git a/dh_python b/dh_python
index 9fbedc4..722d813 100755
--- a/dh_python
+++ b/dh_python
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_python - calculates python dependencies and adds postinst and prerm python scripts
+dh_python - calculates Python dependencies and adds postinst and prerm Python scripts (deprecated)
 
 =cut
 
@@ -12,25 +12,29 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-B<dh_python> [S<I<debhelper options>>] [B<-n>] [B<-V> I<version>] [S<I<module dirs ...>>]
+B<dh_python> [S<I<debhelper options>>] [B<-n>] [B<-V> I<version>] [S<I<module dirs> ...>]
 
 =head1 DESCRIPTION
 
-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.
+Note: This program is deprecated. You should use B<dh_python2> instead.
+This program will do nothing if F<debian/pycompat> or a
+B<Python-Version> F<control> file field exists.
 
-The program will look at python scripts and modules in your package, and
-will use this information to generate a dependency on python, with the
-current major version, or on pythonX.Y if your scripts or modules need a
-specific python version. The dependency will be substituted into your
-package's control file wherever you place the token "${python:Depends}".
+B<dh_python> is a debhelper program that is responsible for generating the
+B<${python:Depends}> substitutions and adding them to substvars files. It
+will also add a F<postinst> and a F<prerm> script if required.
+
+The program will look at Python scripts and modules in your package, and
+will use this information to generate a dependency on B<python>, with the
+current major version, or on B<python>I<X>B<.>I<Y> if your scripts or modules need a
+specific B<python> version. The dependency will be substituted into your
+package's F<control> file wherever you place the token B<${python:Depends}>.
 
 If some modules need to be byte-compiled at install time, appropriate
-postinst and prerm scripts will be generated. If already byte-compiled
+F<postinst> and F<prerm> scripts will be generated. If already byte-compiled
 modules are found, they are removed.
 
-If you use this program, your package should build-depend on python.
+If you use this program, your package should build-depend on B<python>.
 
 =head1 OPTIONS
 
@@ -38,24 +42,24 @@ If you use this program, your package should build-depend on python.
 
 =item I<module dirs>
 
-If your package installs python modules in non-standard directories, you
-can make dh_python check those directories by passing their names on the
-command line. By default, it will check /usr/lib/site-python,
-/usr/lib/$PACKAGE, /usr/share/$PACKAGE, /usr/lib/games/$PACKAGE,
-/usr/share/games/$PACKAGE and /usr/lib/python?.?/site-packages.
+If your package installs Python modules in non-standard directories, you
+can make F<dh_python> check those directories by passing their names on the
+command line. By default, it will check F</usr/lib/site-python>,
+F</usr/lib/$PACKAGE>, F</usr/share/$PACKAGE>, F</usr/lib/games/$PACKAGE>,
+F</usr/share/games/$PACKAGE> and F</usr/lib/python?.?/site-packages>.
 
-Note: only /usr/lib/site-python, /usr/lib/python?.?/site-packages and the
-extra names on the command line are searched for binary (.so) modules.
+Note: only F</usr/lib/site-python>, F</usr/lib/python?.?/site-packages> and the
+extra names on the command line are searched for binary (F<.so>) modules.
 
 =item B<-V> I<version>
 
-If the .py files your package ships are meant to be used by a specific
-pythonX.Y version, you can use this option to specify the desired version,
-such as 2.3. Do not use if you ship modules in /usr/lib/site-python.
+If the F<.py> files your package ships are meant to be used by a specific
+B<python>I<X>B<.>I<Y> version, you can use this option to specify the desired version,
+such as B<2.3>. Do not use if you ship modules in F</usr/lib/site-python>.
 
 =item B<-n>, B<--noscripts>
 
-Do not modify postinst/postrm scripts.
+Do not modify F<postinst>/F<prerm> scripts.
 
 =back
 
@@ -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_python2 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_python2 instead.");
+}
+
 my $python = 'python';
 
 # The current python major version
@@ -88,7 +104,7 @@ elsif ($python_version =~ m/^Python\s+(\d+)\.(\d+)(\.\d+)*/) {
 my $python_nextversion = $python_version + 0.1;
 my $python_nextmajor = $python_major + 1;
 
-my @python_allversions = ('1.5','2.1','2.2','2.3');
+my @python_allversions = ('1.5','2.1','2.2','2.3','2.4');
 foreach (@python_allversions) {
 	s/^/python/;
 }
@@ -119,8 +135,6 @@ use constant SO_MODULE_NONSTANDARD => 16;
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp = tmpdir($package);
 
-	delsubstvar($package, "python:Depends");
-
 	my @dirs = ("usr/lib/site-python", "usr/lib/$package", "usr/share/$package", "usr/lib/games/$package", "usr/share/games/$package", @ARGV );
 	my @dirs_so = ("usr/lib/site-python", @ARGV );
 
@@ -139,8 +153,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;
 	}