[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.16.18-1-89-g6038ece

[Hilko Bengen]

The following commit has been merged in the master branch:
commit ba159576290665c6b79470ae59e76e45b35466a1
Author: Hilko Bengen <bengen at debian.org>
Date:   Tue Jul 10 23:55:56 2012 +0200

    Rebased patch queue

diff --git a/debian/patches/0007-autoreconf.patch b/debian/patches/0007-autoreconf.patch
index 055e526..67ca665 100644
--- a/debian/patches/0007-autoreconf.patch
+++ b/debian/patches/0007-autoreconf.patch
@@ -545,14 +545,14 @@ index 7767500..1a994d3 100644
  # define _DARWIN_USE_64_BIT_INODE 1
  #endif
 diff --git a/configure b/configure
-index 9f5bc4c..a21458f 100755
+index cd10cad..2b71a19 100755
 --- a/configure
 +++ b/configure
 @@ -1,11 +1,9 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.68 for libguestfs 1.18.4.
-+# Generated by GNU Autoconf 2.69 for libguestfs 1.18.4.
+-# Generated by GNU Autoconf 2.68 for libguestfs 1.18.5.
++# Generated by GNU Autoconf 2.69 for libguestfs 1.18.5.
  #
  #
 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -735,7 +735,7 @@ index 9f5bc4c..a21458f 100755
 @@ -2644,9 +2662,9 @@ test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
- libguestfs configure 1.18.4
+ libguestfs configure 1.18.5
 -generated by GNU Autoconf 2.68
 +generated by GNU Autoconf 2.69
  
@@ -815,7 +815,7 @@ index 9f5bc4c..a21458f 100755
 @@ -3507,7 +3530,7 @@ This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by libguestfs $as_me 1.18.4, which was
+ It was created by libguestfs $as_me 1.18.5, which was
 -generated by GNU Autoconf 2.68.  Invocation command line was
 +generated by GNU Autoconf 2.69.  Invocation command line was
  
@@ -2440,7 +2440,7 @@ index 9f5bc4c..a21458f 100755
 @@ -56967,7 +56992,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  # values after options handling.
  ac_log="
- This file was extended by libguestfs $as_me 1.18.4, which was
+ This file was extended by libguestfs $as_me 1.18.5, which was
 -generated by GNU Autoconf 2.68.  Invocation command line was
 +generated by GNU Autoconf 2.69.  Invocation command line was
  
@@ -2449,7 +2449,7 @@ index 9f5bc4c..a21458f 100755
 @@ -57037,10 +57062,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
- libguestfs config.status 1.18.4
+ libguestfs config.status 1.18.5
 -configured by $0, generated by GNU Autoconf 2.68,
 +configured by $0, generated by GNU Autoconf 2.69,
    with options \\"\$ac_cs_config\\"
@@ -3194,7 +3194,7 @@ 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 54b2dbe..2567ae7 100644
+index 8fe3117..e804615 100644
 --- a/fuse/Makefile.in
 +++ b/fuse/Makefile.in
 @@ -1,4 +1,4 @@
@@ -5406,7 +5406,7 @@ 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 57c5e78..9a0dc42 100644
+index fa0eecb..6ff6633 100644
 --- a/tests/extra/Makefile.in
 +++ b/tests/extra/Makefile.in
 @@ -1,4 +1,4 @@
@@ -5415,7 +5415,7 @@ index 57c5e78..9a0dc42 100644
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -65,6 +65,23 @@
+@@ -66,6 +66,23 @@
  #   - hard to test because guestmount forks into the background, and
  #     if valgrind reports errors it doesn't stop the test shell script
  VPATH = @srcdir@
@@ -5439,7 +5439,7 @@ index 57c5e78..9a0dc42 100644
  pkgdatadir = $(datadir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  pkglibdir = $(libdir)/@PACKAGE@
-@@ -213,6 +230,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+@@ -214,6 +231,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
  am__v_at_0 = @
  SOURCES =
  DIST_SOURCES =

-- 
Libguestfs Debian packaging