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

Mon Jan 7 18:45:13 UTC 2013

The following commit has been merged in the master branch:
commit 00137007d95d6f97222b7375704806ce98a9053d
Author: Hilko Bengen <bengen at debian.org>
Date:   Thu Dec 13 22:31:56 2012 +0100

    Rebased patch queue: added fixes for tests, don't install Erlang bindings to multiarch directory, fix appliance packagelist

diff --git a/debian/erlang-guestfs.install b/debian/erlang-guestfs.install
index 2c02f4d..ce4b44c 100644
--- a/debian/erlang-guestfs.install
+++ b/debian/erlang-guestfs.install
@@ -1,3 +1,3 @@
 /usr/bin/erl-guestfs
-/usr/lib/*-*/erlang
+/usr/lib/erlang
 /usr/share/man/man3/guestfs-erlang.3*
diff --git a/debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch b/debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch
index da56c08..e320222 100644
--- a/debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch
+++ b/debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch
@@ -9,10 +9,10 @@ The supermin appliance files are not installed to the multiarch lib directory.
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/appliance/Makefile.am b/appliance/Makefile.am
-index 6d8b74a..c6a48d9 100644
+index 19f01dc..169ea15 100644
 --- a/appliance/Makefile.am
 +++ b/appliance/Makefile.am
-@@ -29,8 +29,8 @@ EXTRA_DIST = \
+@@ -30,8 +30,8 @@ EXTRA_DIST = \
  	make.sh.in \
  	packagelist.in
  
@@ -24,15 +24,15 @@ index 6d8b74a..c6a48d9 100644
  fs_DATA =
  superminfs_DATA = \
 diff --git a/src/Makefile.am b/src/Makefile.am
