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

[Hilko Bengen]

The following commit has been merged in the master branch:
commit 1baf20043af2caa76894738d271bb69b3948e402
Author: Hilko Bengen <bengen at debian.org>
Date:   Wed Aug 15 13:42:43 2012 +0200

    Added patch that replaces diff with diffutils in package list

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
new file mode 100644
index 0000000..25f3d2a
--- /dev/null
+++ b/debian/patches/0009-The-package-containing-the-diff-binary-has-been-diff.patch
@@ -0,0 +1,44 @@
+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 6394e47..70a6bab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 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

-- 
Libguestfs Debian packaging