[Pkg-libvirt-commits] [libguestfs] 04/06: Ported Python-related fixes from unstable branch

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/1%1.15.11-1
in repository libguestfs.

commit b2aa178488ad1aa475ef660fe3eb2a72854fcf8d
Author: Hilko Bengen <bengen at debian.org>
Date:   Sun Dec 11 19:02:38 2011 +0100

    Ported Python-related fixes from unstable branch
---
 debian/control | 2 +-
 debian/rules   | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 34c811b..58bffda 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,
   gem2deb, rake,
   libtest-pod-coverage-perl, libextutils-command-perl, libintl-perl, libtest-pod-perl,
diff --git a/debian/rules b/debian/rules
index 22ba944..c462522 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)
 RUBIES         := ruby1.8 ruby1.9.1
 RUBY_DEFAULT   := ruby1.8
@@ -115,6 +115,13 @@ 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,ruby \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git