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

[Hilko Bengen]

The following commit has been merged in the master branch:
commit 4c8053ebcaed074d4e71dd716ea736a03ba84724
Author: Hilko Bengen <bengen at debian.org>
Date:   Thu May 30 16:30:57 2013 +0200

    Dropped patch for building Python 3.3 bindings that has been integrated upstream

diff --git a/debian/patches/0004-Fix-building-Python-bindings-if-there-is-a-separate-.patch b/debian/patches/0004-Fix-building-Python-bindings-if-there-is-a-separate-.patch
deleted file mode 100644
index cf37788..0000000
--- a/debian/patches/0004-Fix-building-Python-bindings-if-there-is-a-separate-.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Thu, 9 May 2013 13:19:42 +0200
-Subject: Fix building Python bindings if there is a separate
- "platform-specific" include path
-
-(This is the case for Python 3.3 on Debian.)
----
- configure.ac       |   18 ++++++++++++------
- python/Makefile.am |    2 +-
- 2 files changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a7ac331..9ef56c5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1067,7 +1067,7 @@ AM_CONDITIONAL([HAVE_PERL],
- dnl Check for Python (optional, for Python bindings).
- PYTHON_PREFIX=
- PYTHON_VERSION=
--PYTHON_INCLUDEDIR=
-+PYTHON_CPPFLAGS=
- PYTHON_INSTALLDIR=
- 
- AC_ARG_ENABLE([python],
-@@ -1089,12 +1089,18 @@ AS_IF([test "x$enable_python" != "xno"],[
- 	AC_MSG_RESULT([$PYTHON_VERSION])
- 
-         AC_MSG_CHECKING([for Python include path])
--        if test -z "$PYTHON_INCLUDEDIR"; then
-+        if test -z "$PYTHON_CPPFLAGS"; then
-             python_path=`$PYTHON -c "import distutils.sysconfig; \
-                                      print (distutils.sysconfig.get_python_inc ());"`
--            PYTHON_INCLUDEDIR=$python_path
-+            python_platpath=`$PYTHON -c "import distutils.sysconfig; \
-+                                         print (distutils.sysconfig.get_python_inc (plat_specific=1));"`
-+            if test "$python_path" = "$python_platpath"; then
-+                PYTHON_CPPFLAGS=-I$python_path
-+            else
-+                PYTHON_CPPFLAGS="-I$python_path -I$python_platpath"
-+            fi
-         fi
--        AC_MSG_RESULT([$PYTHON_INCLUDEDIR])
-+        AC_MSG_RESULT([$PYTHON_CPPFLAGS])
- 
-         AC_ARG_WITH([python-installdir],
-                     [AS_HELP_STRING([--with-python-installdir],
-@@ -1132,11 +1138,11 @@ AS_IF([test "x$enable_python" != "xno"],[
- 
-     AC_SUBST(PYTHON_PREFIX)
-     AC_SUBST(PYTHON_VERSION)
--    AC_SUBST(PYTHON_INCLUDEDIR)
-+    AC_SUBST(PYTHON_CPPFLAGS)
-     AC_SUBST(PYTHON_INSTALLDIR)
- ])
- AM_CONDITIONAL([HAVE_PYTHON],
--    [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"])
-+    [test "x$PYTHON" != "xno" && test "x$PYTHON_CPPFLAGS" != "x" && test "x$PYTHON_INSTALLDIR" != "x"])
- 
- dnl Check for Ruby and rake (optional, for Ruby bindings).
- AC_ARG_ENABLE([ruby],
-diff --git a/python/Makefile.am b/python/Makefile.am
-index 3bc01b5..d44e24f 100644
---- a/python/Makefile.am
-+++ b/python/Makefile.am
-@@ -43,7 +43,7 @@ libguestfsmod_la_SOURCES = guestfs-py.c guestfs-py.h guestfs-py-byhand.c
- 
- libguestfsmod_la_CPPFLAGS = \
- 	-DGUESTFS_PRIVATE=1 \
--	-I$(PYTHON_INCLUDEDIR) \
-+	$(PYTHON_CPPFLAGS) \
- 	-I$(top_srcdir)/src -I$(top_builddir)/src
- 
- libguestfsmod_la_CFLAGS = \
diff --git a/debian/patches/series b/debian/patches/series
index 922768e..e10a9ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Fix-for-systemd-based-Debian-systems.patch
 0002-out-of-tree-build-fix-building-Perl-bindings.patch
 0003-Fix-guestfs-supermin-appliance-path.patch
-0004-Fix-building-Python-bindings-if-there-is-a-separate-.patch

-- 
Libguestfs Debian packaging