[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1.14.2-1
Hilko Bengen
bengen at debian.org
Fri Nov 11 07:30:38 UTC 2011
The following commit has been merged in the master branch:
commit c27fa271e8c3bf6b66d5350c66520430d8f883b0
Author: Hilko Bengen <bengen at debian.org>
Date: Thu Nov 10 21:00:14 2011 +0100
Rebased patch queue, added fix for Erlang bindings build
diff --git a/debian/patches/0004-Do-not-run-appliance-related-checks-if-not-building-.patch b/debian/patches/0004-Do-not-run-appliance-related-checks-if-not-building-.patch
index 93cb14b..b6318e2 100644
--- a/debian/patches/0004-Do-not-run-appliance-related-checks-if-not-building-.patch
+++ b/debian/patches/0004-Do-not-run-appliance-related-checks-if-not-building-.patch
@@ -154,12 +154,12 @@ index d8167d1..6212915 100644
TESTS_ENVIRONMENT = \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
diff --git a/python/Makefile.am b/python/Makefile.am
-index 82960d6..97fae83 100644
+index bbccb1a..62a4f5f 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
-@@ -50,6 +50,10 @@ TESTS_ENVIRONMENT = \
- PYTHONPATH=$(builddir):$(builddir)/.libs \
- TMPDIR=$(top_builddir)
+@@ -51,6 +51,10 @@ TESTS_ENVIRONMENT = \
+ TMPDIR=$(top_builddir) \
+ PYTHON=$(PYTHON)
-TESTS = run-bindtests run-python-tests
+TESTS = run-bindtests
@@ -171,15 +171,17 @@ index 82960d6..97fae83 100644
+
+endif HAVE_PYTHON
diff --git a/resize/Makefile.am b/resize/Makefile.am
-index e8ffff0..5112605 100644
+index 5046a8c..a4ca7cd 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
-@@ -99,7 +99,9 @@ TESTS_ENVIRONMENT = \
+@@ -105,7 +105,10 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
+-TESTS = test-virt-resize.sh utils_tests
++TESTS = utils_tests
+if ENABLE_APPLIANCE
- TESTS = test-virt-resize.sh
++TESTS += test-virt-resize.sh
+endif
# Dependencies.
diff --git a/debian/patches/0009-out-of-tree-build-erlang.patch b/debian/patches/0009-out-of-tree-build-erlang.patch
new file mode 100644
index 0000000..74355f2
--- /dev/null
+++ b/debian/patches/0009-out-of-tree-build-erlang.patch
@@ -0,0 +1,22 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Thu, 10 Nov 2011 21:58:23 +0100
+Subject: out of tree build: erlang
+
+---
+ erlang/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/erlang/Makefile.am b/erlang/Makefile.am
+index f336375..2c9e359 100644
+--- a/erlang/Makefile.am
++++ b/erlang/Makefile.am
+@@ -32,7 +32,7 @@ erlang_bindir = $(libdir)/erlang/lib/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/ebin
+ erlang_bin_DATA = guestfs.beam
+
+ guestfs.beam: guestfs.erl
+- $(ERLC) +debug_info guestfs.erl
++ $(ERLC) +debug_info $^
+
+ bin_PROGRAMS = erl-guestfs
+
+--
diff --git a/debian/patches/0009-Fix-en-dis-able-install-daemon.patch b/debian/patches/0010-Fix-en-dis-able-install-daemon.patch
similarity index 96%
rename from debian/patches/0009-Fix-en-dis-able-install-daemon.patch
rename to debian/patches/0010-Fix-en-dis-able-install-daemon.patch
index 492d58d..eaa7760 100644
--- a/debian/patches/0009-Fix-en-dis-able-install-daemon.patch
+++ b/debian/patches/0010-Fix-en-dis-able-install-daemon.patch
@@ -7,7 +7,7 @@ Subject: Fix --{en,dis}able-install-daemon
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 897ab32..5c2b9cc 100644
+index a179e3f..5562df4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -250,9 +250,9 @@ if test "x$enable_daemon" = "xyes"; then
diff --git a/debian/patches/0010-Fix-include.patch b/debian/patches/0011-Fix-include.patch
similarity index 97%
rename from debian/patches/0010-Fix-include.patch
rename to debian/patches/0011-Fix-include.patch
index 8e36387..95ee4ab 100644
--- a/debian/patches/0010-Fix-include.patch
+++ b/debian/patches/0011-Fix-include.patch
@@ -8,7 +8,7 @@ Subject: Fix include
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/resize/Makefile.am b/resize/Makefile.am
-index 5112605..0872349 100644
+index a4ca7cd..0f12a3d 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -37,7 +37,7 @@ SOURCES = \
@@ -30,7 +30,7 @@ index 5112605..0872349 100644
.c.o:
$(CC) $(CFLAGS) $(PROF_CFLAGS) $(DEFAULT_INCLUDES) -c $< -o $@
diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
-index 8e6bfc3..b8ef398 100644
+index f4898da..c057a65 100644
--- a/sparsify/Makefile.am
+++ b/sparsify/Makefile.am
@@ -36,7 +36,7 @@ SOURCES = \
diff --git a/debian/patches/0011-python-Correctly-check-for-Python-major-minor.patch b/debian/patches/0011-python-Correctly-check-for-Python-major-minor.patch
deleted file mode 100644
index 152888c..0000000
--- a/debian/patches/0011-python-Correctly-check-for-Python-major-minor.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Wed, 2 Nov 2011 18:18:14 +0000
-Subject: python: Correctly check for Python major/minor.
-
-The manual for sys.version warns that you should not parse the string,
-which we were doing. It would have failed on python "2.10" or
-similar.
-
-Do it correctly using the sys.version_info struct instead.
----
- configure.ac | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1918701..d5125e5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -714,7 +714,9 @@ AS_IF([test "x$enable_python" != "xno"],
- AC_MSG_RESULT([$PYTHON_PREFIX])
-
- AC_MSG_CHECKING([Python version])
-- PYTHON_VERSION=`$PYTHON -c "import sys; print (sys.version[[0:3]])"`
-+ PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info.major)"`
-+ PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info.minor)"`
-+ PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR"
- AC_MSG_RESULT([$PYTHON_VERSION])
-
- AC_MSG_CHECKING([for Python include path])
---
diff --git a/debian/patches/0016-autoreconf.patch b/debian/patches/0012-autoreconf.patch
similarity index 75%
rename from debian/patches/0016-autoreconf.patch
rename to debian/patches/0012-autoreconf.patch
index 5f959a4..1d10b77 100644
--- a/debian/patches/0016-autoreconf.patch
+++ b/debian/patches/0012-autoreconf.patch
@@ -3,27 +3,27 @@ Date: Sat, 20 Aug 2011 20:43:22 +0200
Subject: autoreconf
---
- Makefile.in | 47 +++++++--------
- aclocal.m4 | 14 +++--
+ Makefile.in | 44 +++++++++++------------
+ aclocal.m4 | 14 ++++---
cat/Makefile.in | 2 +-
clone/Makefile.in | 2 +-
- config.h.in | 3 +
- configure | 166 ++++++++++++++++++++++++++++++++++++--------------
+ configure | 91 ++++++++++++++++++++++++++++----------------------
daemon/Makefile.in | 4 +-
df/Makefile.in | 2 +-
edit/Makefile.in | 2 +-
+ erlang/Makefile.in | 2 +-
fuse/Makefile.in | 2 +-
images/Makefile.in | 2 +-
- ocaml/Makefile.in | 19 +++---
- perl/Makefile.in | 8 ++-
- python/Makefile.in | 8 ++-
- resize/Makefile.in | 6 +-
- sparsify/Makefile.in | 8 +-
- tools/Makefile.in | 6 +-
- 17 files changed, 190 insertions(+), 111 deletions(-)
+ ocaml/Makefile.in | 19 +++++-----
+ perl/Makefile.in | 8 +++-
+ python/Makefile.in | 3 +-
+ resize/Makefile.in | 7 ++--
+ sparsify/Makefile.in | 8 ++--
+ tools/Makefile.in | 6 ++--
+ 17 files changed, 117 insertions(+), 101 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 3a8c3f6..58d7d6d 100644
+index 8729a23..e7fc02a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,7 +71,6 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
@@ -34,7 +34,7 @@ index 3a8c3f6..58d7d6d 100644
$(top_srcdir)/subdir-rules.mk ABOUT-NLS AUTHORS COPYING \
COPYING.LIB ChangeLog TODO build-aux/compile \
build-aux/config.guess build-aux/config.rpath \
-@@ -79,31 +78,32 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+@@ -79,30 +78,31 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
build-aux/ltmain.sh build-aux/missing
@ENABLE_DAEMON_TRUE at am__append_1 = daemon
@ENABLE_APPLIANCE_TRUE at am__append_2 = appliance
@@ -59,28 +59,26 @@ index 3a8c3f6..58d7d6d 100644
+ at HAVE_ERLANG_TRUE@am__append_11 = erlang erlang/examples
# virt-resize (new version) and virt-sparsify are written in OCaml.
-- at HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE at am__append_11 = resize
-- at HAVE_OCAML_TRUE@am__append_12 = sparsify
-+ at HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE at am__append_12 = resize
-+ at HAVE_OCAML_TRUE@am__append_13 = sparsify
+- at HAVE_OCAML_TRUE@am__append_11 = resize sparsify
++ at HAVE_OCAML_TRUE@am__append_12 = resize sparsify
# Perl tools.
-- at HAVE_TOOLS_TRUE@am__append_13 = tools
-+ at HAVE_TOOLS_TRUE@am__append_14 = tools
+- at HAVE_TOOLS_TRUE@am__append_12 = tools
++ at HAVE_TOOLS_TRUE@am__append_13 = tools
# guestmount
# virt-tools in shell. This uses guestmount and virt-inspector.
-- at HAVE_FUSE_TRUE@am__append_14 = fuse clone
-+ at HAVE_FUSE_TRUE@am__append_15 = fuse clone
+- at HAVE_FUSE_TRUE@am__append_13 = fuse clone
++ at HAVE_FUSE_TRUE@am__append_14 = fuse clone
# po-docs must come after tools, inspector.
-- at HAVE_PO4A_TRUE@am__append_15 = po-docs
-+ at HAVE_PO4A_TRUE@am__append_16 = po-docs
+- at HAVE_PO4A_TRUE@am__append_14 = po-docs
++ at HAVE_PO4A_TRUE@am__append_15 = po-docs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -229,7 +229,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+@@ -228,7 +228,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
@@ -89,7 +87,7 @@ index 3a8c3f6..58d7d6d 100644
CONFIG_CLEAN_VPATH_FILES =
AM_V_GEN = $(am__v_GEN_$(V))
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-@@ -277,7 +277,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+@@ -276,7 +276,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = gnulib/lib images generator src examples po daemon \
@@ -98,7 +96,7 @@ index 3a8c3f6..58d7d6d 100644
fish align cat df edit inspector rescue perl perl/examples \
ocaml ocaml/examples python python/examples ruby ruby/examples \
java java/examples haskell php erlang erlang/examples csharp \
-@@ -1318,13 +1318,12 @@ ACLOCAL_AMFLAGS = -I m4
+@@ -1316,12 +1316,12 @@ ACLOCAL_AMFLAGS = -I m4
# Unconditional because nothing is built yet.
SUBDIRS = gnulib/lib images generator src examples po $(am__append_1) \
@@ -107,18 +105,17 @@ index 3a8c3f6..58d7d6d 100644
- $(am__append_3) $(am__append_4) $(am__append_5) \
- $(am__append_6) $(am__append_7) $(am__append_8) \
- $(am__append_9) $(am__append_10) csharp $(am__append_11) \
-- $(am__append_12) $(am__append_13) $(am__append_14) \
-- $(am__append_15)
+- $(am__append_12) $(am__append_13) $(am__append_14)
+ $(am__append_2) gnulib/tests test-tool $(am__append_3) fish \
+ align cat df edit inspector rescue $(am__append_4) \
+ $(am__append_5) $(am__append_6) $(am__append_7) \
+ $(am__append_8) $(am__append_9) $(am__append_10) \
+ $(am__append_11) csharp $(am__append_12) $(am__append_13) \
-+ $(am__append_14) $(am__append_15) $(am__append_16)
++ $(am__append_14) $(am__append_15)
EXTRA_DIST = \
$(generator_built) \
BUGS HACKING RELEASE-NOTES ROADMAP TODO \
-@@ -1475,8 +1474,6 @@ podwrapper.sh: $(top_builddir)/config.status $(srcdir)/podwrapper.sh.in
+@@ -1472,8 +1472,6 @@ podwrapper.sh: $(top_builddir)/config.status $(srcdir)/podwrapper.sh.in
cd $(top_builddir) && $(SHELL) ./config.status $@
run: $(top_builddir)/config.status $(srcdir)/run.in
cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -182,10 +179,10 @@ index 404fe3e..ef6bd0b 100644
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff --git a/cat/Makefile.in b/cat/Makefile.in
-index cc4fae2..0f8938e 100644
+index fa4e83d..6d04733 100644
--- a/cat/Makefile.in
+++ b/cat/Makefile.in
-@@ -1373,7 +1373,7 @@ TESTS_ENVIRONMENT = \
+@@ -1372,7 +1372,7 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
@@ -195,10 +192,10 @@ index cc4fae2..0f8938e 100644
.SUFFIXES:
diff --git a/clone/Makefile.in b/clone/Makefile.in
-index feba17d..b271059 100644
+index 28fcec7..fb84fce 100644
--- a/clone/Makefile.in
+++ b/clone/Makefile.in
-@@ -1240,7 +1240,7 @@ TESTS_ENVIRONMENT = \
+@@ -1239,7 +1239,7 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
@@ -207,25 +204,11 @@ index feba17d..b271059 100644
all: all-am
.SUFFIXES:
-diff --git a/config.h.in b/config.h.in
-index 6f8080b..475e86e 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -981,6 +981,9 @@
- /* Define to 1 if you have the `PyCapsule_New' function. */
- #undef HAVE_PYCAPSULE_NEW
-
-+/* Define to 1 if you have the `PyString_AsString' function. */
-+#undef HAVE_PYSTRING_ASSTRING
-+
- /* Define to 1 if you have the `raise' function. */
- #undef HAVE_RAISE
-
diff --git a/configure b/configure
-index d0a99e2..7233d72 100755
+index aed418b..a97a6a8 100755
--- a/configure
+++ b/configure
-@@ -46476,7 +46476,10 @@ else
+@@ -46473,7 +46473,10 @@ else
enable_install_daemon=no
fi
@@ -237,7 +220,7 @@ index d0a99e2..7233d72 100755
INSTALL_DAEMON_TRUE=
INSTALL_DAEMON_FALSE='#'
else
-@@ -46484,9 +46487,6 @@ else
+@@ -46481,9 +46484,6 @@ else
INSTALL_DAEMON_FALSE=
fi
@@ -247,7 +230,7 @@ index d0a99e2..7233d72 100755
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should build the appliance" >&5
$as_echo_n "checking if we should build the appliance... " >&6; }
-@@ -46508,8 +46508,7 @@ fi
+@@ -46505,8 +46505,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_appliance" >&5
$as_echo "$enable_appliance" >&6; }
@@ -257,7 +240,7 @@ index d0a99e2..7233d72 100755
set dummy febootstrap; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-@@ -46547,12 +46546,8 @@ $as_echo "no" >&6; }
+@@ -46544,12 +46543,8 @@ $as_echo "no" >&6; }
fi
@@ -271,7 +254,7 @@ index d0a99e2..7233d72 100755
$as_echo_n "checking if user requested febootstrap --yum-config option... " >&6; }
# Check whether --with-febootstrap-yum-config was given.
-@@ -46562,26 +46557,32 @@ else
+@@ -46559,26 +46554,32 @@ else
FEBOOTSTRAP_YUM_CONFIG=no
fi
@@ -317,7 +300,7 @@ index d0a99e2..7233d72 100755
# Extract the first word of "rpcgen", so it can be a program name with args.
set dummy rpcgen; ac_word=$2
-@@ -49425,6 +49426,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+@@ -49422,6 +49423,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
@@ -325,7 +308,7 @@ index d0a99e2..7233d72 100755
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-@@ -49553,6 +49555,7 @@ if test -n "$PCRE_CFLAGS"; then
+@@ -49550,6 +49552,7 @@ if test -n "$PCRE_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_PCRE_CFLAGS=`$PKG_CONFIG --cflags "libpcre" 2>/dev/null`
@@ -333,7 +316,7 @@ index d0a99e2..7233d72 100755
else
pkg_failed=yes
fi
-@@ -49569,6 +49572,7 @@ if test -n "$PCRE_LIBS"; then
+@@ -49566,6 +49569,7 @@ if test -n "$PCRE_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_PCRE_LIBS=`$PKG_CONFIG --libs "libpcre" 2>/dev/null`
@@ -341,7 +324,7 @@ index d0a99e2..7233d72 100755
else
pkg_failed=yes
fi
-@@ -49588,9 +49592,9 @@ else
+@@ -49585,9 +49589,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -353,7 +336,7 @@ index d0a99e2..7233d72 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$PCRE_PKG_ERRORS" >&5
-@@ -49605,7 +49609,6 @@ installed software in a non-standard prefix.
+@@ -49602,7 +49606,6 @@ installed software in a non-standard prefix.
Alternatively, you may set the environment variables PCRE_CFLAGS
and PCRE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
@@ -361,7 +344,7 @@ index d0a99e2..7233d72 100755
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -49621,7 +49624,6 @@ See the pkg-config man page for more details.
+@@ -49618,7 +49621,6 @@ See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
@@ -369,7 +352,7 @@ index d0a99e2..7233d72 100755
else
PCRE_CFLAGS=$pkg_cv_PCRE_CFLAGS
PCRE_LIBS=$pkg_cv_PCRE_LIBS
-@@ -49700,6 +49702,7 @@ if test -n "$LIBVIRT_CFLAGS"; then
+@@ -49697,6 +49699,7 @@ if test -n "$LIBVIRT_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBVIRT_CFLAGS=`$PKG_CONFIG --cflags "libvirt" 2>/dev/null`
@@ -377,7 +360,7 @@ index d0a99e2..7233d72 100755
else
pkg_failed=yes
fi
-@@ -49716,6 +49719,7 @@ if test -n "$LIBVIRT_LIBS"; then
+@@ -49713,6 +49716,7 @@ if test -n "$LIBVIRT_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBVIRT_LIBS=`$PKG_CONFIG --libs "libvirt" 2>/dev/null`
@@ -385,7 +368,7 @@ index d0a99e2..7233d72 100755
else
pkg_failed=yes
fi
-@@ -49735,9 +49739,9 @@ else
+@@ -49732,9 +49736,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -397,7 +380,7 @@ index d0a99e2..7233d72 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBVIRT_PKG_ERRORS" >&5
-@@ -49785,6 +49789,7 @@ if test -n "$LIBXML2_CFLAGS"; then
+@@ -49782,6 +49786,7 @@ if test -n "$LIBXML2_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
@@ -405,7 +388,7 @@ index d0a99e2..7233d72 100755
else
pkg_failed=yes
fi
-@@ -49801,6 +49806,7 @@ if test -n "$LIBXML2_LIBS"; then
+@@ -49798,6 +49803,7 @@ if test -n "$LIBXML2_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
@@ -413,7 +396,7 @@ index d0a99e2..7233d72 100755
else
pkg_failed=yes
fi
-@@ -49820,9 +49826,9 @@ else
+@@ -49817,9 +49823,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -425,7 +408,7 @@ index d0a99e2..7233d72 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBXML2_PKG_ERRORS" >&5
-@@ -49870,6 +49876,7 @@ if test -n "$LIBCONFIG_CFLAGS"; then
+@@ -49867,6 +49873,7 @@ if test -n "$LIBCONFIG_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBCONFIG_CFLAGS=`$PKG_CONFIG --cflags "libconfig" 2>/dev/null`
@@ -433,7 +416,7 @@ index d0a99e2..7233d72 100755
else
pkg_failed=yes
fi
-@@ -49886,6 +49893,7 @@ if test -n "$LIBCONFIG_LIBS"; then
+@@ -49883,6 +49890,7 @@ if test -n "$LIBCONFIG_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBCONFIG_LIBS=`$PKG_CONFIG --libs "libconfig" 2>/dev/null`
@@ -441,7 +424,7 @@ index d0a99e2..7233d72 100755
else
pkg_failed=yes
fi
-@@ -49905,9 +49913,9 @@ else
+@@ -49902,9 +49910,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -453,7 +436,7 @@ index d0a99e2..7233d72 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBCONFIG_PKG_ERRORS" >&5
-@@ -49955,6 +49963,7 @@ if test -n "$HIVEX_CFLAGS"; then
+@@ -49952,6 +49960,7 @@ if test -n "$HIVEX_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_HIVEX_CFLAGS=`$PKG_CONFIG --cflags "hivex" 2>/dev/null`
@@ -461,7 +444,7 @@ index d0a99e2..7233d72 100755
else
pkg_failed=yes
fi
-@@ -49971,6 +49980,7 @@ if test -n "$HIVEX_LIBS"; then
+@@ -49968,6 +49977,7 @@ if test -n "$HIVEX_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_HIVEX_LIBS=`$PKG_CONFIG --libs "hivex" 2>/dev/null`
@@ -469,7 +452,7 @@ index d0a99e2..7233d72 100755
else
pkg_failed=yes
fi
-@@ -49990,9 +50000,9 @@ else
+@@ -49987,9 +49997,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -481,7 +464,7 @@ index d0a99e2..7233d72 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$HIVEX_PKG_ERRORS" >&5
-@@ -50048,6 +50058,7 @@ if test -n "$FUSE_CFLAGS"; then
+@@ -50045,6 +50055,7 @@ if test -n "$FUSE_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_FUSE_CFLAGS=`$PKG_CONFIG --cflags "fuse" 2>/dev/null`
@@ -489,7 +472,7 @@ index d0a99e2..7233d72 100755
else
pkg_failed=yes
fi
-@@ -50064,6 +50075,7 @@ if test -n "$FUSE_LIBS"; then
+@@ -50061,6 +50072,7 @@ if test -n "$FUSE_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_FUSE_LIBS=`$PKG_CONFIG --libs "fuse" 2>/dev/null`
@@ -497,7 +480,7 @@ index d0a99e2..7233d72 100755
else
pkg_failed=yes
fi
-@@ -50083,9 +50095,9 @@ else
+@@ -50080,9 +50092,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -509,98 +492,7 @@ index d0a99e2..7233d72 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$FUSE_PKG_ERRORS" >&5
-@@ -51318,7 +51330,9 @@ $as_echo "$PYTHON_PREFIX" >&6; }
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5
- $as_echo_n "checking Python version... " >&6; }
-- PYTHON_VERSION=`$PYTHON -c "import sys; print (sys.version[0:3])"`
-+ 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"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_VERSION" >&5
- $as_echo "$PYTHON_VERSION" >&6; }
-
-@@ -51355,14 +51369,73 @@ $as_echo_n "checking for Python site-packages path... " >&6; }
- $as_echo "$PYTHON_INSTALLDIR" >&6; }
- fi
-
-- old_LIBS="$LIBS"
-- LIBS="$LIBS -lpython$PYTHON_VERSION"
-- for ac_func in PyCapsule_New
-+ old_LIBS="$LIBS"
-+ if test "x$PYTHON_VERSION_MAJOR" = "x3"; then
-+ LIBPYTHON="python${PYTHON_VERSION}mu"
-+ else
-+ LIBPYTHON="python$PYTHON_VERSION"
-+ fi
-+ as_ac_Lib=`$as_echo "ac_cv_lib_$LIBPYTHON''_PyList_Size" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PyList_Size in -l$LIBPYTHON" >&5
-+$as_echo_n "checking for PyList_Size in -l$LIBPYTHON... " >&6; }
-+if eval \${$as_ac_Lib+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-l$LIBPYTHON $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char PyList_Size ();
-+int
-+main ()
-+{
-+return PyList_Size ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ eval "$as_ac_Lib=yes"
-+else
-+ eval "$as_ac_Lib=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+eval ac_res=\$$as_ac_Lib
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_LIB$LIBPYTHON" | $as_tr_cpp` 1
-+_ACEOF
-+
-+ LIBS="-l$LIBPYTHON $LIBS"
-+
-+else
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "$LIBPYTHON is not installed
-+See \`config.log' for more details" "$LINENO" 5; }
-+fi
-+
-+
-+ for ac_func in PyCapsule_New \
-+ PyString_AsString
- do :
-- ac_fn_c_check_func "$LINENO" "PyCapsule_New" "ac_cv_func_PyCapsule_New"
--if test "x$ac_cv_func_PyCapsule_New" = xyes; then :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
--#define HAVE_PYCAPSULE_NEW 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- fi
-@@ -52441,7 +52514,7 @@ ac_config_files="$ac_config_files podwrapper.sh"
+@@ -52464,7 +52476,7 @@ ac_config_files="$ac_config_files podwrapper.sh"
ac_config_files="$ac_config_files run"
@@ -609,7 +501,7 @@ index d0a99e2..7233d72 100755
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -53654,7 +53727,6 @@ do
+@@ -53673,7 +53685,6 @@ do
"clone/Makefile") CONFIG_FILES="$CONFIG_FILES clone/Makefile" ;;
"csharp/Makefile") CONFIG_FILES="$CONFIG_FILES csharp/Makefile" ;;
"daemon/Makefile") CONFIG_FILES="$CONFIG_FILES daemon/Makefile" ;;
@@ -618,10 +510,10 @@ index d0a99e2..7233d72 100755
"edit/Makefile") CONFIG_FILES="$CONFIG_FILES edit/Makefile" ;;
"erlang/Makefile") CONFIG_FILES="$CONFIG_FILES erlang/Makefile" ;;
diff --git a/daemon/Makefile.in b/daemon/Makefile.in
-index 7e2f643..ce9fa4d 100644
+index 55e1335..5fef579 100644
--- a/daemon/Makefile.in
+++ b/daemon/Makefile.in
-@@ -3107,10 +3107,10 @@ $(top_builddir)/daemon/guestfsd: force
+@@ -3106,10 +3106,10 @@ $(top_builddir)/daemon/guestfsd: force
appliance: force
$(MAKE) -C $(top_builddir)/appliance
@@ -635,10 +527,10 @@ index 7e2f643..ce9fa4d 100644
ln $< $@
$(libsrcdir)/guestfs_protocol.c: force
diff --git a/df/Makefile.in b/df/Makefile.in
-index 7558be5..acd57cb 100644
+index fcd86ba..3202cd9 100644
--- a/df/Makefile.in
+++ b/df/Makefile.in
-@@ -1313,7 +1313,7 @@ TESTS_ENVIRONMENT = \
+@@ -1312,7 +1312,7 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
@@ -648,10 +540,10 @@ index 7558be5..acd57cb 100644
.SUFFIXES:
diff --git a/edit/Makefile.in b/edit/Makefile.in
-index 189f9c4..50e7052 100644
+index 16ff4c3..6784b21 100644
--- a/edit/Makefile.in
+++ b/edit/Makefile.in
-@@ -1302,7 +1302,7 @@ TESTS_ENVIRONMENT = \
+@@ -1301,7 +1301,7 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
@@ -660,11 +552,24 @@ index 189f9c4..50e7052 100644
all: all-am
.SUFFIXES:
+diff --git a/erlang/Makefile.in b/erlang/Makefile.in
+index 99e450e..45f4f63 100644
+--- a/erlang/Makefile.in
++++ b/erlang/Makefile.in
+@@ -1674,7 +1674,7 @@ appliance: force
+ $(MAKE) -C $(top_builddir)/appliance
+
+ @HAVE_ERLANG_TRUE at guestfs.beam: guestfs.erl
+- at HAVE_ERLANG_TRUE@ $(ERLC) +debug_info guestfs.erl
++ at HAVE_ERLANG_TRUE@ $(ERLC) +debug_info $^
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/fuse/Makefile.in b/fuse/Makefile.in
-index 61ef7f3..bef982b 100644
+index 08a38a8..ab092bf 100644
--- a/fuse/Makefile.in
+++ b/fuse/Makefile.in
-@@ -1309,7 +1309,7 @@ CLEANFILES = stamp-guestmount.pod
+@@ -1308,7 +1308,7 @@ CLEANFILES = stamp-guestmount.pod
@HAVE_FUSE_TRUE at noinst_DATA = $(top_builddir)/html/guestmount.1.html
# Tests.
@@ -674,10 +579,10 @@ index 61ef7f3..bef982b 100644
@HAVE_FUSE_TRUE@ top_builddir=..
diff --git a/images/Makefile.in b/images/Makefile.in
-index 19f3346..c11b827 100644
+index f2e3f4e..4a51f55 100644
--- a/images/Makefile.in
+++ b/images/Makefile.in
-@@ -1228,7 +1228,7 @@ noinst_DATA = test.iso
+@@ -1227,7 +1227,7 @@ noinst_DATA = test.iso
# This is 'check_DATA' because we don't need it until 'make check'
# time and we need the tools we have built in order to make it.
@@ -687,7 +592,7 @@ index 19f3346..c11b827 100644
test.iso test.sqsh \
100kallzeroes 100kallnewlines 100kallspaces 100krandom 10klines \
diff --git a/ocaml/Makefile.in b/ocaml/Makefile.in
-index e21dfcb..7a80668 100644
+index 060d7a2..52f4ab9 100644
--- a/ocaml/Makefile.in
+++ b/ocaml/Makefile.in
@@ -71,7 +71,11 @@ DIST_COMMON = $(srcdir)/.depend $(srcdir)/META.in \
@@ -703,7 +608,7 @@ index e21dfcb..7a80668 100644
subdir = ocaml
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1213,7 +1217,7 @@ EXTRA_DIST = \
+@@ -1212,7 +1216,7 @@ EXTRA_DIST = \
t/*.ml
CLEANFILES = *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so t/*.cmi \
@@ -712,7 +617,7 @@ index e21dfcb..7a80668 100644
AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
-I$(top_srcdir)/src -I$(top_builddir)/src \
$(WARN_CFLAGS) $(WERROR_CFLAGS)
-@@ -1231,14 +1235,9 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
+@@ -1232,14 +1236,9 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
@HAVE_OCAML_TRUE@ TMPDIR=$(top_builddir) \
@HAVE_OCAML_TRUE@ $(VG)
@@ -731,7 +636,7 @@ index e21dfcb..7a80668 100644
all: all-am
diff --git a/perl/Makefile.in b/perl/Makefile.in
-index f8232d3..12444e8 100644
+index 87bc059..de761fe 100644
--- a/perl/Makefile.in
+++ b/perl/Makefile.in
@@ -68,6 +68,8 @@ build_triplet = @build@
@@ -743,7 +648,7 @@ index f8232d3..12444e8 100644
subdir = perl
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1209,7 +1211,8 @@ EXTRA_DIST = \
+@@ -1208,7 +1210,8 @@ EXTRA_DIST = \
t/*.t \
typemap
@@ -753,7 +658,7 @@ index f8232d3..12444e8 100644
@HAVE_PERL_TRUE at TESTS_ENVIRONMENT = \
@HAVE_PERL_TRUE@ LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
@HAVE_PERL_TRUE@ LIBGUESTFS_PATH=$(top_builddir)/appliance \
-@@ -1534,12 +1537,13 @@ appliance: force
+@@ -1533,12 +1536,13 @@ appliance: force
@HAVE_PERL_TRUE at test_images:
@HAVE_PERL_TRUE@ $(MAKE) -C $(top_builddir)/images
@@ -769,18 +674,9 @@ index f8232d3..12444e8 100644
# No! Otherwise it is deleted before the clean-local rule runs.
diff --git a/python/Makefile.in b/python/Makefile.in
-index d3cd517..9f80541 100644
+index 60c0c14..e48fa5a 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
-@@ -16,7 +16,7 @@
- @SET_MAKE@
-
- # libguestfs Python bindings
--# Copyright (C) 2009 Red Hat Inc.
-+# Copyright (C) 2009-2011 Red Hat Inc.
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
@@ -70,6 +70,7 @@ build_triplet = @build@
host_triplet = @host@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
@@ -789,13 +685,9 @@ index d3cd517..9f80541 100644
subdir = python
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1279,9 +1280,10 @@ EXTRA_DIST = \
- @HAVE_PYTHON_TRUE at TESTS_ENVIRONMENT = \
- @HAVE_PYTHON_TRUE@ LIBGUESTFS_PATH=$(top_builddir)/appliance \
- @HAVE_PYTHON_TRUE@ PYTHONPATH=$(builddir):$(builddir)/.libs \
-- at HAVE_PYTHON_TRUE@ TMPDIR=$(top_builddir)
-+ at HAVE_PYTHON_TRUE@ TMPDIR=$(top_builddir) \
-+ at HAVE_PYTHON_TRUE@ PYTHON=$(PYTHON)
+@@ -1281,7 +1282,7 @@ EXTRA_DIST = \
+ @HAVE_PYTHON_TRUE@ TMPDIR=$(top_builddir) \
+ @HAVE_PYTHON_TRUE@ PYTHON=$(PYTHON)
- at HAVE_PYTHON_TRUE@TESTS = run-bindtests run-python-tests
+ at HAVE_PYTHON_TRUE@TESTS = run-bindtests $(am__append_1)
@@ -803,41 +695,49 @@ index d3cd517..9f80541 100644
.SUFFIXES:
diff --git a/resize/Makefile.in b/resize/Makefile.in
-index 9960a31..d00ecd9 100644
+index 26312a9..b562fa1 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
-@@ -1241,7 +1241,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
+@@ -72,6 +72,7 @@ DIST_COMMON = $(srcdir)/.depend $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(top_srcdir)/subdir-rules.mk
+ SOURCES =
+ @HAVE_OCAML_TRUE at am__append_1 = stamp-virt-resize.pod
++ at ENABLE_APPLIANCE_TRUE@@HAVE_OCAML_TRUE at am__append_2 = test-virt-resize.sh
+ subdir = resize
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
+@@ -1241,7 +1242,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
# Note this list must be in dependency order.
- @HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE at OBJECTS = \
-- at HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE@ ../fish/guestfish-progress.o \
-+ at HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE@ $(top_builddir)/fish/guestfish-progress.o \
- @HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE@ progress_c.o \
- @HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE@ utils.cmx \
- @HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE@ progress.cmx \
-@@ -1258,7 +1258,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
+ @HAVE_OCAML_TRUE at OBJECTS = \
+- at HAVE_OCAML_TRUE@ ../fish/guestfish-progress.o \
++ at HAVE_OCAML_TRUE@ $(top_builddir)/fish/guestfish-progress.o \
+ @HAVE_OCAML_TRUE@ progress_c.o \
+ @HAVE_OCAML_TRUE@ utils.cmx \
+ @HAVE_OCAML_TRUE@ progress.cmx \
+@@ -1258,7 +1259,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
# automake will decide we don't need C support in this file. Really
# we do, so we have to provide it ourselves.
-- at HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE at DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(shell $(OCAMLC) -where) -I../fish
-+ at HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE at DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(shell $(OCAMLC) -where) -I$(top_srcdir)/fish
+- at HAVE_OCAML_TRUE@DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(shell $(OCAMLC) -where) -I../fish
++ at HAVE_OCAML_TRUE@DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(shell $(OCAMLC) -where) -I$(top_srcdir)/fish
# Manual pages and HTML files for the website.
- @HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE at man_MANS = virt-resize.1
-@@ -1272,7 +1272,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
- @HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE@ LIBGUESTFS_PATH=$(top_builddir)/appliance \
- @HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE@ TMPDIR=$(top_builddir)
+ @HAVE_OCAML_TRUE at man_MANS = virt-resize.1
+@@ -1273,7 +1274,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
+ @HAVE_OCAML_TRUE@ LIBGUESTFS_PATH=$(top_builddir)/appliance \
+ @HAVE_OCAML_TRUE@ TMPDIR=$(top_builddir)
-- at HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE at TESTS = test-virt-resize.sh
-+ at ENABLE_APPLIANCE_TRUE@@HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE at TESTS = test-virt-resize.sh
+- at HAVE_OCAML_TRUE@TESTS = test-virt-resize.sh utils_tests
++ at HAVE_OCAML_TRUE@TESTS = utils_tests $(am__append_2)
all: all-am
.SUFFIXES:
diff --git a/sparsify/Makefile.in b/sparsify/Makefile.in
-index 21c8e80..bcbd0a9 100644
+index d11e272..dea641f 100644
--- a/sparsify/Makefile.in
+++ b/sparsify/Makefile.in
-@@ -1241,7 +1241,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
+@@ -1240,7 +1240,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
# Note this list must be in dependency order.
@HAVE_OCAML_TRUE at OBJECTS = \
@@ -846,7 +746,7 @@ index 21c8e80..bcbd0a9 100644
@HAVE_OCAML_TRUE@ progress_c.o \
@HAVE_OCAML_TRUE@ utils.cmx \
@HAVE_OCAML_TRUE@ progress.cmx \
-@@ -1252,13 +1252,13 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
+@@ -1251,13 +1251,13 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
# -I $(top_builddir)/src/.libs is a hack which forces corresponding -L
# option to be passed to gcc, so we don't try linking against an
# installed copy of libguestfs.
@@ -862,7 +762,7 @@ index 21c8e80..bcbd0a9 100644
# Manual pages and HTML files for the website.
@HAVE_OCAML_TRUE at man_MANS = virt-sparsify.1
-@@ -1272,7 +1272,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
+@@ -1271,7 +1271,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
@HAVE_OCAML_TRUE@ LIBGUESTFS_PATH=$(top_builddir)/appliance \
@HAVE_OCAML_TRUE@ TMPDIR=$(top_builddir)
@@ -872,10 +772,10 @@ index 21c8e80..bcbd0a9 100644
.SUFFIXES:
diff --git a/tools/Makefile.in b/tools/Makefile.in
-index 3d20041..d727faa 100644
+index 780dcff..c2ff566 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
-@@ -1252,9 +1252,9 @@ CLEANFILES = test.img
+@@ -1251,9 +1251,9 @@ CLEANFILES = test.img
@HAVE_TOOLS_TRUE@ TMPDIR=$(top_builddir) \
@HAVE_TOOLS_TRUE@ PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch
diff --git a/debian/patches/0012-python-Include-config.h.patch b/debian/patches/0012-python-Include-config.h.patch
deleted file mode 100644
index abea81e..0000000
--- a/debian/patches/0012-python-Include-config.h.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Wed, 2 Nov 2011 18:19:15 +0000
-Subject: python: Include <config.h>.
-
-Ooops ...
----
- generator/generator_python.ml | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/generator/generator_python.ml b/generator/generator_python.ml
-index c8448aa..10a4eca 100644
---- a/generator/generator_python.ml
-+++ b/generator/generator_python.ml
-@@ -35,6 +35,8 @@ let rec generate_python_c () =
- generate_header CStyle LGPLv2plus;
-
- pr "\
-+#include <config.h>
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <assert.h>
---
diff --git a/debian/patches/0013-python-Pass-PYTHON-environment-variable-to-tests.patch b/debian/patches/0013-python-Pass-PYTHON-environment-variable-to-tests.patch
deleted file mode 100644
index 952b9f6..0000000
--- a/debian/patches/0013-python-Pass-PYTHON-environment-variable-to-tests.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Wed, 2 Nov 2011 19:42:29 +0000
-Subject: python: Pass $PYTHON environment variable to tests.
-
-If the user set PYTHON when configuring, this variable is not passed
-through to the tests, so it is possible the tests will fail because
-they are testing the wrong version of python. By passing $PYTHON
-through to the tests we ensure that we test against the same version
-of python that we configured with.
----
- python/Makefile.am | 5 +++--
- python/run-bindtests | 4 ++--
- python/run-python-tests | 4 ++--
- 3 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/python/Makefile.am b/python/Makefile.am
-index 97fae83..f26ee71 100644
---- a/python/Makefile.am
-+++ b/python/Makefile.am
-@@ -1,5 +1,5 @@
- # libguestfs Python bindings
--# Copyright (C) 2009 Red Hat Inc.
-+# Copyright (C) 2009-2011 Red Hat Inc.
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -48,7 +48,8 @@ libguestfsmod_la_LDFLAGS = -avoid-version -shared
- TESTS_ENVIRONMENT = \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
- PYTHONPATH=$(builddir):$(builddir)/.libs \
-- TMPDIR=$(top_builddir)
-+ TMPDIR=$(top_builddir) \
-+ PYTHON=$(PYTHON)
-
- TESTS = run-bindtests
-
-diff --git a/python/run-bindtests b/python/run-bindtests
-index 08a24e6..cf28bb6 100755
---- a/python/run-bindtests
-+++ b/python/run-bindtests
-@@ -1,6 +1,6 @@
- #!/bin/sh -
- # libguestfs Perl bindings
--# Copyright (C) 2009 Red Hat Inc.
-+# Copyright (C) 2009-2011 Red Hat Inc.
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -18,5 +18,5 @@
-
- set -e
-
--python ${srcdir}/bindtests.py > bindtests.tmp
-+$PYTHON ${srcdir}/bindtests.py > bindtests.tmp
- diff -u ${srcdir}/../bindtests bindtests.tmp
-diff --git a/python/run-python-tests b/python/run-python-tests
-index 487f8ab..f82dc10 100755
---- a/python/run-python-tests
-+++ b/python/run-python-tests
-@@ -1,6 +1,6 @@
- #!/bin/sh -
- # libguestfs Perl bindings
--# Copyright (C) 2009 Red Hat Inc.
-+# Copyright (C) 2009-2011 Red Hat Inc.
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -19,5 +19,5 @@
- set -e
-
- for f in t/*.py; do
-- python $f
-+ $PYTHON $f
- done
---
diff --git a/debian/patches/0014-python-Fixes-for-Python-3-RHBZ-750889.patch b/debian/patches/0014-python-Fixes-for-Python-3-RHBZ-750889.patch
deleted file mode 100644
index fdfaf87..0000000
--- a/debian/patches/0014-python-Fixes-for-Python-3-RHBZ-750889.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Wed, 2 Nov 2011 19:43:53 +0000
-Subject: python: Fixes for Python 3 (RHBZ#750889).
-
-These fixes allow libguestfs bindings to work with Python 3 (tested
-with Python 3.2)
-
-You can select which Python you compile against by doing:
-
- PYTHON=python ./configure && make && make check
-
-or:
-
- PYTHON=python3 ./configure && make && make check
----
- .gitignore | 1 +
- configure.ac | 14 ++++-
- generator/generator_bindtests.ml | 2 +-
- generator/generator_python.ml | 128 ++++++++++++++++++++++++++++++++------
- python/guestfs-py-byhand.c | 2 +-
- 5 files changed, 123 insertions(+), 24 deletions(-)
-
-diff --git a/.gitignore b/.gitignore
-index 8980fd0..fc70e76 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -295,6 +295,7 @@ po-docs/*/*.pod
- po-docs/*/*.1
- po-docs/*/*.3
- podwrapper.sh
-+python/__pycache__
- python/bindtests.py
- python/examples/guestfs-python.3
- python/examples/stamp-guestfs-python.pod
-diff --git a/configure.ac b/configure.ac
-index d5125e5..1319d32 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -744,9 +744,19 @@ AS_IF([test "x$enable_python" != "xno"],
- AC_MSG_RESULT([$PYTHON_INSTALLDIR])
- fi
-
-+ dnl Look for libpython and some optional symbols in it.
- old_LIBS="$LIBS"
-- LIBS="$LIBS -lpython$PYTHON_VERSION"
-- AC_CHECK_FUNCS([PyCapsule_New])
-+ if test "x$PYTHON_VERSION_MAJOR" = "x3"; then
-+ dnl libpython3 is called "libpython3.Xmu.so"
-+ LIBPYTHON="python${PYTHON_VERSION}mu"
-+ else
-+ LIBPYTHON="python$PYTHON_VERSION"
-+ fi
-+ AC_CHECK_LIB([$LIBPYTHON], [PyList_Size], [],
-+ [AC_MSG_FAILURE([$LIBPYTHON is not installed])])
-+
-+ AC_CHECK_FUNCS([PyCapsule_New \
-+ PyString_AsString])
- LIBS="$old_LIBS"
- fi
-
-diff --git a/generator/generator_bindtests.ml b/generator/generator_bindtests.ml
-index 859f189..4d4795a 100644
---- a/generator/generator_bindtests.ml
-+++ b/generator/generator_bindtests.ml
-@@ -301,7 +301,7 @@ g = guestfs.GuestFS ()
- fun f args -> pr "g.%s (%s)\n" f (mkargs args)
- );
-
-- pr "print \"EOF\"\n"
-+ pr "print (\"EOF\")\n"
-
- and generate_ruby_bindtests () =
- generate_header HashStyle GPLv2plus;
-diff --git a/generator/generator_python.ml b/generator/generator_python.ml
-index 10a4eca..6d22c18 100644
---- a/generator/generator_python.ml
-+++ b/generator/generator_python.ml
-@@ -49,6 +49,9 @@ get_string_list (PyObject *obj)
- {
- size_t i, len;
- char **r;
-+#ifndef HAVE_PYSTRING_ASSTRING
-+ PyObject *bytes;
-+#endif
-
- assert (obj);
-
-@@ -69,8 +72,14 @@ get_string_list (PyObject *obj)
- return NULL;
- }
-
-- for (i = 0; i < len; ++i)
-+ for (i = 0; i < len; ++i) {
-+#ifdef HAVE_PYSTRING_ASSTRING
- r[i] = PyString_AsString (PyList_GetItem (obj, i));
-+#else
-+ bytes = PyUnicode_AsUTF8String (PyList_GetItem (obj, i));
-+ r[i] = PyBytes_AS_STRING (bytes);
-+#endif
-+ }
- r[len] = NULL;
-
- return r;
-@@ -86,8 +95,13 @@ put_string_list (char * const * const argv)
- ;
-
- list = PyList_New (argc);
-- for (i = 0; i < argc; ++i)
-+ for (i = 0; i < argc; ++i) {
-+#ifdef HAVE_PYSTRING_ASSTRING
- PyList_SetItem (list, i, PyString_FromString (argv[i]));
-+#else
-+ PyList_SetItem (list, i, PyUnicode_FromString (argv[i]));
-+#endif
-+ }
-
- return list;
- }
-@@ -104,8 +118,13 @@ put_table (char * const * const argv)
- list = PyList_New (argc >> 1);
- for (i = 0; i < argc; i += 2) {
- item = PyTuple_New (2);
-+#ifdef HAVE_PYSTRING_ASSTRING
- PyTuple_SetItem (item, 0, PyString_FromString (argv[i]));
- PyTuple_SetItem (item, 1, PyString_FromString (argv[i+1]));
-+#else
-+ PyTuple_SetItem (item, 0, PyUnicode_FromString (argv[i]));
-+ PyTuple_SetItem (item, 1, PyUnicode_FromString (argv[i+1]));
-+#endif
- PyList_SetItem (list, i >> 1, item);
- }
-
-@@ -152,16 +171,31 @@ free_strings (char **argv)
- function
- | name, FString ->
- pr " PyDict_SetItemString (dict, \"%s\",\n" name;
-+ pr "#ifdef HAVE_PYSTRING_ASSTRING\n";
- pr " PyString_FromString (%s->%s));\n"
-- typ name
-+ typ name;
-+ pr "#else\n";
-+ pr " PyUnicode_FromString (%s->%s));\n"
-+ typ name;
-+ pr "#endif\n"
- | name, FBuffer ->
- pr " PyDict_SetItemString (dict, \"%s\",\n" name;
-+ pr "#ifdef HAVE_PYSTRING_ASSTRING\n";
- pr " PyString_FromStringAndSize (%s->%s, %s->%s_len));\n"
-- typ name typ name
-+ typ name typ name;
-+ pr "#else\n";
-+ pr " PyBytes_FromStringAndSize (%s->%s, %s->%s_len));\n"
-+ typ name typ name;
-+ pr "#endif\n"
- | name, FUUID ->
- pr " PyDict_SetItemString (dict, \"%s\",\n" name;
-+ pr "#ifdef HAVE_PYSTRING_ASSTRING\n";
- pr " PyString_FromStringAndSize (%s->%s, 32));\n"
-- typ name
-+ typ name;
-+ pr "#else\n";
-+ pr " PyBytes_FromStringAndSize (%s->%s, 32));\n"
-+ typ name;
-+ pr "#endif\n"
- | name, (FBytes|FUInt64) ->
- pr " PyDict_SetItemString (dict, \"%s\",\n" name;
- pr " PyLong_FromUnsignedLongLong (%s->%s));\n"
-@@ -188,8 +222,13 @@ free_strings (char **argv)
- pr " PyDict_SetItemString (dict, \"%s\", Py_None);\n" name;
- pr " }\n"
- | name, FChar ->
-+ pr "#ifdef HAVE_PYSTRING_ASSTRING\n";
- pr " PyDict_SetItemString (dict, \"%s\",\n" name;
-- pr " PyString_FromStringAndSize (&dirent->%s, 1));\n" name
-+ pr " PyString_FromStringAndSize (&dirent->%s, 1));\n" name;
-+ pr "#else\n";
-+ pr " PyDict_SetItemString (dict, \"%s\",\n" name;
-+ pr " PyUnicode_FromStringAndSize (&dirent->%s, 1));\n" name;
-+ pr "#endif\n"
- ) cols;
- pr " return dict;\n";
- pr "};\n";
-@@ -419,18 +458,31 @@ free_strings (char **argv)
- pr " Py_INCREF (Py_None);\n";
- pr " py_r = Py_None;\n"
- | RInt _
-- | RBool _ -> pr " py_r = PyInt_FromLong ((long) r);\n"
-+ | RBool _ -> pr " py_r = PyLong_FromLong ((long) r);\n"
- | RInt64 _ -> pr " py_r = PyLong_FromLongLong (r);\n"
-- | RConstString _ -> pr " py_r = PyString_FromString (r);\n"
-+ | RConstString _ ->
-+ pr "#ifdef HAVE_PYSTRING_ASSTRING\n";
-+ pr " py_r = PyString_FromString (r);\n";
-+ pr "#else\n";
-+ pr " py_r = PyUnicode_FromString (r);\n";
-+ pr "#endif\n"
- | RConstOptString _ ->
-- pr " if (r)\n";
-+ pr " if (r) {\n";
-+ pr "#ifdef HAVE_PYSTRING_ASSTRING\n";
- pr " py_r = PyString_FromString (r);\n";
-- pr " else {\n";
-+ pr "#else\n";
-+ pr " py_r = PyUnicode_FromString (r);\n";
-+ pr "#endif\n";
-+ pr " } else {\n";
- pr " Py_INCREF (Py_None);\n";
- pr " py_r = Py_None;\n";
- pr " }\n"
- | RString _ ->
-+ pr "#ifdef HAVE_PYSTRING_ASSTRING\n";
- pr " py_r = PyString_FromString (r);\n";
-+ pr "#else\n";
-+ pr " py_r = PyUnicode_FromString (r);\n";
-+ pr "#endif\n";
- pr " free (r);\n"
- | RStringList _ ->
- pr " py_r = put_string_list (r);\n";
-@@ -445,7 +497,11 @@ free_strings (char **argv)
- pr " py_r = put_table (r);\n";
- pr " free_strings (r);\n"
- | RBufferOut _ ->
-+ pr "#ifdef HAVE_PYSTRING_ASSTRING\n";
- pr " py_r = PyString_FromStringAndSize (r, size);\n";
-+ pr "#else\n";
-+ pr " py_r = PyBytes_FromStringAndSize (r, size);\n";
-+ pr "#endif\n";
- pr " free (r);\n"
- );
-
-@@ -473,15 +529,47 @@ free_strings (char **argv)
-
- (* Init function. *)
- pr "\
-+#if PY_MAJOR_VERSION >= 3
-+static struct PyModuleDef moduledef = {
-+ PyModuleDef_HEAD_INIT,
-+ \"libguestfsmod\", /* m_name */
-+ \"libguestfs module\", /* m_doc */
-+ -1, /* m_size */
-+ methods, /* m_methods */
-+ NULL, /* m_reload */
-+ NULL, /* m_traverse */
-+ NULL, /* m_clear */
-+ NULL, /* m_free */
-+};
-+#endif
-+
-+static PyObject *
-+moduleinit (void)
-+{
-+ PyObject *m;
-+
-+#if PY_MAJOR_VERSION >= 3
-+ m = PyModule_Create (&moduledef);
-+#else
-+ m = Py_InitModule ((char *) \"libguestfsmod\", methods);
-+#endif
-+
-+ return m; /* m might be NULL if module init failed */
-+}
-+
-+#if PY_MAJOR_VERSION >= 3
-+PyMODINIT_FUNC
-+PyInit_libguestfsmod (void)
-+{
-+ return moduleinit ();
-+}
-+#else
- void
- initlibguestfsmod (void)
- {
-- static int initialized = 0;
--
-- if (initialized) return;
-- Py_InitModule ((char *) \"libguestfsmod\", methods);
-- initialized = 1;
-+ (void) moduleinit ();
- }
-+#endif
- "
-
- (* Generate Python module. *)
-@@ -489,7 +577,7 @@ and generate_python_py () =
- generate_header HashStyle LGPLv2plus;
-
- pr "\
--u\"\"\"Python bindings for libguestfs
-+\"\"\"Python bindings for libguestfs
-
- import guestfs
- g = guestfs.GuestFS ()
-@@ -566,7 +654,7 @@ class GuestFS:
- raise ClosedHandle (\"GuestFS: method called on closed handle\")
-
- def close (self):
-- u\"\"\"Explicitly close the guestfs handle.
-+ \"\"\"Explicitly close the guestfs handle.
-
- The handle is closed implicitly when its reference count goes
- to zero (eg. when it goes out of scope or the program ends).
-@@ -581,7 +669,7 @@ class GuestFS:
- self._o = None
-
- def set_event_callback (self, cb, event_bitmask):
-- u\"\"\"Register an event callback.
-+ \"\"\"Register an event callback.
-
- Register \"cb\" as a callback function for all of the
- events in \"event_bitmask\". \"event_bitmask\" should be
-@@ -606,7 +694,7 @@ class GuestFS:
- return libguestfsmod.set_event_callback (self._o, cb, event_bitmask)
-
- def delete_event_callback (self, event_handle):
-- u\"\"\"Delete an event callback.\"\"\"
-+ \"\"\"Delete an event callback.\"\"\"
- self._check_not_closed ()
- libguestfsmod.delete_event_callback (self._o, event_handle)
-
-@@ -650,7 +738,7 @@ class GuestFS:
- let doc = pod2text ~width:60 name doc in
- let doc = List.map (fun line -> replace_str line "\\" "\\\\") doc in
- let doc = String.concat "\n " doc in
-- pr " u\"\"\"%s\"\"\"\n" doc;
-+ pr " \"\"\"%s\"\"\"\n" doc;
- );
- (* Callers might pass in iterables instead of plain lists;
- * convert those to plain lists because the C side of things
-diff --git a/python/guestfs-py-byhand.c b/python/guestfs-py-byhand.c
-index 29be83b..1756963 100644
---- a/python/guestfs-py-byhand.c
-+++ b/python/guestfs-py-byhand.c
-@@ -168,7 +168,7 @@ py_guestfs_set_event_callback (PyObject *self, PyObject *args)
- snprintf (key, sizeof key, "_python_event_%d", eh);
- guestfs_set_private (g, key, py_callback);
-
-- py_eh = PyInt_FromLong ((long) eh);
-+ py_eh = PyLong_FromLong ((long) eh);
- return py_eh;
- }
-
---
diff --git a/debian/patches/0015-python-Use-sys.version_info-0-instead-of-sys.version.patch b/debian/patches/0015-python-Use-sys.version_info-0-instead-of-sys.version.patch
deleted file mode 100644
index 5c55e23..0000000
--- a/debian/patches/0015-python-Use-sys.version_info-0-instead-of-sys.version.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Thu, 3 Nov 2011 09:48:45 +0000
-Subject: python: Use sys.version_info[0] instead of sys.version_info.major.
-
-The major/minor fields only exist in Python >= 2.7. This works for at
-least Python 2.5 and 2.6.
-
-Thanks to Hilko Bengen.
-
-This updates commit 646142f5136da9cfe2b908703a822c53350f70e9.
----
- configure.ac | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1319d32..ed1da69 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -714,8 +714,8 @@ AS_IF([test "x$enable_python" != "xno"],
- AC_MSG_RESULT([$PYTHON_PREFIX])
-
- AC_MSG_CHECKING([Python version])
-- PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info.major)"`
-- PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info.minor)"`
-+ 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])
-
---
diff --git a/debian/patches/series b/debian/patches/series
index d45a1e4..9196bfe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,11 +6,7 @@
0006-Fix-for-systemd-based-Debian-systems.patch
0007-out-of-tree-build-fix-building-Perl-bindings.patch
0008-out-of-tree-build-daemon.patch
-0009-Fix-en-dis-able-install-daemon.patch
-0010-Fix-include.patch
-0011-python-Correctly-check-for-Python-major-minor.patch
-0012-python-Include-config.h.patch
-0013-python-Pass-PYTHON-environment-variable-to-tests.patch
-0014-python-Fixes-for-Python-3-RHBZ-750889.patch
-0015-python-Use-sys.version_info-0-instead-of-sys.version.patch
-0016-autoreconf.patch
+0009-out-of-tree-build-erlang.patch
+0010-Fix-en-dis-able-install-daemon.patch
+0011-Fix-include.patch
+0012-autoreconf.patch
--
Libguestfs Debian packaging
More information about the Pkg-libvirt-commits
mailing list