[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1.0.84-4-20-ge91a68e

[Hilko Bengen]

The following commit has been merged in the master branch:
commit 626b3ffe1e9f2ec380fb612fa653d1b8fba13dc9
Author: Hilko Bengen <bengen at debian.org>
Date:   Wed Jul 20 20:49:48 2011 +0200

    Build python-guestfs using dh_python2

diff --git a/debian/control b/debian/control
index 2c4cb42..3ac5b82 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 7.0.50~), autotools-dev, aptitude,
   qemu-kvm (>= 0.13),
   genisoimage, pkg-config,
   dh-ocaml, ocaml, ocaml-findlib, libpcre-ocaml-dev,
-  python-all-dev,
+  python (>= 2.6.7-2), python-all-dev (>= 2.6.6-3~),
   libtest-pod-coverage-perl, libextutils-command-perl, libintl-perl, libtest-pod-perl,
   libstring-shellquote-perl,
   libsys-virt-perl, libwin-hivex-perl,
diff --git a/debian/python-guestfs.install b/debian/python-guestfs.install
index d8c0fc6..607c065 100644
--- a/debian/python-guestfs.install
+++ b/debian/python-guestfs.install
@@ -1,2 +1 @@
-usr/share/pyshared/*.py
-usr/share/pyshared/*.so*
+usr/lib/python*
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/debian/rules b/debian/rules
index 253e2ae..e7e777a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,5 +14,19 @@ override_dh_auto_configure:
 override_dh_strip:
 	dh_strip --dbg-package=libguestfs0-dbg
 
+override_dh_install:
+# workaround for #635316
+	rm debian/tmp/usr/lib/python2.6/dist-packages/libguestfsmod.a \
+	   debian/tmp/usr/lib/python2.6/dist-packages/libguestfsmod.la \
+	   debian/tmp/usr/lib/python2.6/dist-packages/libguestfsmod.so \
+	   debian/tmp/usr/lib/python2.6/dist-packages/libguestfsmod.so.0
+	mv debian/tmp/usr/lib/python2.6/dist-packages/libguestfsmod.so.0.0.0 \
+	   debian/tmp/usr/lib/python2.6/dist-packages/libguestfsmod.so
+
+	dh_install
+
+override_dh_python2:
+	dh_python2 --no-guessing-versions
+
 %:
-	dh --with=autotools-dev,ocaml,python2 $@
+	dh --without=python-support --with=autotools-dev,ocaml,python2 $@

-- 
Libguestfs Debian packaging