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

[Hilko Bengen]

The following commit has been merged in the master branch:
commit f1217be4fc81132ecd78f960a07e3db4a1f2efd8
Author: Hilko Bengen <bengen at debian.org>
Date:   Sun Aug 7 01:03:09 2011 +0200

    Fixed building of Python binding

diff --git a/debian/patches/0009-python-don-t-build-static-library-don-t-build-.so.0..patch b/debian/patches/0009-python-don-t-build-static-library-don-t-build-.so.0..patch
new file mode 100644
index 0000000..258e4e0
--- /dev/null
+++ b/debian/patches/0009-python-don-t-build-static-library-don-t-build-.so.0..patch
@@ -0,0 +1,21 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Fri, 5 Aug 2011 10:18:02 +0100
+Subject: python: don't build static library, don't build .so.0.0, symlinks
+
+---
+ python/Makefile.am |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/python/Makefile.am b/python/Makefile.am
+index 21db292..f6ad8da 100644
+--- a/python/Makefile.am
++++ b/python/Makefile.am
+@@ -43,6 +43,7 @@ libguestfsmod_la_SOURCES = guestfs-py.c guestfs-py.h guestfs-py-byhand.c
+ libguestfsmod_la_CFLAGS = -Wall -I$(PYTHON_INCLUDEDIR) \
+ 			  -I$(top_srcdir)/src -I$(top_builddir)/src
+ libguestfsmod_la_LIBADD = $(top_builddir)/src/libguestfs.la
++libguestfsmod_la_LDFLAGS = -avoid-version -shared
+ 
+ TESTS_ENVIRONMENT = \
+ 	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+-- 
diff --git a/debian/patches/0009-regenerated-auto-related-files.patch b/debian/patches/0010-regenerated-auto-related-files.patch
similarity index 96%
rename from debian/patches/0009-regenerated-auto-related-files.patch
rename to debian/patches/0010-regenerated-auto-related-files.patch
index 3a1441e..693ec20 100644
--- a/debian/patches/0009-regenerated-auto-related-files.patch
+++ b/debian/patches/0010-regenerated-auto-related-files.patch
@@ -12,10 +12,10 @@ Subject: regenerated auto*-related files
  images/Makefile.in |    2 +-
  ocaml/Makefile.in  |   19 +++++-----
  perl/Makefile.in   |    7 +++-
- python/Makefile.in |    3 +-
+ python/Makefile.in |    8 +++--
  resize/Makefile.in |    2 +-
  tools/Makefile.in  |    6 ++--
- 12 files changed, 105 insertions(+), 115 deletions(-)
+ 12 files changed, 108 insertions(+), 117 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
 index de73f39..59048f0 100644
@@ -610,7 +610,7 @@ index 11487b7..8d0e963 100644
  @HAVE_PERL_TRUE at all: Makefile-pl src_deps
  @HAVE_PERL_TRUE@	$(MAKE) -f Makefile-pl
 diff --git a/python/Makefile.in b/python/Makefile.in
-index 722582f..6660e84 100644
+index 722582f..2cb3373 100644
 --- a/python/Makefile.in
 +++ b/python/Makefile.in
 @@ -71,6 +71,7 @@ build_triplet = @build@
@@ -621,7 +621,23 @@ index 722582f..6660e84 100644
  subdir = python
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1027,7 +1028,7 @@ EXTRA_DIST = \
+@@ -200,8 +201,8 @@ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+ am__v_lt_0 = --silent
+ libguestfsmod_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+-	$(libguestfsmod_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+-	-o $@
++	$(libguestfsmod_la_CFLAGS) $(CFLAGS) \
++	$(libguestfsmod_la_LDFLAGS) $(LDFLAGS) -o $@
+ @HAVE_PYTHON_TRUE at am_libguestfsmod_la_rpath = -rpath $(pythondir)
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
+@@ -1023,11 +1024,12 @@ EXTRA_DIST = \
+ @HAVE_PYTHON_TRUE@			  -I$(top_srcdir)/src -I$(top_builddir)/src
+ 
+ @HAVE_PYTHON_TRUE at libguestfsmod_la_LIBADD = $(top_builddir)/src/libguestfs.la
++ at HAVE_PYTHON_TRUE@libguestfsmod_la_LDFLAGS = -avoid-version -shared
+ @HAVE_PYTHON_TRUE at TESTS_ENVIRONMENT = \
  @HAVE_PYTHON_TRUE@	LIBGUESTFS_PATH=$(top_builddir)/appliance \
  @HAVE_PYTHON_TRUE@	PYTHONPATH=$(builddir):$(builddir)/.libs
  
diff --git a/debian/patches/series b/debian/patches/series
index 83b2153..c2f5fcf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,5 @@
 0006-configure.ac-do-not-generate-debian-changelog.patch
 0007-Do-not-run-appliance-related-checks-if-not-building-.patch
 0008-check-for-febootstrap-etc.-even-if-not-building-appl.patch
-0009-regenerated-auto-related-files.patch
+0009-python-don-t-build-static-library-don-t-build-.so.0..patch
+0010-regenerated-auto-related-files.patch
diff --git a/debian/rules b/debian/rules
index e6c0600..2b101a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,13 +24,7 @@ override_dh_auto_build:
 		supermin.d/daemon.img supermin.d/init.img
 
 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
+	rm debian/tmp/usr/lib/python2.6/dist-packages/libguestfsmod.la
 
 # Workaround for:
 # W: libguestfs-perl: script-not-executable usr/lib/perl5/Sys/bindtests.pl

-- 
Libguestfs Debian packaging