Control: tags -1 + patch On Wed, 04 Mar 2015 18:31:01 +0100 bi...@debian.org wrote: > Source: libvirt > Version: 1.2.9-9 > Severity: normal > User: pkg-systemd-maintain...@lists.alioth.debian.org > Usertags: libsystemd > > Hi! > > In systemd v209, released over a year ago, the various libsystemd-* libraries > (libsystemd-journal.so, libsystemd-login.so, libsystem-daemon.so, > libsystemd-id128.so) were merged into a single libsystemd.so library to reduce > code duplication and avoid cyclic dependencies [1]. > > Your package declares a build-dependency on either libsystemd-daemon-dev, > libsystemd-login-dev or libsystemd-journal-dev. > > Please update your package so it can be built against libsystemd.
Please find attached a patch which makes use of the new libsystemd library. Since the patch touches a m4 macro, I decided to enable dh-autoreconf instead of patch configure directly. Patch is build-tested against libvirt_1.2.16-2. Thanks for considering. Would be great if you can include that in your next upload. Cheers, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff --git a/debian/control b/debian/control index 557cf64..8a8a320 100644 --- a/debian/control +++ b/debian/control @@ -7,6 +7,7 @@ Testsuite: autopkgtest Build-Depends: debhelper (>= 7), dh-systemd (>= 1.18~), + dh-autoreconf, libxml2-dev, libncurses5-dev, libreadline-dev, @@ -39,7 +40,7 @@ Build-Depends: libaudit-dev [linux-any], libselinux1-dev (>= 2.0.82) [linux-any], libapparmor-dev [linux-any], - libsystemd-daemon-dev [linux-any], + libsystemd-dev [linux-any], nfs-common, systemtap-sdt-dev [amd64 armel armhf i386 ia64 powerpc s390], python, diff --git a/debian/patches/libsystemd.patch b/debian/patches/libsystemd.patch new file mode 100644 index 0000000..8a51c2a --- /dev/null +++ b/debian/patches/libsystemd.patch @@ -0,0 +1,13 @@ +diff --git a/m4/virt-systemd-daemon.m4 b/m4/virt-systemd-daemon.m4 +index 8516e41..c9708ec 100644 +--- a/m4/virt-systemd-daemon.m4 ++++ b/m4/virt-systemd-daemon.m4 +@@ -18,7 +18,7 @@ dnl <http://www.gnu.org/licenses/>. + dnl + + AC_DEFUN([LIBVIRT_CHECK_SYSTEMD_DAEMON],[ +- LIBVIRT_CHECK_PKG([SYSTEMD_DAEMON], [libsystemd-daemon], [0.27.1]) ++ LIBVIRT_CHECK_PKG([SYSTEMD_DAEMON], [libsystemd], [209]) + + old_CFLAGS="$CFLAGS" + old_LIBS="$LIBS" diff --git a/debian/patches/series b/debian/patches/series index 86e77c7..7c5f9c4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ debian/Debianize-systemd-service-files.patch Allow-xen-toolstack-to-find-it-s-binaries.patch Skip-vircgrouptest.patch debian/Debianize-virtlockd.patch +libsystemd.patch diff --git a/debian/rules b/debian/rules index 13deb35..04bbcd3 100755 --- a/debian/rules +++ b/debian/rules @@ -127,7 +127,7 @@ LOGROTATE = $(basename $(basename $(notdir $(wildcard daemon/libvirtd*.logrotate EXAMPLES_DIR = $(CURDIR)/debian/libvirt-doc/usr/share/doc/libvirt-doc/examples/ %: - dh $@ --builddirectory=$(DEB_BUILDDIR) --parallel + dh $@ --builddirectory=$(DEB_BUILDDIR) --parallel --with autoreconf override_dh_auto_configure: dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_ARGS)
signature.asc
Description: OpenPGP digital signature
