[Pkg-libvirt-commits] [libvirt] 01/03: Rediff patches

[Guido Guenther]

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

agx pushed a commit to branch debian/sid
in repository libvirt.

commit 96c6ccb57319dcbd9d16989c0c58f6a56e8cd13f
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Apr 5 17:56:39 2016 +0200

    Rediff patches
---
 debian/patches/Link-xen-driver-against-libxl.patch | 26 ++++++++++------------
 debian/patches/debian/remove-RHism.diff.patch      |  2 +-
 debian/patches/series                              |  2 +-
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/debian/patches/Link-xen-driver-against-libxl.patch b/debian/patches/Link-xen-driver-against-libxl.patch
index 3406422..2666b42 100644
--- a/debian/patches/Link-xen-driver-against-libxl.patch
+++ b/debian/patches/Link-xen-driver-against-libxl.patch
@@ -8,21 +8,19 @@ to avoid the test failure
  2016-03-31 12:53:26.950+0000: 22430: error : virDriverLoadModule:73 : failed to load module /build/libvirt-1.3.3~rc1/debian/build/src/.libs/libvirt_driver_xen.so /build/libvirt-1.3.3~rc1/debian/build/src/.libs/libvirt_driver_xen.so: undefined symbol: xlu_cfg_destroy
 FAILED
 ---
- src/Makefile.am | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index b96a55d..a197a54 100644
+index b96a55d..52eecf0 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -1218,7 +1218,9 @@ libvirt_driver_xen_impl_la_CFLAGS =				\
- 		-I$(srcdir)/xenconfig				\
- 		$(AM_CFLAGS)
- libvirt_driver_xen_impl_la_LDFLAGS = $(AM_LDFLAGS)
--libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS) libvirt_xenconfig.la
-+libvirt_driver_xen_impl_la_LIBADD = $(XEN_LIBS) \
-+		$(LIBXL_LIBS) \
-+		libvirt_xenconfig.la
- libvirt_driver_xen_impl_la_SOURCES = $(XEN_DRIVER_SOURCES)
- endif WITH_XEN
- 
+@@ -1134,7 +1134,7 @@ endif WITH_VMX
+ if WITH_XENCONFIG
+ noinst_LTLIBRARIES += libvirt_xenconfig.la
+ libvirt_la_BUILT_LIBADD += libvirt_xenconfig.la
+-libvirt_la_LIBADD += $(LIBXL_LIBS)
++libvirt_xenconfig_la_LIBADD = $(LIBXL_LIBS)
+ libvirt_xenconfig_la_CFLAGS = \
+ 		-I$(srcdir)/conf $(AM_CFLAGS)
+ libvirt_xenconfig_la_SOURCES = $(XENCONFIG_SOURCES)
diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch
index 1639cae..297c043 100644
--- a/debian/patches/debian/remove-RHism.diff.patch
+++ b/debian/patches/debian/remove-RHism.diff.patch
@@ -7,7 +7,7 @@ Subject: remove-RHism.diff
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tools/virsh.pod b/tools/virsh.pod
-index 0c02d7f..6cc8495 100644
+index d2cc5b2..3fb9733 100644
 --- a/tools/virsh.pod
 +++ b/tools/virsh.pod
 @@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in.
diff --git a/debian/patches/series b/debian/patches/series
index d6f4b72..4013245 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,5 +14,5 @@ Allow-access-to-libnl-3-config-files.patch
 debian/apparmor_profiles_local_include.patch
 debian/libsystemd.patch
 virt-aa-helper-apparmor-allow-usr-share-OVMF-too.patch
-Link-xen-driver-against-libxl.patch
 apparmor-monitor-socket-moved.patch
+Link-xen-driver-against-libxl.patch

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