[Pkg-libvirt-commits] [libguestfs] 64/66: Dropped patch that has been integrated upstream

[Hilko Bengen]

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

bengen pushed a commit to annotated tag debian/1%1.27.54-1
in repository libguestfs.

commit 42184ead982c978c28ee767e7cdd4a4346c739b8
Author: Hilko Bengen <bengen at debian.org>
Date:   Wed Sep 24 09:31:28 2014 +0200

    Dropped patch that has been integrated upstream
---
 debian/patches/0003-Do-not-use-DTB-for-armel.patch |  2 +-
 ...emd0-and-systemd-as-one-alternative-to-th.patch | 28 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/debian/patches/0003-Do-not-use-DTB-for-armel.patch b/debian/patches/0003-Do-not-use-DTB-for-armel.patch
index 891cf16..01c5064 100644
--- a/debian/patches/0003-Do-not-use-DTB-for-armel.patch
+++ b/debian/patches/0003-Do-not-use-DTB-for-armel.patch
@@ -7,7 +7,7 @@ Subject: Do not use DTB for armel
  1 file changed, 2 insertions(+)
 
 diff --git a/src/guestfs-internal.h b/src/guestfs-internal.h
-index 69ea2dc..ceae3d7 100644
+index fd0c4a1..e2d19c6 100644
 --- a/src/guestfs-internal.h
 +++ b/src/guestfs-internal.h
 @@ -145,8 +145,10 @@
diff --git a/debian/patches/0004-Add-libsystemd0-and-systemd-as-one-alternative-to-th.patch b/debian/patches/0004-Add-libsystemd0-and-systemd-as-one-alternative-to-th.patch
deleted file mode 100644
index d5d8b32..0000000
--- a/debian/patches/0004-Add-libsystemd0-and-systemd-as-one-alternative-to-th.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Fri, 19 Sep 2014 18:14:01 +0200
-Subject: Add libsystemd0 and systemd (as one alternative) to the appliance
-
----
- appliance/packagelist.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/appliance/packagelist.in b/appliance/packagelist.in
-index 3e028e3..418c574 100644
---- a/appliance/packagelist.in
-+++ b/appliance/packagelist.in
-@@ -80,6 +80,7 @@ dnl iproute has been renamed to iproute2
-   libcap2
-   libhivex0
-   libpcre3
-+  libsystemd0
-   libsystemd-id128-0
-   libsystemd-journal0
-   libyajl2
-@@ -91,6 +92,7 @@ dnl iproute has been renamed to iproute2
-   openssh-client
-   reiserfsprogs
-   sysvinit                  dnl for /sbin/reboot
-+  systemd                   dnl alternative for /sbin/reboot
-   ufsutils
-   vim-tiny
-   xz-utils
diff --git a/debian/patches/series b/debian/patches/series
index 852ebf1..cf66984 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-perl-revert-failed-attempt-at-building-out-of-tree-s.patch
 0002-golang-Fix-for-out-of-tree-builds.patch
 0003-Do-not-use-DTB-for-armel.patch
-0004-Add-libsystemd0-and-systemd-as-one-alternative-to-th.patch

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