[Pkg-libvirt-commits] [libguestfs] 22/156: Dropped patches that have been integrated upstream

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit 4291d456e5d5ec542668d10a955bc6dd0ea5a52e
Author: Hilko Bengen <bengen at debian.org>
Date:   Sun May 25 10:36:54 2014 +0200

    Dropped patches that have been integrated upstream
---
 ...pliance-Fix-Debian-specific-package-names.patch | 28 ---------------
 ...slinux-add-new-syslinux-6-path-of-mbr.bin.patch | 41 ----------------------
 debian/patches/series                              |  2 --
 3 files changed, 71 deletions(-)

diff --git a/debian/patches/0003-appliance-Fix-Debian-specific-package-names.patch b/debian/patches/0003-appliance-Fix-Debian-specific-package-names.patch
deleted file mode 100644
index 21986c6..0000000
--- a/debian/patches/0003-appliance-Fix-Debian-specific-package-names.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Wed, 7 May 2014 22:49:16 +0200
-Subject: appliance: Fix Debian-specific package names
-
----
- appliance/packagelist.in | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/appliance/packagelist.in b/appliance/packagelist.in
-index d241ec9..f602c9d 100644
---- a/appliance/packagelist.in
-+++ b/appliance/packagelist.in
-@@ -60,11 +60,13 @@ ifelse(DEBIAN,1,
-   e2fsprogs
-   extlinux
-   genisoimage
--  gfs-tools
--  gfs2-tools
-+  gfs2-utils
-   grub2-common
-   hfsplus
-   iproute
-+  iputils-ping
-+  iputils-arping
-+  iputils-tracepath
-   libaugeas0
-   libcap2
-   libhivex0
diff --git a/debian/patches/0004-tests-syslinux-add-new-syslinux-6-path-of-mbr.bin.patch b/debian/patches/0004-tests-syslinux-add-new-syslinux-6-path-of-mbr.bin.patch
deleted file mode 100644
index 1b5d43e..0000000
--- a/debian/patches/0004-tests-syslinux-add-new-syslinux-6-path-of-mbr.bin.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Pino Toscano <ptoscano at redhat.com>
-Date: Fri, 9 May 2014 12:20:33 +0200
-Subject: tests/syslinux: add new syslinux 6+ path of mbr.bin
-
----
- tests/syslinux/test-syslinux.pl | 22 +++++++++++++++-------
- 1 file changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/tests/syslinux/test-syslinux.pl b/tests/syslinux/test-syslinux.pl
-index d86c095..3950309 100755
---- a/tests/syslinux/test-syslinux.pl
-+++ b/tests/syslinux/test-syslinux.pl
-@@ -29,13 +29,21 @@ my $bootloader = $ENV{BOOTLOADER} || "syslinux";
- my $disk = "$bootloader-guest.img";
- 
- # Find prerequisites.
--my $mbr = "/usr/share/syslinux/mbr.bin";
--unless (-f $mbr) {
--    $mbr = "/usr/lib/syslinux/mbr.bin";
--    unless (-f $mbr) {
--        print "$0: mbr.bin (from SYSLINUX) not found, skipping test\n";
--        exit 77;
--    }
-+my $mbr;
-+my @mbr_paths = (
-+  "/usr/share/syslinux/mbr.bin",
-+  "/usr/lib/syslinux/mbr.bin",
-+  "/usr/lib/syslinux/mbr/mbr.bin"
-+);
-+foreach my $m (@mbr_paths) {
-+  if (-f $m) {
-+    $mbr = $m;
-+    last;
-+  }
-+}
-+unless (defined $mbr) {
-+    print "$0: mbr.bin (from SYSLINUX) not found, skipping test\n";
-+    exit 77;
- }
- print "mbr: $mbr\n";
- 
diff --git a/debian/patches/series b/debian/patches/series
index a20462a..4574a17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 0001-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
 0002-golang-Fix-for-out-of-tree-builds.patch
-0003-appliance-Fix-Debian-specific-package-names.patch
-0004-tests-syslinux-add-new-syslinux-6-path-of-mbr.bin.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git