summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey>2003-08-08 16:00:12 +0000
committerjoey <joey>2003-08-08 16:00:12 +0000
commit742d35523bbb24a4da8860f0a46701244dd5e214 (patch)
tree493c942df89444a7386d1ee99e6ecea9f6ff017a
parent1b294974795510843d19adc178e936eb4f2c65bb (diff)
downloaddebhelper-742d35523bbb24a4da8860f0a46701244dd5e214.tar.gz
r1580: * dh_python: support python ver 2.3. Closes: #204556version_4.1.60
-rw-r--r--debian/changelog6
-rwxr-xr-xdh_python2
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index f4748dd0..2898f71b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (4.1.60) unstable; urgency=low
+
+ * dh_python: support python ver 2.3. Closes: #204556
+
+ -- Joey Hess <joeyh@debian.org> Fri, 8 Aug 2003 11:59:34 -0400
+
debhelper (4.1.59) unstable; urgency=low
* dh_installman: support .TH lines with quotes. Closes: #204527
diff --git a/dh_python b/dh_python
index 81da6da5..9bbffa4c 100755
--- a/dh_python
+++ b/dh_python
@@ -67,7 +67,7 @@ my $python_version = `$python -V 2>&1`;
if ("$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+/) {
+elsif ($python_version =~ m/^Python\s+(\d+)\.(\d+)(\.\d+)*/) {
$python_version = "$1.$2" ;
$python_major = $1 ;
} else {