[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1.10.7-3-2-g6a43d8f

[Hilko Bengen]

The following commit has been merged in the master branch:
commit c65e1bbdd0821e20ef736062aa1cef8b41a1e735
Author: Hilko Bengen <bengen at debian.org>
Date:   Thu Aug 11 00:03:53 2011 +0200

    Fixed FTBFS by making fuse test depend on appliance. Thanks to Guido Günther for spotting this.

diff --git a/debian/patches/0007-Do-not-run-appliance-related-checks-if-not-building-.patch b/debian/patches/0007-Do-not-run-appliance-related-checks-if-not-building-.patch
index 1eaa4de..116cc43 100644
--- a/debian/patches/0007-Do-not-run-appliance-related-checks-if-not-building-.patch
+++ b/debian/patches/0007-Do-not-run-appliance-related-checks-if-not-building-.patch
@@ -6,13 +6,14 @@ Subject: Do not run appliance-related checks if not building appliance
  Makefile.am        |    5 ++++-
  cat/Makefile.am    |    2 ++
  df/Makefile.am     |    2 ++
+ fuse/Makefile.am   |    4 +++-
  images/Makefile.am |    2 ++
  ocaml/Makefile.am  |   10 +++++++---
  perl/Makefile.am   |   10 ++++++++--
  python/Makefile.am |    8 ++++++--
  resize/Makefile.am |    2 ++
  tools/Makefile.am  |    2 ++
- 9 files changed, 35 insertions(+), 8 deletions(-)
+ 10 files changed, 38 insertions(+), 9 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
 index 7a1afbc..4ac3f86 100644
@@ -52,6 +53,22 @@ index 69c6140..86d55fa 100644
 +if ENABLE_APPLIANCE
  TESTS = test-virt-df.sh
 +endif ENABLE_APPLIANCE
+diff --git a/fuse/Makefile.am b/fuse/Makefile.am
+index c860f24..83dfd8f 100644
+--- a/fuse/Makefile.am
++++ b/fuse/Makefile.am
+@@ -73,8 +73,10 @@ stamp-guestmount.pod: guestmount.pod
+ 
+ # Tests.
+ 
++if ENABLE_APPLIANCE
+ TESTS = test-fuse.sh
++endif ENABLE_APPLIANCE
+ TESTS_ENVIRONMENT = \
+ 	top_builddir=..
+ 
+-endif
++endif HAVE_FUSE
 diff --git a/images/Makefile.am b/images/Makefile.am
 index e4a910a..35fa2be 100644
 --- a/images/Makefile.am
diff --git a/debian/patches/0010-regenerated-auto-related-files.patch b/debian/patches/0010-regenerated-auto-related-files.patch
index 693ec20..b1bf4e3 100644
--- a/debian/patches/0010-regenerated-auto-related-files.patch
+++ b/debian/patches/0010-regenerated-auto-related-files.patch
@@ -9,13 +9,14 @@ Subject: regenerated auto*-related files
  configure          |  102 +++++++++++++++++++++++++---------------------------
  daemon/configure   |   10 +-----
  df/Makefile.in     |    2 +-
+ fuse/Makefile.in   |    2 +-
  images/Makefile.in |    2 +-
  ocaml/Makefile.in  |   19 +++++-----
  perl/Makefile.in   |    7 +++-
  python/Makefile.in |    8 +++--
  resize/Makefile.in |    2 +-
  tools/Makefile.in  |    6 ++--
- 12 files changed, 108 insertions(+), 117 deletions(-)
+ 13 files changed, 109 insertions(+), 118 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
 index de73f39..59048f0 100644
@@ -185,7 +186,7 @@ index 67fabff..5cc0364 100644
  
  .SUFFIXES:
 diff --git a/configure b/configure
-index 87cfd33..7e24d81 100755
+index 9579c95..5213c2a 100755
 --- a/configure
 +++ b/configure
 @@ -32526,8 +32526,7 @@ fi
@@ -520,6 +521,19 @@ index 51eeb16..77841fc 100644
  all: all-am
  
  .SUFFIXES:
+diff --git a/fuse/Makefile.in b/fuse/Makefile.in
+index 82ca47c..a18ec4b 100644
+--- a/fuse/Makefile.in
++++ b/fuse/Makefile.in
+@@ -1056,7 +1056,7 @@ CLEANFILES = stamp-guestmount.pod
+ @HAVE_FUSE_TRUE at noinst_DATA = $(top_builddir)/html/guestmount.1.html
+ 
+ # Tests.
+- at HAVE_FUSE_TRUE@TESTS = test-fuse.sh
++ at ENABLE_APPLIANCE_TRUE@@HAVE_FUSE_TRUE at TESTS = test-fuse.sh
+ @HAVE_FUSE_TRUE at TESTS_ENVIRONMENT = \
+ @HAVE_FUSE_TRUE@	top_builddir=..
+ 
 diff --git a/images/Makefile.in b/images/Makefile.in
 index a917b83..37d16ff 100644
 --- a/images/Makefile.in

-- 
Libguestfs Debian packaging