r1732: releasing version 4.2.28

[debhelper.git] / dh_python

diff --git a/dh_python b/dh_python
index eb32fd46e36719b441cd55c61a46b47b380e562e..a2dde7b92036bab3981e9359b83e93eaf1df9a8c 100755 (executable)
--- a/dh_python
+++ b/dh_python
@@ -50,9 +50,8 @@ extra names on the command line are searched for binary (.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 set this option with the desired X.Y python
-version.
-Do not use if you ship modules in /usr/lib/site-python.
+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.
 
 =item B<-n>, B<--noscripts>
 
@@ -89,7 +88,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/;
 }
@@ -99,6 +98,9 @@ my $usepython = "python$python_version";
 if($dh{V_FLAG_SET}) {
        $usepython = $dh{V_FLAG};
        $usepython =~ s/^/python/;
+       if (! grep { $_ eq $usepython } @python_allversions) {
+               error("Unknown python version $dh{V_FLAG}");
+       }
 }
 
 # Cleaning the paths given on the command line