Control: tags -1 + patch Hi! On Wed, 04 Mar 2015 18:31:00 +0100 biebl@debian.org wrote: > Source: cups > Version: 1.7.5-11 > Severity: normal > User: pkg-systemd-maintainers@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. I didn't keep a fallback for the old libsystemd-daemon library, i.e. support for systemd < 209. I'm happy to update the patch though if you want to support that. The patch is build tested against cups 2.0.3-6. Would be great if you can include it in your next upload. Regards, 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 0b83d49..0054d9f 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,7 @@ Build-Depends: libpaper-dev, libpng-dev | libpng12-dev, libslp-dev, - libsystemd-daemon-dev [linux-any], + libsystemd-dev [linux-any], libtiff-dev, libusb-1.0-0-dev [!hurd-any], po4a (>= 0.31~), diff --git a/debian/patches/libsystemd.patch b/debian/patches/libsystemd.patch new file mode 100644 index 0000000..d044a1d --- /dev/null +++ b/debian/patches/libsystemd.patch @@ -0,0 +1,20 @@ +diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4 +index 0053aa7..eacb3dc 100644 +--- a/config-scripts/cups-startup.m4 ++++ b/config-scripts/cups-startup.m4 +@@ -56,11 +56,11 @@ if test x$enable_systemd != xno; then + AC_MSG_ERROR(Need pkg-config to enable systemd support.) + fi + else +- AC_MSG_CHECKING(for libsystemd-daemon) +- if $PKGCONFIG --exists libsystemd-daemon; then ++ AC_MSG_CHECKING(for libsystemd) ++ if $PKGCONFIG --exists libsystemd; then + AC_MSG_RESULT(yes) +- ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd-daemon` +- ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd-daemon` ++ ONDEMANDFLAGS=`$PKGCONFIG --cflags libsystemd` ++ ONDEMANDLIBS=`$PKGCONFIG --libs libsystemd` + AC_DEFINE(HAVE_SYSTEMD) + if test "x$SYSTEMD_DIR" = x; then + SYSTEMD_DIR="`$PKGCONFIG --variable=systemdsystemunitdir systemd`" diff --git a/debian/patches/series b/debian/patches/series index 813f77e..776b2f4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -54,3 +54,4 @@ debianize_cups-config.patch # po4a might not be appropriate. It also needs to be high on the patch # queue to catch all Debian-specific changes manpage-translations.patch +libsystemd.patch
Attachment:
signature.asc
Description: OpenPGP digital signature