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

[Hilko Bengen]

The following commit has been merged in the master branch:
commit 5294a7e5576109a4a2cf9608dedf3f4a32950d92
Author: Hilko Bengen <bengen at debian.org>
Date:   Thu Oct 20 00:34:38 2011 +0200

    Got rid of a shortcut in building bindings for multiple Python versions. This stopped working with Python 2.7 being the default python.

diff --git a/debian/rules b/debian/rules
index 9ae5321..2061090 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,16 +55,14 @@ override_dh_auto_build:
 	done
 
 override_dh_auto_test:
-	set -e $(MAKE) -C $(CURDIR)/debian/build-$(PYTHON_DEFAULT) check
+	dh_auto_test --builddir=$(CURDIR)/debian/build-$(PYTHON_DEFAULT)
 
 override_dh_auto_install:
+# All build trees contain the library plus guestfish and C virt tools.
+# We assume that the Python version used for building the Python
+# bindings doesn't affect the outcome of those builds.
 	set -e; for p in $(PYTHONS); do \
-	    if [ $$p = $(PYTHON_DEFAULT) ]; then \
 		dh_auto_install --builddir=$(CURDIR)/debian/build-$$p ; \
-	    else \
-	        $(MAKE) -C $(CURDIR)/debian/build-$$p/python install \
-	        DESTDIR=$(CURDIR)/debian/tmp ; \
-	    fi ; \
 	done
 
 override_dh_install:

-- 
Libguestfs Debian packaging