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

[Hilko Bengen]

The following commit has been merged in the master branch:
commit 1aee45e3f73d5a248c51da51ab2ae07fea74f840
Author: Hilko Bengen <bengen at debian.org>
Date:   Mon Feb 13 21:02:59 2012 +0100

    Rebased patch queue

diff --git a/debian/patches/0003-configure.ac-do-not-generate-debian-changelog.patch b/debian/patches/0003-configure.ac-do-not-generate-debian-changelog.patch
index 86f219c..2095d3f 100644
--- a/debian/patches/0003-configure.ac-do-not-generate-debian-changelog.patch
+++ b/debian/patches/0003-configure.ac-do-not-generate-debian-changelog.patch
@@ -7,7 +7,7 @@ Subject: configure.ac: do not generate debian/changelog
  1 files changed, 0 insertions(+), 1 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 962f774..98e62b6 100644
+index bb85961..35d888a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1100,7 +1100,6 @@ AC_CONFIG_FILES([Makefile
diff --git a/debian/patches/0009-Do-not-run-test-virt-format.sh-if-appliance-has-not-.patch b/debian/patches/0009-Do-not-run-test-virt-format.sh-if-appliance-has-not-.patch
deleted file mode 100644
index ed9e14b..0000000
--- a/debian/patches/0009-Do-not-run-test-virt-format.sh-if-appliance-has-not-.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Sun, 12 Feb 2012 13:28:58 +0100
-Subject: Do not run test-virt-format.sh if appliance has not been built
-
----
- format/Makefile.am |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/format/Makefile.am b/format/Makefile.am
-index 0d1b28e..1dc8f14 100644
---- a/format/Makefile.am
-+++ b/format/Makefile.am
-@@ -74,4 +74,6 @@ TESTS_ENVIRONMENT = \
- 	MALLOC_PERTURB_=$(random_val) \
- 	$(top_builddir)/run
- 
-+if ENABLE_APPLIANCE
- TESTS = test-virt-format.sh
-+endif ENABLE_APPLIANCE
diff --git a/debian/patches/0010-autoreconf.patch b/debian/patches/0009-autoreconf.patch
similarity index 99%
rename from debian/patches/0010-autoreconf.patch
rename to debian/patches/0009-autoreconf.patch
index ffe2ac7..bec54c7 100644
--- a/debian/patches/0010-autoreconf.patch
+++ b/debian/patches/0009-autoreconf.patch
@@ -9,12 +9,11 @@ Subject: autoreconf
  build-aux/config.sub   |  159 +++++++++++++++++++++++-----------
  configure              |   54 ++++++++-----
  daemon/Makefile.in     |    4 +-
- format/Makefile.in     |    2 +-
  java/Makefile.in       |    2 +-
  perl/Makefile.in       |    1 +
  po/POTFILES.in         |    6 --
  ruby/Makefile.in       |   12 ++--
- 11 files changed, 280 insertions(+), 201 deletions(-)
+ 10 files changed, 279 insertions(+), 200 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
 index 67ccba1..8bba69c 100644
@@ -970,7 +969,7 @@ index 2a55a50..30fdca8 100755
  		;;
  	*-wec)
 diff --git a/configure b/configure
-index deb9d6d..2eeba1d 100755
+index 956ef10..7ad60c5 100755
 --- a/configure
 +++ b/configure
 @@ -45929,6 +45929,7 @@ fi
@@ -1255,19 +1254,6 @@ index 81737b1..2f84f4b 100644
  	rm -f $@
  	ln $< $@
  $(libsrcdir)/guestfs_protocol.c: force
-diff --git a/format/Makefile.in b/format/Makefile.in
-index 43a112c..4ca2c69 100644
---- a/format/Makefile.in
-+++ b/format/Makefile.in
-@@ -1338,7 +1338,7 @@ TESTS_ENVIRONMENT = \
- 	MALLOC_PERTURB_=$(random_val) \
- 	$(top_builddir)/run
- 
--TESTS = test-virt-format.sh
-+ at ENABLE_APPLIANCE_TRUE@TESTS = test-virt-format.sh
- all: all-am
- 
- .SUFFIXES:
 diff --git a/java/Makefile.in b/java/Makefile.in
 index 028c908..3d6f109 100644
 --- a/java/Makefile.in
diff --git a/debian/patches/series b/debian/patches/series
index fd09034..a5e6e25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,4 @@
 0006-out-of-tree-build-daemon.patch
 0007-Install-Java-bindings-to-jni-subdirectory.patch
 0008-ruby-install-to-vendor_ruby.patch
-0009-Do-not-run-test-virt-format.sh-if-appliance-has-not-.patch
-0010-autoreconf.patch
+0009-autoreconf.patch

-- 
Libguestfs Debian packaging