[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.16.18-1-89-g6038ece
Hilko Bengen
bengen at debian.org
Mon Jan 7 18:44:58 UTC 2013
The following commit has been merged in the master branch:
commit de8c07ecec821633808e6a804bcf1d0a009a8cd3
Author: Hilko Bengen <bengen at debian.org>
Date: Thu Jul 19 23:12:23 2012 +0200
Added another multiarch fix: supermin appliance stays out of multiarch directories
diff --git a/debian/patches/0008-podwrapper.sh-Use-date-from-ChangeLog.patch b/debian/patches/0007-podwrapper.sh-Use-date-from-ChangeLog.patch
similarity index 100%
rename from debian/patches/0008-podwrapper.sh-Use-date-from-ChangeLog.patch
rename to debian/patches/0007-podwrapper.sh-Use-date-from-ChangeLog.patch
diff --git a/debian/patches/0008-Fix-guestfs-supermin-appliance-path.patch b/debian/patches/0008-Fix-guestfs-supermin-appliance-path.patch
new file mode 100644
index 0000000..31a3a52
--- /dev/null
+++ b/debian/patches/0008-Fix-guestfs-supermin-appliance-path.patch
@@ -0,0 +1,38 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Thu, 19 Jul 2012 17:27:35 +0200
+Subject: Fix guestfs, supermin appliance path
+
+The supermin appliance files are not installed to the multiarch lib directory.
+---
+ appliance/Makefile.am | 4 ++--
+ src/Makefile.am | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/appliance/Makefile.am b/appliance/Makefile.am
+index 5958997..e87f67c 100644
+--- a/appliance/Makefile.am
++++ b/appliance/Makefile.am
+@@ -29,8 +29,8 @@ EXTRA_DIST = \
+ make.sh.in \
+ packagelist.in
+
+-fsdir = $(libdir)/guestfs
+-superminfsdir = $(libdir)/guestfs/supermin.d
++fsdir = $(prefix)/lib/guestfs
++superminfsdir = $(prefix)/lib/guestfs/supermin.d
+
+ fs_DATA =
+ superminfs_DATA = \
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 30e5070..cda57e0 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -161,7 +161,7 @@ noinst_LTLIBRARIES = liberrnostring.la libprotocol.la
+ libguestfs_la_LIBADD += liberrnostring.la libprotocol.la
+
+ libguestfs_la_CFLAGS = \
+- -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
++ -DGUESTFS_DEFAULT_PATH='"$(prefix)/lib/guestfs"' \
+ -DGUESTFS_WARN_DEPRECATED=1 \
+ $(HIVEX_CFLAGS) $(AUGEAS_CFLAGS) $(PCRE_CFLAGS) \
+ $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \
diff --git a/debian/patches/0007-autoreconf.patch b/debian/patches/0009-autoreconf.patch
similarity index 96%
rename from debian/patches/0007-autoreconf.patch
rename to debian/patches/0009-autoreconf.patch
index 67ca665..adc5ea9 100644
--- a/debian/patches/0007-autoreconf.patch
+++ b/debian/patches/0009-autoreconf.patch
@@ -3,10 +3,10 @@ Date: Tue, 10 Jan 2012 13:30:43 +0100
Subject: autoreconf
---
- Makefile.in | 37 ++-
+ Makefile.in | 39 ++-
aclocal.m4 | 24 +-
align/Makefile.in | 46 +++-
- appliance/Makefile.in | 56 ++++-
+ appliance/Makefile.in | 60 ++++-
cat/Makefile.in | 46 +++-
config.h.in | 14 +-
configure | 559 +++++++++++++++++++++--------------------
@@ -45,7 +45,7 @@ Subject: autoreconf
ruby/Makefile.in | 36 ++-
ruby/examples/Makefile.in | 41 ++-
sparsify/Makefile.in | 46 +++-
- src/Makefile.in | 54 +++-
+ src/Makefile.in | 57 ++++-
sysprep/Makefile.in | 46 +++-
test-tool/Makefile.in | 46 +++-
tests/btrfs/Makefile.in | 24 +-
@@ -63,15 +63,15 @@ Subject: autoreconf
tests/regressions/Makefile.in | 24 +-
tests/xml/Makefile.in | 24 +-
tools/Makefile.in | 46 +++-
- 60 files changed, 2077 insertions(+), 542 deletions(-)
+ 60 files changed, 2082 insertions(+), 546 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index ce2b84a..6425a4d 100644
+index ce2b84a..d38d93a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -138,13 +138,22 @@ index ce2b84a..6425a4d 100644
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
+@@ -1776,7 +1795,7 @@ distcheck: dist
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+- chmod -R a-w $(distdir); chmod a+w $(distdir)
++ chmod -R a-w $(distdir); chmod u+w $(distdir)
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
+ chmod a-w $(distdir)
diff --git a/aclocal.m4 b/aclocal.m4
-index c60ee35..3d900a5 100644
+index c60ee35..c91aa7d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@@ -214,7 +223,7 @@ index c60ee35..3d900a5 100644
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.3], [],
-+m4_if([$1], [1.11.5], [],
++m4_if([$1], [1.11.6], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -223,17 +232,17 @@ index c60ee35..3d900a5 100644
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.3])dnl
-+[AM_AUTOMAKE_VERSION([1.11.5])dnl
++[AM_AUTOMAKE_VERSION([1.11.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/align/Makefile.in b/align/Makefile.in
-index 16eea02..9f27958 100644
+index 16eea02..d921aea 100644
--- a/align/Makefile.in
+++ b/align/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -311,12 +320,12 @@ index 16eea02..9f27958 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/appliance/Makefile.in b/appliance/Makefile.in
-index a31077b..6e08252 100644
+index a31077b..29d5a62 100644
--- a/appliance/Makefile.in
+++ b/appliance/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -356,6 +365,17 @@ index a31077b..6e08252 100644
man1dir = $(mandir)/man1
NROFF = nroff
MANS = $(man_MANS)
+@@ -1284,8 +1306,8 @@ EXTRA_DIST = \
+ make.sh.in \
+ packagelist.in
+
+-fsdir = $(libdir)/guestfs
+-superminfsdir = $(libdir)/guestfs/supermin.d
++fsdir = $(prefix)/lib/guestfs
++superminfsdir = $(prefix)/lib/guestfs/supermin.d
+ fs_DATA =
+ superminfs_DATA = \
+ supermin.d/base.img \
@@ -1342,8 +1364,11 @@ libguestfs-make-fixed-appliance: $(top_builddir)/config.status $(srcdir)/libgues
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-sbinSCRIPTS: $(sbin_SCRIPTS)
@@ -420,12 +440,12 @@ index a31077b..6e08252 100644
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
diff --git a/cat/Makefile.in b/cat/Makefile.in
-index 45c869b..81fd788 100644
+index 45c869b..43d6ff9 100644
--- a/cat/Makefile.in
+++ b/cat/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -2469,12 +2489,12 @@ index cd10cad..2b71a19 100755
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
diff --git a/csharp/Makefile.in b/csharp/Makefile.in
-index 5079385..106b43c 100644
+index 5079385..91a753d 100644
--- a/csharp/Makefile.in
+++ b/csharp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -2515,12 +2535,12 @@ index 5079385..106b43c 100644
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
diff --git a/daemon/Makefile.in b/daemon/Makefile.in
-index a5939df..29a843b 100644
+index a5939df..c73b829 100644
--- a/daemon/Makefile.in
+++ b/daemon/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -2587,12 +2607,12 @@ index a5939df..29a843b 100644
ln $< $@
$(libsrcdir)/guestfs_protocol.c: force
diff --git a/df/Makefile.in b/df/Makefile.in
-index 481c89b..f43ec4a 100644
+index 481c89b..1685188 100644
--- a/df/Makefile.in
+++ b/df/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -2670,12 +2690,12 @@ index 481c89b..f43ec4a 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/edit/Makefile.in b/edit/Makefile.in
-index 01088cf..e21719e 100644
+index 01088cf..22dc865 100644
--- a/edit/Makefile.in
+++ b/edit/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -2753,12 +2773,12 @@ index 01088cf..e21719e 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/erlang/Makefile.in b/erlang/Makefile.in
-index f167aa4..8b6928f 100644
+index f167aa4..dc3776f 100644
--- a/erlang/Makefile.in
+++ b/erlang/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -2825,12 +2845,12 @@ index f167aa4..8b6928f 100644
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
diff --git a/erlang/examples/Makefile.in b/erlang/examples/Makefile.in
-index bd0146e..fc54634 100644
+index bd0146e..cdade03 100644
--- a/erlang/examples/Makefile.in
+++ b/erlang/examples/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -2895,12 +2915,12 @@ index bd0146e..fc54634 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/examples/Makefile.in b/examples/Makefile.in
-index 3c112ac..ccda43a 100644
+index 3c112ac..9435126 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -2989,12 +3009,12 @@ index 3c112ac..ccda43a 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/fish/Makefile.in b/fish/Makefile.in
-index 0e1dea8..b040f6f 100644
+index 0e1dea8..6f072ca 100644
--- a/fish/Makefile.in
+++ b/fish/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -3111,12 +3131,12 @@ index 0e1dea8..b040f6f 100644
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
diff --git a/format/Makefile.in b/format/Makefile.in
-index bd10cc3..a63bf59 100644
+index bd10cc3..a1b000b 100644
--- a/format/Makefile.in
+++ b/format/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -3194,12 +3214,12 @@ index bd10cc3..a63bf59 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/fuse/Makefile.in b/fuse/Makefile.in
-index 8fe3117..e804615 100644
+index 8fe3117..1befd4c 100644
--- a/fuse/Makefile.in
+++ b/fuse/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -3277,12 +3297,12 @@ index 8fe3117..e804615 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/generator/Makefile.in b/generator/Makefile.in
-index 73be48a..253f74c 100644
+index 73be48a..7758877 100644
--- a/generator/Makefile.in
+++ b/generator/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -3323,12 +3343,12 @@ index 73be48a..253f74c 100644
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkglibexecdir = @pkglibexecdir@
diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in
-index b48411d..0219d94 100644
+index b48411d..4c65a08 100644
--- a/gnulib/lib/Makefile.in
+++ b/gnulib/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -3387,12 +3407,12 @@ index b48411d..0219d94 100644
$(am__relativize); \
new_distdir=$$reldir; \
diff --git a/gnulib/tests/Makefile.in b/gnulib/tests/Makefile.in
-index 2b32e44..a71741d 100644
+index 2b32e44..c7fb726 100644
--- a/gnulib/tests/Makefile.in
+++ b/gnulib/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -3451,12 +3471,12 @@ index 2b32e44..a71741d 100644
$(am__relativize); \
new_distdir=$$reldir; \
diff --git a/gobject/Makefile.in b/gobject/Makefile.in
-index 92c03fb..52934df 100644
+index 92c03fb..47b9c9b 100644
--- a/gobject/Makefile.in
+++ b/gobject/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -3571,12 +3591,12 @@ index 92c03fb..52934df 100644
$(am__relativize); \
new_distdir=$$reldir; \
diff --git a/gobject/docs/Makefile.in b/gobject/docs/Makefile.in
-index e2a2b20..4a08805 100644
+index e2a2b20..c8c00e9 100644
--- a/gobject/docs/Makefile.in
+++ b/gobject/docs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -3617,12 +3637,12 @@ index e2a2b20..4a08805 100644
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
diff --git a/haskell/Makefile.in b/haskell/Makefile.in
-index d900fc0..d690271 100644
+index d900fc0..1b7df56 100644
--- a/haskell/Makefile.in
+++ b/haskell/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -3663,12 +3683,12 @@ index d900fc0..d690271 100644
red=; grn=; lgn=; blu=; std=
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/inspector/Makefile.in b/inspector/Makefile.in
-index b661f21..261568a 100644
+index b661f21..7cc1928 100644
--- a/inspector/Makefile.in
+++ b/inspector/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -3759,12 +3779,12 @@ index b661f21..261568a 100644
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
diff --git a/java/Makefile.in b/java/Makefile.in
-index 991c3c5..7bd08cc 100644
+index 991c3c5..fff9385 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -3835,12 +3855,12 @@ index 991c3c5..7bd08cc 100644
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
diff --git a/java/examples/Makefile.in b/java/examples/Makefile.in
-index b4adcd1..a583a3f 100644
+index b4adcd1..42725d6 100644
--- a/java/examples/Makefile.in
+++ b/java/examples/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -3905,12 +3925,12 @@ index b4adcd1..a583a3f 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/ocaml/Makefile.in b/ocaml/Makefile.in
-index df62eb6..57b8c03 100644
+index df62eb6..154bfad 100644
--- a/ocaml/Makefile.in
+++ b/ocaml/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -3951,12 +3971,12 @@ index df62eb6..57b8c03 100644
ETAGS = etags
CTAGS = ctags
diff --git a/ocaml/examples/Makefile.in b/ocaml/examples/Makefile.in
-index 3d3eb9e..53a3df6 100644
+index 3d3eb9e..7aa6bc3 100644
--- a/ocaml/examples/Makefile.in
+++ b/ocaml/examples/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -4021,12 +4041,12 @@ index 3d3eb9e..53a3df6 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/perl/Makefile.in b/perl/Makefile.in
-index c9d8d2f..13c3437 100644
+index c9d8d2f..d2d3fa6 100644
--- a/perl/Makefile.in
+++ b/perl/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -4075,12 +4095,12 @@ index c9d8d2f..13c3437 100644
# No! Otherwise it is deleted before the clean-local rule runs.
diff --git a/perl/examples/Makefile.in b/perl/examples/Makefile.in
-index ee7dd39..811bff8 100644
+index ee7dd39..1eba7a8 100644
--- a/perl/examples/Makefile.in
+++ b/perl/examples/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -4145,12 +4165,12 @@ index ee7dd39..811bff8 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/php/Makefile.in b/php/Makefile.in
-index 41fe2d3..fd915e8 100644
+index 41fe2d3..917497b 100644
--- a/php/Makefile.in
+++ b/php/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -4204,12 +4224,12 @@ index 41fe2d3..fd915e8 100644
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
diff --git a/po-docs/Makefile.in b/po-docs/Makefile.in
-index 85a02a6..735e59c 100644
+index 85a02a6..1e4be37 100644
--- a/po-docs/Makefile.in
+++ b/po-docs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -4268,12 +4288,12 @@ index 85a02a6..735e59c 100644
$(am__relativize); \
new_distdir=$$reldir; \
diff --git a/po-docs/ja/Makefile.in b/po-docs/ja/Makefile.in
-index d381d50..66055e8 100644
+index d381d50..b893dec 100644
--- a/po-docs/ja/Makefile.in
+++ b/po-docs/ja/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -4314,12 +4334,12 @@ index d381d50..66055e8 100644
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
diff --git a/po-docs/uk/Makefile.in b/po-docs/uk/Makefile.in
-index 661454a..9ad29de 100644
+index 661454a..e13eb1b 100644
--- a/po-docs/uk/Makefile.in
+++ b/po-docs/uk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -4360,12 +4380,12 @@ index 661454a..9ad29de 100644
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
diff --git a/po/Makefile.in b/po/Makefile.in
-index 00056ea..0d93fd3 100644
+index 00056ea..1f25487 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -4406,12 +4426,12 @@ index 00056ea..0d93fd3 100644
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
diff --git a/python/Makefile.in b/python/Makefile.in
-index bb77bbd..817c632 100644
+index bb77bbd..253d8d3 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -4482,12 +4502,12 @@ index bb77bbd..817c632 100644
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
diff --git a/python/examples/Makefile.in b/python/examples/Makefile.in
-index de85ca0..3b16793 100644
+index de85ca0..db28a6f 100644
--- a/python/examples/Makefile.in
+++ b/python/examples/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -4552,12 +4572,12 @@ index de85ca0..3b16793 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/rescue/Makefile.in b/rescue/Makefile.in
-index 7a87e39..ec61d1d 100644
+index 7a87e39..e17f24e 100644
--- a/rescue/Makefile.in
+++ b/rescue/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -4635,12 +4655,12 @@ index 7a87e39..ec61d1d 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/resize/Makefile.in b/resize/Makefile.in
-index f32ad7b..ca9f0ba 100644
+index f32ad7b..119ffde 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -4718,12 +4738,12 @@ index f32ad7b..ca9f0ba 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/ruby/Makefile.in b/ruby/Makefile.in
-index 6c435c8..07083b4 100644
+index 6c435c8..b6bf027 100644
--- a/ruby/Makefile.in
+++ b/ruby/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -4790,12 +4810,12 @@ index 6c435c8..07083b4 100644
# 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/ruby/examples/Makefile.in b/ruby/examples/Makefile.in
-index 6c1b131..a8ee494 100644
+index 6c1b131..4424cb1 100644
--- a/ruby/examples/Makefile.in
+++ b/ruby/examples/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -4860,12 +4880,12 @@ index 6c1b131..a8ee494 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/sparsify/Makefile.in b/sparsify/Makefile.in
-index 23cee7a..d3f4b9b 100644
+index 23cee7a..d9d3747 100644
--- a/sparsify/Makefile.in
+++ b/sparsify/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -4943,12 +4963,12 @@ index 23cee7a..d3f4b9b 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/src/Makefile.in b/src/Makefile.in
-index 1403923..03ebfef 100644
+index 1403923..15aeb89 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -4988,7 +5008,17 @@ index 1403923..03ebfef 100644
man3dir = $(mandir)/man3
NROFF = nroff
MANS = $(man_MANS)
-@@ -1531,7 +1553,6 @@ libguestfs.pc: $(top_builddir)/config.status $(srcdir)/libguestfs.pc.in
+@@ -1477,7 +1499,8 @@ libguestfs_la_LIBADD = $(HIVEX_LIBS) $(AUGEAS_LIBS) $(PCRE_LIBS) \
+
+ # Make libguestfs include the convenience libraries.
+ noinst_LTLIBRARIES = liberrnostring.la libprotocol.la
+-libguestfs_la_CFLAGS = -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
++libguestfs_la_CFLAGS = \
++ -DGUESTFS_DEFAULT_PATH='"$(prefix)/lib/guestfs"' \
+ -DGUESTFS_WARN_DEPRECATED=1 $(HIVEX_CFLAGS) $(AUGEAS_CFLAGS) \
+ $(PCRE_CFLAGS) $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \
+ $(WARN_CFLAGS) $(WERROR_CFLAGS) $(GCC_VISIBILITY_HIDDEN) \
+@@ -1531,7 +1554,6 @@ libguestfs.pc: $(top_builddir)/config.status $(srcdir)/libguestfs.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@@ -4996,7 +5026,7 @@ index 1403923..03ebfef 100644
@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
list2=; for p in $$list; do \
if test -f $$p; then \
-@@ -1539,6 +1560,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+@@ -1539,6 +1561,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
else :; fi; \
done; \
test -z "$$list2" || { \
@@ -5005,7 +5035,7 @@ index 1403923..03ebfef 100644
echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
}
-@@ -1795,11 +1818,18 @@ clean-libtool:
+@@ -1795,11 +1819,18 @@ clean-libtool:
-rm -rf .libs _libs
install-man3: $(man_MANS)
@$(NORMAL_INSTALL)
@@ -5029,7 +5059,7 @@ index 1403923..03ebfef 100644
} | while read p; do \
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
-@@ -1831,8 +1861,11 @@ uninstall-man3:
+@@ -1831,8 +1862,11 @@ uninstall-man3:
dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir)
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
@@ -5042,7 +5072,7 @@ index 1403923..03ebfef 100644
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
-@@ -1849,8 +1882,11 @@ uninstall-pkgconfigDATA:
+@@ -1849,8 +1883,11 @@ uninstall-pkgconfigDATA:
dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
@@ -5056,12 +5086,12 @@ index 1403923..03ebfef 100644
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
diff --git a/sysprep/Makefile.in b/sysprep/Makefile.in
-index 64f0ea0..ea32caf 100644
+index 64f0ea0..d307bb8 100644
--- a/sysprep/Makefile.in
+++ b/sysprep/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -5139,12 +5169,12 @@ index 64f0ea0..ea32caf 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/test-tool/Makefile.in b/test-tool/Makefile.in
-index 6fc1058..3eae29e 100644
+index 6fc1058..945d8ff 100644
--- a/test-tool/Makefile.in
+++ b/test-tool/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -5222,12 +5252,12 @@ index 6fc1058..3eae29e 100644
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
diff --git a/tests/btrfs/Makefile.in b/tests/btrfs/Makefile.in
-index 538a326..5d6da2d 100644
+index 538a326..daebc71 100644
--- a/tests/btrfs/Makefile.in
+++ b/tests/btrfs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -5268,12 +5298,12 @@ index 538a326..5d6da2d 100644
red=; grn=; lgn=; blu=; std=
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/tests/c-api/Makefile.in b/tests/c-api/Makefile.in
-index 484788c..dc5e5ce 100644
+index 484788c..a5f7694 100644
--- a/tests/c-api/Makefile.in
+++ b/tests/c-api/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -5314,12 +5344,12 @@ index 484788c..dc5e5ce 100644
CTAGS = ctags
am__tty_colors = \
diff --git a/tests/charsets/Makefile.in b/tests/charsets/Makefile.in
-index 855ec27..3d9c213 100644
+index 855ec27..ff03eb7 100644
--- a/tests/charsets/Makefile.in
+++ b/tests/charsets/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -5360,12 +5390,12 @@ index 855ec27..3d9c213 100644
CTAGS = ctags
am__tty_colors = \
diff --git a/tests/data/Makefile.in b/tests/data/Makefile.in
-index e8c6146..52e9a83 100644
+index e8c6146..17c4f2d 100644
--- a/tests/data/Makefile.in
+++ b/tests/data/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -5406,12 +5436,12 @@ index e8c6146..52e9a83 100644
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
pkglibexecdir = @pkglibexecdir@
diff --git a/tests/extra/Makefile.in b/tests/extra/Makefile.in
-index fa0eecb..6ff6633 100644
+index fa0eecb..a8d1ecd 100644
--- a/tests/extra/Makefile.in
+++ b/tests/extra/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -5452,12 +5482,12 @@ index fa0eecb..6ff6633 100644
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
diff --git a/tests/guests/Makefile.in b/tests/guests/Makefile.in
-index 76bfa0e..291c196 100644
+index 76bfa0e..5f652f8 100644
--- a/tests/guests/Makefile.in
+++ b/tests/guests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -5498,12 +5528,12 @@ index 76bfa0e..291c196 100644
pkglibexecdir = @pkglibexecdir@
ACLOCAL = @ACLOCAL@
diff --git a/tests/luks/Makefile.in b/tests/luks/Makefile.in
-index 2c479d4..974ccae 100644
+index 2c479d4..61d01e1 100644
--- a/tests/luks/Makefile.in
+++ b/tests/luks/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -5544,12 +5574,12 @@ index 2c479d4..974ccae 100644
red=; grn=; lgn=; blu=; std=
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/tests/lvm/Makefile.in b/tests/lvm/Makefile.in
-index f2e864e..570f282 100644
+index f2e864e..1025604 100644
--- a/tests/lvm/Makefile.in
+++ b/tests/lvm/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -5590,12 +5620,12 @@ index f2e864e..570f282 100644
red=; grn=; lgn=; blu=; std=
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/tests/md/Makefile.in b/tests/md/Makefile.in
-index 70e24bc..bb27717 100644
+index 70e24bc..09bd91e 100644
--- a/tests/md/Makefile.in
+++ b/tests/md/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -5636,12 +5666,12 @@ index 70e24bc..bb27717 100644
red=; grn=; lgn=; blu=; std=
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/tests/ntfsclone/Makefile.in b/tests/ntfsclone/Makefile.in
-index 318bdf0..5307273 100644
+index 318bdf0..ee1a16c 100644
--- a/tests/ntfsclone/Makefile.in
+++ b/tests/ntfsclone/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -5682,12 +5712,12 @@ index 318bdf0..5307273 100644
red=; grn=; lgn=; blu=; std=
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/tests/protocol/Makefile.in b/tests/protocol/Makefile.in
-index 9c14bb4..753b0c1 100644
+index 9c14bb4..38f9183 100644
--- a/tests/protocol/Makefile.in
+++ b/tests/protocol/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -5728,12 +5758,12 @@ index 9c14bb4..753b0c1 100644
red=; grn=; lgn=; blu=; std=
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/tests/qemu/Makefile.in b/tests/qemu/Makefile.in
-index 50b9595..980d550 100644
+index 50b9595..417e350 100644
--- a/tests/qemu/Makefile.in
+++ b/tests/qemu/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -5774,12 +5804,12 @@ index 50b9595..980d550 100644
red=; grn=; lgn=; blu=; std=
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
diff --git a/tests/regressions/Makefile.in b/tests/regressions/Makefile.in
-index ddff170..40a543e 100644
+index ddff170..22ce015 100644
--- a/tests/regressions/Makefile.in
+++ b/tests/regressions/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -5820,12 +5850,12 @@ index ddff170..40a543e 100644
CTAGS = ctags
am__tty_colors = \
diff --git a/tests/xml/Makefile.in b/tests/xml/Makefile.in
-index b07a545..686deab 100644
+index b07a545..549ddcf 100644
--- a/tests/xml/Makefile.in
+++ b/tests/xml/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -5866,12 +5896,12 @@ index b07a545..686deab 100644
CTAGS = ctags
am__tty_colors = \
diff --git a/tools/Makefile.in b/tools/Makefile.in
-index ad5d9d4..e2199da 100644
+index ad5d9d4..9802f44 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.5 from Makefile.am.
++# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/debian/patches/series b/debian/patches/series
index 31f863d..866f747 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,6 @@
0004-out-of-tree-build-fix-building-Perl-bindings.patch
0005-out-of-tree-build-daemon.patch
0006-ruby-install-to-vendor_ruby.patch
-0007-autoreconf.patch
-0008-podwrapper.sh-Use-date-from-ChangeLog.patch
+0007-podwrapper.sh-Use-date-from-ChangeLog.patch
+0008-Fix-guestfs-supermin-appliance-path.patch
+0009-autoreconf.patch
--
Libguestfs Debian packaging
More information about the Pkg-libvirt-commits
mailing list