X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_python;h=722d81354f5fa0af6d0ea95ccf29d8bce3cc700d;hb=fb8f18f4a98669c3b85e1bd7920fbabfc00b886e;hp=65127e89f40a1e388c5a5b982d31f55863009646;hpb=dcdf9deae35b4d456ab3f3fbe6769db64352e136;p=debhelper.git diff --git a/dh_python b/dh_python index 65127e8..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 [S>] [B<-n>] [B<-V> I] [S>] +B [S>] [B<-n>] [B<-V> I] [S ...>] =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 instead. +This program will do nothing if F or a +B F 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 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 and a F 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, with the +current major version, or on BIB<.>I if your scripts or modules need a +specific B version. The dependency will be substituted into your +package's F 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 and F 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. =head1 OPTIONS @@ -38,21 +42,24 @@ If you use this program, your package should build-depend on python. =item I -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/$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 check those directories by passing their names on the +command line. By default, it will check F, +F, F, F, +F and F. + +Note: only F, F and the +extra names on the command line are searched for binary (F<.so>) modules. =item B<-V> I -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. +If the F<.py> files your package ships are meant to be used by a specific +BIB<.>I 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. =item B<-n>, B<--noscripts> -Do not modify postinst/postrm scripts. +Do not modify F/F scripts. =back @@ -66,21 +73,36 @@ 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 version +# The current python major version +my $python_major; my $python_version = `$python -V 2>&1`; if (! defined $python_version || $python_version eq "") { error("Python is not installed, aborting. (Probably forgot to Build-Depend on python.)"); } elsif ($python_version =~ m/^Python\s+(\d+)\.(\d+)(\.\d+)*/) { $python_version = "$1.$2" ; + $python_major = $1 ; } else { error("Unable to parse python version out of \"$python_version\"."); } # The next python version my $python_nextversion = $python_version + 0.1; +my $python_nextmajor = $python_major + 1; my @python_allversions = ('1.5','2.1','2.2','2.3','2.4'); foreach (@python_allversions) { @@ -113,13 +135,11 @@ use constant SO_MODULE_NONSTANDARD => 16; foreach my $package (@{$dh{DOPACKAGES}}) { my $tmp = tmpdir($package); - delsubstvar($package, "python:Depends"); - - my @dirs = ("usr/lib/$package", "usr/share/$package", "usr/lib/games/$package", "usr/share/games/$package", @ARGV ); + 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 ); my $dep_on_python = 0; my $strong_dep = 0; - my $dep_on_py_support = 0; my $look_for_pythonXY = 1; # First, the case of python-foo and pythonX.Y-foo @@ -134,10 +154,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) { } if ($package !~ /^python[0-9].[0-9]-/) { push @dirs, "usr/lib/$usepython/site-packages"; + push @dirs_so, "usr/lib/$usepython/site-packages"; $look_for_pythonXY = 0; } @dirs = grep -d, map "$tmp/$_", @dirs; + @dirs_so = grep -d, map "$tmp/$_", @dirs_so; my $deps = 0; my %verdeps = (); @@ -161,35 +183,19 @@ foreach my $package (@{$dh{DOPACKAGES}}) { }, $tmp; # Look for python modules - my $dirlist = ""; - my $gen_dirlist = ""; - my $moved_module = 0; - my $move_dir = "/usr/share/python-support/$package"; + my $dirlist=""; if (@dirs) { foreach my $curdir (@dirs) { my $has_module = 0; - my $has_bin_module = 0; $curdir =~ s%^$tmp/%%; find sub { return unless -f; if (/\.py$/) { $has_module = 1; doit(("rm","-f",$_."c",$_."o")); - } elsif (/\.so$/) { - $has_bin_module = 1; } }, "$tmp/$curdir" ; - if ($has_module && $has_bin_module == 0) { - $dep_on_py_support = 1; - if ($curdir eq "usr/lib/$usepython/site-packages") { - doit(("mkdir","-p","$tmp$move_dir")); - complex_doit("mv \"$tmp/$curdir/\"* \"$tmp$move_dir\"/"); - doit(("rmdir","-p","--ignore-fail-on-non-empty","$tmp/$curdir")); - $moved_module=1; - } else { - $gen_dirlist="$gen_dirlist /$curdir"; - } - } elsif ($has_module) { # We have both kinds of modules + if ($has_module) { if ($dh{V_FLAG_SET}) { $verdeps{$usepython} |= PY_MODULE_NONSTANDARD; } else { @@ -197,7 +203,17 @@ foreach my $package (@{$dh{DOPACKAGES}}) { } $dirlist="$dirlist /$curdir"; } - if ($has_bin_module) { + } + } + if (@dirs_so) { + foreach my $curdir (@dirs_so) { + my $has_module = 0; + $curdir =~ s%^$tmp/%%; + find sub { + return unless -f; + $has_module = 1 if /\.so$/; + }, "$tmp/$curdir" ; + if ($has_module) { if ($dh{V_FLAG_SET}) { $verdeps{$usepython} |= SO_MODULE_NONSTANDARD; } @@ -210,24 +226,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # Dependencies on current python $dep_on_python = 1 if $deps; - $strong_dep = 1 if($deps & SO_MODULE); + $strong_dep = 1 if($deps & (PY_MODULE|SO_MODULE)); if ($dep_on_python) { addsubstvar($package, "python:Depends", $python, ">= $python_version"); if ($strong_dep) { addsubstvar($package, "python:Depends", $python, "<< $python_nextversion"); - } - } - - if ($dep_on_py_support) { - addsubstvar($package, "python:Depends", "python-support"); - if ($gen_dirlist ne "") { - autoscript($package, "postinst", "postinst-python-support", "s,#OPTIONS#,-b,;s,#DIRS#,$gen_dirlist,"); - autoscript($package, "prerm", "prerm-python-support", "s,#OPTIONS#,-b,;s,#DIRS#,$gen_dirlist,"); - } - if ($moved_module) { - autoscript($package, "postinst", "postinst-python-support", "s,#OPTIONS#,-i,;s,#DIRS#,$move_dir,"); - autoscript($package, "prerm", "prerm-python-support", "s,#OPTIONS#,-i,;s,#DIRS#,$move_dir,"); + } else { + addsubstvar($package, "python:Depends", $python, "<< $python_nextmajor"); } }