[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.16.7-1
Hilko Bengen
bengen at debian.org
Sun Mar 4 13:16:36 UTC 2012
The following commit has been merged in the master branch:
commit e47e59d05edeb2e96a11122a70b2cbcd5a8ebca8
Author: Hilko Bengen <bengen at debian.org>
Date: Sat Feb 11 23:41:10 2012 +0100
Rebased patch queue, disabled virt-format test
diff --git a/debian/patches/0001-Disable-fuse-tests-if-dev-fuse-doesn-t-exist.patch b/debian/patches/0001-Disable-fuse-tests-if-dev-fuse-doesn-t-exist.patch
index e0b8402..199ac61 100644
--- a/debian/patches/0001-Disable-fuse-tests-if-dev-fuse-doesn-t-exist.patch
+++ b/debian/patches/0001-Disable-fuse-tests-if-dev-fuse-doesn-t-exist.patch
@@ -23,4 +23,3 @@ index 517222a..431ac28 100755
# Ensure everything is cleaned up on exit.
rm -f "$image"
mkdir -p "$mp"
---
diff --git a/debian/patches/0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch b/debian/patches/0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
index 5bb3799..613edff 100644
--- a/debian/patches/0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
+++ b/debian/patches/0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
@@ -21,4 +21,3 @@ index 77d0281..a29353d 100755
mkdir -p /run/lock
# devtmpfs is required since udev 176
---
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 fd9187a..86f219c 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,10 +7,10 @@ Subject: configure.ac: do not generate debian/changelog
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
-index ada1db6..fed6ed0 100644
+index 962f774..98e62b6 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -1097,7 +1097,6 @@ AC_CONFIG_FILES([Makefile
+@@ -1100,7 +1100,6 @@ AC_CONFIG_FILES([Makefile
clone/Makefile
csharp/Makefile
daemon/Makefile
@@ -18,4 +18,3 @@ index ada1db6..fed6ed0 100644
df/Makefile
edit/Makefile
erlang/Makefile
---
diff --git a/debian/patches/0004-Fix-for-systemd-based-Debian-systems.patch b/debian/patches/0004-Fix-for-systemd-based-Debian-systems.patch
index eeca811..c555d8e 100644
--- a/debian/patches/0004-Fix-for-systemd-based-Debian-systems.patch
+++ b/debian/patches/0004-Fix-for-systemd-based-Debian-systems.patch
@@ -18,4 +18,3 @@ index 0335f6e..d541227 100755
+echo '/lib/lsb/*' >> supermin.d/hostfiles-t
+
mv supermin.d/hostfiles-t supermin.d/hostfiles
---
diff --git a/debian/patches/0005-out-of-tree-build-fix-building-Perl-bindings.patch b/debian/patches/0005-out-of-tree-build-fix-building-Perl-bindings.patch
index e7dae4b..a136663 100644
--- a/debian/patches/0005-out-of-tree-build-fix-building-Perl-bindings.patch
+++ b/debian/patches/0005-out-of-tree-build-fix-building-Perl-bindings.patch
@@ -18,4 +18,3 @@ index 404a4e9..253d990 100644
perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix)
# No! Otherwise it is deleted before the clean-local rule runs.
---
diff --git a/debian/patches/0006-out-of-tree-build-daemon.patch b/debian/patches/0006-out-of-tree-build-daemon.patch
index c1ffc2a..84a728f 100644
--- a/debian/patches/0006-out-of-tree-build-daemon.patch
+++ b/debian/patches/0006-out-of-tree-build-daemon.patch
@@ -23,4 +23,3 @@ index 3a698cc..0c905d0 100644
rm -f $@
ln $< $@
$(libsrcdir)/guestfs_protocol.c: force
---
diff --git a/debian/patches/0007-Install-Java-bindings-to-jni-subdirectory.patch b/debian/patches/0007-Install-Java-bindings-to-jni-subdirectory.patch
index 1b6cff8..e1c3ab2 100644
--- a/debian/patches/0007-Install-Java-bindings-to-jni-subdirectory.patch
+++ b/debian/patches/0007-Install-Java-bindings-to-jni-subdirectory.patch
@@ -7,7 +7,7 @@ Subject: Install Java bindings to jni subdirectory
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/java/Makefile.am b/java/Makefile.am
-index ef78773..b76e65c 100644
+index d9db6f4..a13ffa9 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -17,6 +17,8 @@
@@ -19,4 +19,3 @@ index ef78773..b76e65c 100644
# Old RHEL 5 autoconf doesn't have builddir.
builddir ?= $(top_builddir)/java
---
diff --git a/debian/patches/0008-ruby-install-to-vendor_ruby.patch b/debian/patches/0008-ruby-install-to-vendor_ruby.patch
index 319e0d0..cfe16c8 100644
--- a/debian/patches/0008-ruby-install-to-vendor_ruby.patch
+++ b/debian/patches/0008-ruby-install-to-vendor_ruby.patch
@@ -30,4 +30,3 @@ index 361277e..4c5b5e6 100644
+ $(INSTALL) -p -m 0755 $(builddir)/ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_VENDORARCH)
endif
---
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
new file mode 100644
index 0000000..ed9e14b
--- /dev/null
+++ b/debian/patches/0009-Do-not-run-test-virt-format.sh-if-appliance-has-not-.patch
@@ -0,0 +1,19 @@
+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/0009-autoreconf.patch b/debian/patches/0010-autoreconf.patch
similarity index 98%
rename from debian/patches/0009-autoreconf.patch
rename to debian/patches/0010-autoreconf.patch
index 21583f0..ffe2ac7 100644
--- a/debian/patches/0009-autoreconf.patch
+++ b/debian/patches/0010-autoreconf.patch
@@ -9,11 +9,12 @@ 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 ++--
- 10 files changed, 279 insertions(+), 200 deletions(-)
+ 11 files changed, 280 insertions(+), 201 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 67ccba1..8bba69c 100644
@@ -969,7 +970,7 @@ index 2a55a50..30fdca8 100755
;;
*-wec)
diff --git a/configure b/configure
-index b4fb261..810bc14 100755
+index deb9d6d..2eeba1d 100755
--- a/configure
+++ b/configure
@@ -45929,6 +45929,7 @@ fi
@@ -1192,7 +1193,7 @@ index b4fb261..810bc14 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$FUSE_PKG_ERRORS" >&5
-@@ -51746,6 +51759,7 @@ if test -n "$GOBJECT_CFLAGS"; then
+@@ -51750,6 +51763,7 @@ if test -n "$GOBJECT_CFLAGS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= 2.26.0" 2>/dev/null`
@@ -1200,7 +1201,7 @@ index b4fb261..810bc14 100755
else
pkg_failed=yes
fi
-@@ -51762,6 +51776,7 @@ if test -n "$GOBJECT_LIBS"; then
+@@ -51766,6 +51780,7 @@ if test -n "$GOBJECT_LIBS"; then
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= 2.26.0" 2>/dev/null`
@@ -1208,7 +1209,7 @@ index b4fb261..810bc14 100755
else
pkg_failed=yes
fi
-@@ -51781,9 +51796,9 @@ else
+@@ -51785,9 +51800,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1220,7 +1221,7 @@ index b4fb261..810bc14 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$GOBJECT_PKG_ERRORS" >&5
-@@ -51983,7 +51998,7 @@ ac_config_files="$ac_config_files podwrapper.sh"
+@@ -51987,7 +52002,7 @@ ac_config_files="$ac_config_files podwrapper.sh"
ac_config_files="$ac_config_files run"
@@ -1229,7 +1230,7 @@ index b4fb261..810bc14 100755
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -53211,7 +53226,6 @@ do
+@@ -53215,7 +53230,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" ;;
@@ -1254,8 +1255,21 @@ 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 5f587d5..11248f5 100644
+index 028c908..3d6f109 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -1295,7 +1295,7 @@ htmldir = @htmldir@
@@ -1330,4 +1344,3 @@ index bdfc6f4..b2f39fd 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/debian/patches/series b/debian/patches/series
index a5e6e25..fd09034 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,5 @@
0006-out-of-tree-build-daemon.patch
0007-Install-Java-bindings-to-jni-subdirectory.patch
0008-ruby-install-to-vendor_ruby.patch
-0009-autoreconf.patch
+0009-Do-not-run-test-virt-format.sh-if-appliance-has-not-.patch
+0010-autoreconf.patch
--
Libguestfs Debian packaging
More information about the Pkg-libvirt-commits
mailing list