[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.14.7-1

[Hilko Bengen]

The following commit has been merged in the master branch:
commit d7a96c1351df2803a527cdd13f1d4a3b953f8ef1
Author: Hilko Bengen <bengen at debian.org>
Date:   Sat Dec 10 21:02:57 2011 +0100

    Added fixes for building Python2 bindings on squeeze

diff --git a/debian/control b/debian/control
index 0fccef6..209b1e8 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 7.0.50~), autotools-dev, aptitude,
   genisoimage, pkg-config,
   erlang-dev,
   dh-ocaml, ocaml, ocaml-findlib, libpcre-ocaml-dev,
-  python (>= 2.6.7-2), python-all-dev (>= 2.6.6-3~), python3-all-dev,
+  python (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), python3-all-dev,
   default-jdk,
   libtest-pod-coverage-perl, libextutils-command-perl, libintl-perl, libtest-pod-perl,
   libstring-shellquote-perl,
diff --git a/debian/rules b/debian/rules
index 397f97a..f061f06 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 # export DH_VERBOSE=1
 
-PYTHONS        := $(shell pyversions --installed; py3versions --installed)
+PYTHONS        := $(filter-out python2.5, $(shell pyversions --installed; py3versions --installed))
 PYTHON_DEFAULT := $(shell pyversions --default)
 
 COMMON_CONFIG_FLAGS = \
@@ -94,5 +94,12 @@ override_dh_install:
 	erlang-depends -perlang-guestfs
 	dh_install
 
+# Workaround for python3-defaults < 3.2~b2-1
+# ("do not rename .so files outside dist-packages directory")
+override_dh_python3:
+	dh_python3 -p python-libguestfs
+override_dh_python2:
+	dh_python2 -p python-libguestfs -V 2.6-
+
 %:
 	dh --without=python-support --with=autotools-dev,ocaml,python2,python3,bash-completion $@

-- 
Libguestfs Debian packaging