[Pkg-libvirt-commits] [libguestfs] 65/66: 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 8a6b532a4f5a56dc03231c7feeb37995c07950cc
Author: Hilko Bengen <bengen at debian.org>
Date:   Thu May 8 18:00:50 2014 +0200

    Dropped patches that have been integrated upstream
---
 ...liance-Fix-Debian-specific-package-names.patch} |  0
 ...ake-sure-grep-matches-qemu-2.x-version-st.patch | 21 -------------------
 ...qemu-2.0-needs-a-machine-type-for-display.patch | 24 ----------------------
 debian/patches/series                              |  4 +---
 4 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/debian/patches/0005-appliance-Fix-Debian-specific-package-names.patch b/debian/patches/0003-appliance-Fix-Debian-specific-package-names.patch
similarity index 100%
rename from debian/patches/0005-appliance-Fix-Debian-specific-package-names.patch
rename to debian/patches/0003-appliance-Fix-Debian-specific-package-names.patch
diff --git a/debian/patches/0003-configure-Make-sure-grep-matches-qemu-2.x-version-st.patch b/debian/patches/0003-configure-Make-sure-grep-matches-qemu-2.x-version-st.patch
deleted file mode 100644
index e454553..0000000
--- a/debian/patches/0003-configure-Make-sure-grep-matches-qemu-2.x-version-st.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: "Richard W.M. Jones" <rjones at redhat.com>
-Date: Tue, 22 Apr 2014 22:21:57 -0400
-Subject: configure: Make sure grep matches qemu 2.x version string.
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1034dff..da60913 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -777,7 +777,7 @@ working.
-         fi
- 
-         AC_MSG_CHECKING([for $QEMU version >= 1])
--        if $QEMU -version | grep -sq 'version @<:@1-@:>@'; then
-+        if $QEMU -version | grep -sq 'version @<:@1-9@:>@'; then
-             AC_MSG_RESULT([yes])
-         else
-             AC_MSG_RESULT([no])
diff --git a/debian/patches/0004-apparently-qemu-2.0-needs-a-machine-type-for-display.patch b/debian/patches/0004-apparently-qemu-2.0-needs-a-machine-type-for-display.patch
deleted file mode 100644
index 8096eef..0000000
--- a/debian/patches/0004-apparently-qemu-2.0-needs-a-machine-type-for-display.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Tue, 29 Apr 2014 22:12:07 +0200
-Subject: apparently,
- qemu 2.0 needs a machine type for displaying -device options.
-
----
- src/launch-direct.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/launch-direct.c b/src/launch-direct.c
-index 1460c56..2332368 100644
---- a/src/launch-direct.c
-+++ b/src/launch-direct.c
-@@ -1020,6 +1020,10 @@ test_qemu (guestfs_h *g, struct backend_direct_data *data)
-   guestfs___cmd_add_arg (cmd3, g->hv);
-   guestfs___cmd_add_arg (cmd3, "-display");
-   guestfs___cmd_add_arg (cmd3, "none");
-+#ifdef MACHINE_TYPE
-+  guestfs___cmd_add_arg (cmd3, "-M");
-+  guestfs___cmd_add_arg (cmd3, MACHINE_TYPE);
-+#endif
-   guestfs___cmd_add_arg (cmd3, "-machine");
-   guestfs___cmd_add_arg (cmd3, "accel=kvm:tcg");
-   guestfs___cmd_add_arg (cmd3, "-device");
diff --git a/debian/patches/series b/debian/patches/series
index 82e46fd..4430cbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 0001-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
 0002-golang-Fix-for-out-of-tree-builds.patch
-0003-configure-Make-sure-grep-matches-qemu-2.x-version-st.patch
-0004-apparently-qemu-2.0-needs-a-machine-type-for-display.patch
-0005-appliance-Fix-Debian-specific-package-names.patch
+0003-appliance-Fix-Debian-specific-package-names.patch

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