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

Hilko Bengen bengen at debian.org
Mon Jan 7 18:45:02 UTC 2013 

The following commit has been merged in the master branch:
commit fccad0e3f1a3ec36fb57a06323e13333b0ebdcd4
Author: Hilko Bengen <bengen at debian.org>
Date:   Thu Sep 20 11:29:28 2012 +0200

    Rebased patch queue: Disabling FUSE tests is not needed; upstream has picked up the diff->diffutils change.

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
deleted file mode 100644
index 53fc746..0000000
--- a/debian/patches/0001-Disable-fuse-tests-if-dev-fuse-doesn-t-exist.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Sun, 21 Feb 2010 19:29:30 +0100
-Subject: Disable fuse tests if /dev/fuse doesn't exist
-
-e.g. when running in a chroot.
----
- fuse/test-fuse.sh |    5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/fuse/test-fuse.sh b/fuse/test-fuse.sh
-index 517222a..431ac28 100755
---- a/fuse/test-fuse.sh
-+++ b/fuse/test-fuse.sh
-@@ -59,6 +59,11 @@ if [ ! -x "$guestfish" -o ! -x "$guestmount" ]; then
-     exit 1
- fi
- 
-+if [ ! -c /dev/fuse ]; then
-+    echo "/dev/fuse does not exist skipping tests."
-+    exit 0
-+fi
-+
- # 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/0001-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
similarity index 95%
rename from debian/patches/0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
rename to debian/patches/0001-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
index 371941d..21778f3 100644
--- a/debian/patches/0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
+++ b/debian/patches/0001-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
@@ -8,7 +8,7 @@ Subject: Mount /run as tmpfs inside appliance (workaround for febootstrap's
  1 file changed, 3 insertions(+)
 
 diff --git a/appliance/init b/appliance/init
-index 15ced71..c6853be 100755
+index bbfd092..6259c45 100755
 --- a/appliance/init
 +++ b/appliance/init
 @@ -18,6 +18,9 @@ mount -t proc /proc /proc
diff --git a/debian/patches/0003-Fix-for-systemd-based-Debian-systems.patch b/debian/patches/0002-Fix-for-systemd-based-Debian-systems.patch
similarity index 100%
rename from debian/patches/0003-Fix-for-systemd-based-Debian-systems.patch
rename to debian/patches/0002-Fix-for-systemd-based-Debian-systems.patch
diff --git a/debian/patches/0004-out-of-tree-build-fix-building-Perl-bindings.patch b/debian/patches/0003-out-of-tree-build-fix-building-Perl-bindings.patch
similarity index 100%
rename from debian/patches/0004-out-of-tree-build-fix-building-Perl-bindings.patch
rename to debian/patches/0003-out-of-tree-build-fix-building-Perl-bindings.patch
diff --git a/debian/patches/0005-out-of-tree-build-daemon.patch b/debian/patches/0004-out-of-tree-build-daemon.patch
similarity index 96%
rename from debian/patches/0005-out-of-tree-build-daemon.patch
rename to debian/patches/0004-out-of-tree-build-daemon.patch
index 0495ea4..b139f71 100644
--- a/debian/patches/0005-out-of-tree-build-daemon.patch
+++ b/debian/patches/0004-out-of-tree-build-daemon.patch
@@ -7,7 +7,7 @@ Subject: out-of-tree build: daemon
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index 02c21df..c33758f 100644
+index 69699cb..06aaa29 100644
 --- a/daemon/Makefile.am
 +++ b/daemon/Makefile.am
 @@ -42,10 +42,10 @@ noinst_LIBRARIES = libprotocol.a
diff --git a/debian/patches/0006-ruby-install-to-vendor_ruby.patch b/debian/patches/0005-ruby-install-to-vendor_ruby.patch
similarity index 94%
rename from debian/patches/0006-ruby-install-to-vendor_ruby.patch
rename to debian/patches/0005-ruby-install-to-vendor_ruby.patch
index 40978ea..737d313 100644
--- a/debian/patches/0006-ruby-install-to-vendor_ruby.patch
+++ b/debian/patches/0005-ruby-install-to-vendor_ruby.patch
@@ -7,10 +7,10 @@ Subject: ruby: install to vendor_ruby.
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/ruby/Makefile.am b/ruby/Makefile.am
-index c4b680f..db6ec9e 100644
+index 9073ad7..6534c83 100644
 --- a/ruby/Makefile.am
 +++ b/ruby/Makefile.am
-@@ -54,13 +54,13 @@ all: $(generator_built)
+@@ -57,13 +57,13 @@ all: $(generator_built)
  	$(RAKE) build
  	$(RAKE) rdoc
  
diff --git a/debian/patches/0007-Fix-guestfs-supermin-appliance-path.patch b/debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch
similarity index 90%
rename from debian/patches/0007-Fix-guestfs-supermin-appliance-path.patch
rename to debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch
index 66ae4a3..13a0b62 100644
--- a/debian/patches/0007-Fix-guestfs-supermin-appliance-path.patch
+++ b/debian/patches/0006-Fix-guestfs-supermin-appliance-path.patch
@@ -9,7 +9,7 @@ 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 f106921..bf79834 100644
+index fb1f676..0a6fdde 100644
 --- a/appliance/Makefile.am
 +++ b/appliance/Makefile.am
 @@ -29,8 +29,8 @@ EXTRA_DIST = \
@@ -24,7 +24,7 @@ index f106921..bf79834 100644
  fs_DATA =
  superminfs_DATA = \
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 130519d..2099b16 100644
+index 111e179..dd90c11 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -161,7 +161,7 @@ noinst_LTLIBRARIES = liberrnostring.la libprotocol.la
@@ -34,5 +34,5 @@ index 130519d..2099b16 100644
 -  -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
 +  -DGUESTFS_DEFAULT_PATH='"$(prefix)/lib/guestfs"' \
    -DGUESTFS_WARN_DEPRECATED=1 \
-   $(HIVEX_CFLAGS) $(AUGEAS_CFLAGS) $(PCRE_CFLAGS) \
+   $(HIVEX_CFLAGS) $(PCRE_CFLAGS) \
    $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \
diff --git a/debian/patches/0008-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch b/debian/patches/0007-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch
similarity index 91%
rename from debian/patches/0008-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch
rename to debian/patches/0007-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch
index ef5e582..0df72cc 100644
--- a/debian/patches/0008-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch
+++ b/debian/patches/0007-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch
@@ -8,10 +8,10 @@ This reverts commit 82e3b7509dea41823c1ce58acd61d406d460c0ab.
  1 file changed, 9 deletions(-)
 
 diff --git a/src/launch.c b/src/launch.c
-index cb51526..b0c810e 100644
+index 54ba471..8993a5b 100644
 --- a/src/launch.c
 +++ b/src/launch.c
-@@ -777,15 +777,6 @@ launch_appliance (guestfs_h *g)
+@@ -775,15 +775,6 @@ launch_appliance (guestfs_h *g)
      add_cmdline (g, "stdio");
  #endif
  
diff --git a/debian/patches/0009-The-package-containing-the-diff-binary-has-been-diff.patch b/debian/patches/0009-The-package-containing-the-diff-binary-has-been-diff.patch
deleted file mode 100644
index 25f3d2a..0000000
--- a/debian/patches/0009-The-package-containing-the-diff-binary-has-been-diff.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Sat, 18 Aug 2012 13:26:19 +0200
-Subject: The package containing the diff binary has been diffutils for years
-
----
- appliance/packagelist.in |    4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/appliance/packagelist.in b/appliance/packagelist.in
-index 15b3f41..120bd86 100644
---- a/appliance/packagelist.in
-+++ b/appliance/packagelist.in
-@@ -23,7 +23,6 @@
-   btrfs-progs
-   cryptsetup
-   cryptsetup-luks /* old name used before Fedora 17 */
--  diffutils
-   e2fsprogs
-   /* e4fsprogs only exists on RHEL 5, will be ignored everywhere else. */
-   e4fsprogs
-@@ -50,7 +49,6 @@
-   bsdmainutils
-   btrfs-tools
-   cryptsetup
--  diff
-   e2fsprogs
-   gfs-tools
-   gfs2-tools
-@@ -75,7 +73,6 @@
-   vim
-   btrfs-progs-unstable
-   cryptsetup
--  diffutils
-   augeas
-   zfs-fuse
-   e2fsprogs
-@@ -96,6 +93,7 @@ binutils
- bzip2
- coreutils
- cpio
-+diffutils
- dosfstools
- file
- findutils
diff --git a/debian/patches/series b/debian/patches/series
index 70a6bab..064ef69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,7 @@
-0001-Disable-fuse-tests-if-dev-fuse-doesn-t-exist.patch
-0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
-0003-Fix-for-systemd-based-Debian-systems.patch
-0004-out-of-tree-build-fix-building-Perl-bindings.patch
-0005-out-of-tree-build-daemon.patch
-0006-ruby-install-to-vendor_ruby.patch
-0007-Fix-guestfs-supermin-appliance-path.patch
-0008-Revert-qemu-Use-sgabios-by-default-thanks-Dan-Berran.patch
-0009-The-package-containing-the-diff-binary-has-been-diff.patch
+0001-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
+0002-Fix-for-systemd-based-Debian-systems.patch
+0003-out-of-tree-build-fix-building-Perl-bindings.patch
+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

-- 
Libguestfs Debian packaging

More information about the Pkg-libvirt-commits mailing list