-index bfd319b..7f4fb4d 100644
+index 1057245..3183ce4 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -161,7 +161,7 @@ noinst_LTLIBRARIES = liberrnostring.la libprotocol.la
+@@ -193,7 +193,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) $(PCRE_CFLAGS) \
-   $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \
+-	-DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
++	-DGUESTFS_DEFAULT_PATH='"$(prefix)/lib/guestfs"' \
+ 	-DGUESTFS_WARN_DEPRECATED=1 \
+ 	-DGUESTFS_PRIVATE_FUNCTIONS=1 \
+ 	-DLIBOSINFO_DB_PATH='"$(datadir)/libosinfo/db"' \
diff --git a/debian/patches/0007-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch b/debian/patches/0007-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch
deleted file mode 100644
index 374e562..0000000
--- a/debian/patches/0007-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Tue, 14 Aug 2012 21:42:08 +0200
-Subject: Revert "qemu: Use sgabios by default (thanks Dan Berrange)."
-
-This reverts commit 82e3b7509dea41823c1ce58acd61d406d460c0ab.
----
- src/launch.c |    9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/src/launch.c b/src/launch.c
-index 7447308..e4c4eaa 100644
---- a/src/launch.c
-+++ b/src/launch.c
-@@ -775,15 +775,6 @@ launch_appliance (guestfs_h *g)
-     add_cmdline (g, "stdio");
- #endif
- 
--    /* Use sgabios instead of vgabios.  This means we'll see BIOS
--     * messages on the serial port, and also works around this bug
--     * in qemu 1.1.0:
--     * https://bugs.launchpad.net/qemu/+bug/1021649
--     * QEmu has included sgabios upstream since just before 1.0.
--     */
--    add_cmdline (g, "-device");
--    add_cmdline (g, "sga");
--
-     /* Set up virtio-serial for the communications channel. */
-     add_cmdline (g, "-chardev");
-     snprintf (buf, sizeof buf, "socket,path=%s,id=channel0", guestfsd_sock);
diff --git a/debian/patches/0007-erlang-fix-bindtests-for-out-of-tree-build.patch b/debian/patches/0007-erlang-fix-bindtests-for-out-of-tree-build.patch
new file mode 100644
index 0000000..6c73742
--- /dev/null
+++ b/debian/patches/0007-erlang-fix-bindtests-for-out-of-tree-build.patch
@@ -0,0 +1,19 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Fri, 21 Dec 2012 00:23:30 +0100
+Subject: erlang: fix bindtests for out-of-tree build
+
+---
+ erlang/run-bindtests |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/erlang/run-bindtests b/erlang/run-bindtests
+index 1a6aea5..17db79e 100755
+--- a/erlang/run-bindtests
++++ b/erlang/run-bindtests
+@@ -19,5 +19,5 @@
+ set -e
+ 
+ # The output is sent to bindtests.tmp.
+-./bindtests.erl
++$srcdir/bindtests.erl
+ diff -u $srcdir/../bindtests bindtests.tmp
diff --git a/debian/patches/0008-erlang-Install-to-correct-directory.patch b/debian/patches/0008-erlang-Install-to-correct-directory.patch
new file mode 100644
index 0000000..ddca60e
--- /dev/null
+++ b/debian/patches/0008-erlang-Install-to-correct-directory.patch
@@ -0,0 +1,21 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Mon, 24 Dec 2012 09:25:03 +0100
+Subject: erlang: Install to correct directory
+
+---
+ erlang/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/erlang/Makefile.am b/erlang/Makefile.am
+index 8c1e887..1f3782a 100644
+--- a/erlang/Makefile.am
++++ b/erlang/Makefile.am
+@@ -30,7 +30,7 @@ EXTRA_DIST = \
+ 
+ if HAVE_ERLANG
+ 
+-erlang_bindir = $(libdir)/erlang/lib/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/ebin
++erlang_bindir = $(prefix)/lib/erlang/lib/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/ebin
+ 
+ erlang_bin_DATA = guestfs.beam
+ 
diff --git a/debian/patches/0009-inspector-Fix-tests-for-out-of-tree-builds.patch b/debian/patches/0009-inspector-Fix-tests-for-out-of-tree-builds.patch
new file mode 100644
index 0000000..625c986
--- /dev/null
+++ b/debian/patches/0009-inspector-Fix-tests-for-out-of-tree-builds.patch
@@ -0,0 +1,19 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Sat, 5 Jan 2013 00:26:47 +0100
+Subject: inspector Fix tests for out-of-tree builds
+
+---
+ inspector/test-xmllint.sh.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/inspector/test-xmllint.sh.in b/inspector/test-xmllint.sh.in
+index c156bd2..602823f 100755
+--- a/inspector/test-xmllint.sh.in
++++ b/inspector/test-xmllint.sh.in
+@@ -25,5 +25,5 @@ if [ -z "$EXAMPLE_XML" ]; then
+ fi
+ 
+ for f in $EXAMPLE_XML; do
+-    @XMLLINT@ --noout --relaxng $srcdir/virt-inspector.rng $f
++    @XMLLINT@ --noout --relaxng $srcdir/virt-inspector.rng $srcdir/$f
+ done
diff --git a/debian/patches/0010-Fix-packagelist.patch b/debian/patches/0010-Fix-packagelist.patch
new file mode 100644
index 0000000..2144371
--- /dev/null
+++ b/debian/patches/0010-Fix-packagelist.patch
@@ -0,0 +1,33 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Sat, 5 Jan 2013 12:58:30 +0100
+Subject: Fix packagelist
+
+- ntfsprogs has been merged with ntfs-3g -- and it has been an empty
+  transitional package for some time now.
+- libyajl is needed for ldm
+- libcap2 is needed for guestfs
+---
+ appliance/packagelist.in |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/appliance/packagelist.in b/appliance/packagelist.in
+index 3ad343b..6fd9438 100644
+--- a/appliance/packagelist.in
++++ b/appliance/packagelist.in
+@@ -62,14 +62,15 @@
+   hfsplus
+   iproute
+   libaugeas0
++  libcap2
+   libhivex0
+   libyajl2
+   linux-image
+   nilfs-tools
+   ntfs-3g
+-  ntfsprogs
+   openssh-client
+   reiserfsprogs
++  sysvinit /* for /sbin/reboot */
+   ufsutils
+   vim-tiny
+   xz-utils
diff --git a/debian/patches/series b/debian/patches/series
index 064ef69..c7d6ca7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,7 @@
 0004-out-of-tree-build-daemon.patch
 0005-ruby-install-to-vendor_ruby.patch
 0006-Fix-guestfs-supermin-appliance-path.patch
-0007-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch
+0007-erlang-fix-bindtests-for-out-of-tree-build.patch
+0008-erlang-Install-to-correct-directory.patch
+0009-inspector-Fix-tests-for-out-of-tree-builds.patch
+0010-Fix-packagelist.patch

-- 
Libguestfs Debian packaging

