[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, experimental, updated. debian/1%1.21.40-1

Hilko Bengen bengen at debian.org
Sat Jun 1 11:05:18 UTC 2013


The following commit has been merged in the experimental branch:
commit d5c8febbb92723e3fd0005e3e0234035a2698285
Author: Hilko Bengen <bengen at debian.org>
Date:   Tue May 21 20:23:31 2013 +0200

    Updated patch queue

diff --git a/debian/patches/0003-Use-pkg-config-for-Python.patch b/debian/patches/0003-Use-pkg-config-for-Python.patch
deleted file mode 100644
index 9e2894b..0000000
--- a/debian/patches/0003-Use-pkg-config-for-Python.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Fri, 17 May 2013 18:37:37 +0200
-Subject: Use pkg-config for Python
-
-At least libpython2.7-dev and libpython3.3-dev on current
-Debian/unstable ship with pkg-config files. As with the pkg-config
-check for Lua, we check for versioned and an unversioned .pc files.
----
- configure.ac       |   35 ++++++++++++++++++++---------------
- python/Makefile.am |    2 +-
- 2 files changed, 21 insertions(+), 16 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c809741..0aa1716 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1106,7 +1106,6 @@ AM_CONDITIONAL([HAVE_PERL],
- dnl Check for Python (optional, for Python bindings).
- PYTHON_PREFIX=
- PYTHON_VERSION=
--PYTHON_INCLUDEDIR=
- PYTHON_INSTALLDIR=
- 
- AC_ARG_ENABLE([python],
-@@ -1117,23 +1116,30 @@ AS_IF([test "x$enable_python" != "xno"],[
-     AC_CHECK_PROG([PYTHON],[python],[python],[no])
- 
-     if test "x$PYTHON" != "xno"; then
--        AC_MSG_CHECKING([Python prefix])
--        PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
--        AC_MSG_RESULT([$PYTHON_PREFIX])
--
- 	AC_MSG_CHECKING([Python version])
-         PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info@<:@0@:>@)"`
-         PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info@<:@1@:>@)"`
-         PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR"
- 	AC_MSG_RESULT([$PYTHON_VERSION])
--
--        AC_MSG_CHECKING([for Python include path])
--        if test -z "$PYTHON_INCLUDEDIR"; then
--            python_path=`$PYTHON -c "import distutils.sysconfig; \
--                                     print (distutils.sysconfig.get_python_inc ());"`
--            PYTHON_INCLUDEDIR=$python_path
--        fi
--        AC_MSG_RESULT([$PYTHON_INCLUDEDIR])
-+        # Debian: python-2.7.pc, python-3.2.pc
-+        PKG_CHECK_MODULES([PYTHON], [python-"$PYTHON_VERSION"],[
-+            AC_SUBST([PYTHON_CFLAGS])
-+            AC_SUBST([PYTHON_LIBS])
-+            AC_SUBST([PYTHON_VERSION])
-+            AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time])
-+        ],[
-+            PKG_CHECK_MODULES([PYTHON], [python],[
-+                AC_SUBST([PYTHON_CFLAGS])
-+                AC_SUBST([PYTHON_LIBS])
-+                AC_SUBST([PYTHON_VERSION])
-+                AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time])
-+            ],[
-+                AC_MSG_WARN([python $PYTHON_VERSION not found])
-+            ])
-+        ])
-+        AC_MSG_CHECKING([Python prefix])
-+        PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
-+        AC_MSG_RESULT([$PYTHON_PREFIX])
- 
-         AC_ARG_WITH([python-installdir],
-                     [AS_HELP_STRING([--with-python-installdir],
-@@ -1171,11 +1177,10 @@ AS_IF([test "x$enable_python" != "xno"],[
- 
-     AC_SUBST(PYTHON_PREFIX)
-     AC_SUBST(PYTHON_VERSION)
--    AC_SUBST(PYTHON_INCLUDEDIR)
-     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_LIBS" != "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 e514a76..ecc25d5 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_CFLAGS) \
- 	-I$(top_srcdir)/src -I$(top_builddir)/src
- 
- libguestfsmod_la_CFLAGS = \
diff --git a/debian/patches/0004-remove-last-trace-of-ntfsprogs.patch b/debian/patches/0003-remove-last-trace-of-ntfsprogs.patch
similarity index 100%
rename from debian/patches/0004-remove-last-trace-of-ntfsprogs.patch
rename to debian/patches/0003-remove-last-trace-of-ntfsprogs.patch
diff --git a/debian/patches/0005-Fix-for-changed-selinux-mountpoint.patch b/debian/patches/0004-Fix-for-changed-selinux-mountpoint.patch
similarity index 98%
rename from debian/patches/0005-Fix-for-changed-selinux-mountpoint.patch
rename to debian/patches/0004-Fix-for-changed-selinux-mountpoint.patch
index 10212bf..952bd98 100644
--- a/debian/patches/0005-Fix-for-changed-selinux-mountpoint.patch
+++ b/debian/patches/0004-Fix-for-changed-selinux-mountpoint.patch
@@ -8,7 +8,7 @@ Subject: Fix for changed selinux mountpoint
  2 files changed, 3 insertions(+), 6 deletions(-)
 
 diff --git a/appliance/init b/appliance/init
-index fc49126..813442b 100755
+index 34a6177..f5b41bd 100755
 --- a/appliance/init
 +++ b/appliance/init
 @@ -80,7 +80,7 @@ else
diff --git a/debian/patches/0006-run-Turn-error-message-about-missing-LIBGUESTFS_PATH.patch b/debian/patches/0006-run-Turn-error-message-about-missing-LIBGUESTFS_PATH.patch
deleted file mode 100644
index afa55cd..0000000
--- a/debian/patches/0006-run-Turn-error-message-about-missing-LIBGUESTFS_PATH.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Fri, 17 May 2013 22:28:18 +0200
-Subject: run: Turn error message about missing LIBGUESTFS_PATH into warning;
- output to STDERR
-
-The previous behavior caused the build to abort when trying to build
-the sysprep documentation -- without much of a hint of what went
-wrong.
----
- run.in |    7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/run.in b/run.in
-index 7545f0b..c4771b7 100755
---- a/run.in
-+++ b/run.in
-@@ -66,9 +66,10 @@ chcon --reference=/tmp tmp 2>/dev/null ||:
- if [ "x at ENABLE_APPLIANCE@" = "xyes" ]; then
-     export LIBGUESTFS_PATH="$b/appliance"
- elif [ -z "$LIBGUESTFS_PATH" ]; then
--    echo "run: error: You used './configure --disable-appliance' so you must put an"
--    echo "run: error: appliance somewhere and set LIBGUESTFS_PATH to point to it."
--    exit 1
-+    cat <<'EOF' >&2
-+run: warning: You used './configure --disable-appliance' so LIBGUESTFS_PATH
-+run: warning: has not been set automatically.
-+EOF
- fi
- 
- if [ -z "$LD_LIBRARY_PATH" ]; then
diff --git a/debian/patches/0007-test-events.sh-ignore-trace-get_path-line.patch b/debian/patches/0007-test-events.sh-ignore-trace-get_path-line.patch
deleted file mode 100644
index 77780cf..0000000
--- a/debian/patches/0007-test-events.sh-ignore-trace-get_path-line.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Sun, 19 May 2013 18:01:10 +0200
-Subject: test-events.sh: ignore "trace get_path" line
-
-The test would fail when LIBGUESTFS_PATH was not set.
----
- fish/test-events.sh |    5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/fish/test-events.sh b/fish/test-events.sh
-index 79957ed..32e0a31 100755
---- a/fish/test-events.sh
-+++ b/fish/test-events.sh
-@@ -22,7 +22,7 @@ set -e
- 
- rm -f test.out
- 
--./guestfish -a /dev/null <<'EOF' | grep -v get_verbose | grep -v get_trace | grep -v 'library .*0x' | grep -v 'library command' > test.out
-+./guestfish -a /dev/null <<'EOF' | grep -v get_verbose | grep -v get_trace | grep -v 'library .*0x' | grep -v 'library command' | grep -v 'get_path' > test.out
- trace true
- 
- event ev1 * "echo $EVENT $@"
-@@ -59,9 +59,6 @@ trace shutdown = 0
- enter get_autosync
- trace get_autosync
- trace get_autosync = 1
--enter get_path
--trace get_path
--trace get_path = "'$LIBGUESTFS_PATH'"
- enter get_pgroup
- trace get_pgroup
- trace get_pgroup = 0
diff --git a/debian/patches/series b/debian/patches/series
index 72273e3..e81de8d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
 0001-Fix-for-systemd-based-Debian-systems.patch
 0002-Fix-guestfs-supermin-appliance-path.patch
-0003-Use-pkg-config-for-Python.patch
-0004-remove-last-trace-of-ntfsprogs.patch
-0005-Fix-for-changed-selinux-mountpoint.patch
-0006-run-Turn-error-message-about-missing-LIBGUESTFS_PATH.patch
-0007-test-events.sh-ignore-trace-get_path-line.patch
+0003-remove-last-trace-of-ntfsprogs.patch
+0004-Fix-for-changed-selinux-mountpoint.patch

-- 
Libguestfs Debian packaging



More information about the Pkg-libvirt-commits mailing list