diff options
author | joey <joey> | 2003-08-22 16:47:05 +0000 |
---|---|---|
committer | joey <joey> | 2003-08-22 16:47:05 +0000 |
commit | 5dd373940d0348cc4dce74d0b0aa148d35b29934 (patch) | |
tree | c726bed06a08ed41f8876af06997247d251b1d86 /dh_python | |
parent | d1f803bc312f356ac639c06958f5009acf4114d2 (diff) |
r1594: * dh_python: Another patch, for pythonX.Y-foo packages.
* dh_link: Improve error message if link destination is a directory.
Closes: #206689
Diffstat (limited to 'dh_python')
-rwxr-xr-x | dh_python | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -126,7 +126,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my $strong_dep = 0; my $look_for_pythonXY = 1; - # First, the case of python-foo + # First, the case of python-foo and pythonX.Y-foo if ($package =~ /^python-/) { $dep_on_python = 1; $strong_dep = 1; @@ -135,11 +135,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) { if (grep { "$_" eq "$pack" } GetPackages()) { addsubstvar($package, "python:Depends", $pack); } - else { - push @dirs, "usr/lib/python$python_version/site-packages" ; - push @dirs_so, "usr/lib/python$python_version/site-packages" ; - $look_for_pythonXY = 0; - } + } + 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" ; + $look_for_pythonXY = 0; } @dirs = grep -d, map "$tmp/$_", @dirs; @@ -274,4 +274,3 @@ Josselin Mouette <joss@debian.org> most ideas stolen from Brendan O'Dea <bod@debian.org> =cut - |