Control: tags -1 + patch
Hi Jordi! On Wed, 04 Mar 2015 18:31:00 +0100 [email protected] wrote: > Source: fcgiwrap > Version: 1.1.0-3 > Severity: normal > User: [email protected] > 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 fcgiwrap_1.1.0-5. 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 dc6a392..f71031a 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,9 @@ Uploaders: Sergio Talens-Oliag <[email protected]> Build-Depends: autoconf (>= 2.61), automake, debhelper (>= 9), dh-systemd, + dh-autoreconf, libfcgi-dev, - libsystemd-daemon-dev [linux-any], + libsystemd-dev [linux-any], pkg-config Standards-Version: 3.9.5 Vcs-Svn: svn://anonscm.debian.org/collab-maint/deb-maint/fcgiwrap/trunk diff --git a/debian/patches/libsystemd.patch b/debian/patches/libsystemd.patch new file mode 100644 index 0000000..f72c47a --- /dev/null +++ b/debian/patches/libsystemd.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index bb3674e..2b02ef4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -28,7 +28,7 @@ AC_ARG_WITH([systemd], + [], [with_systemd=check]) + have_systemd=no + if test "x$with_systemd" != "xno"; then +- PKG_CHECK_MODULES(systemd, [libsystemd-daemon], ++ PKG_CHECK_MODULES(systemd, [libsystemd], + [AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is available]) + have_systemd=yes], + have_systemd=no) diff --git a/debian/patches/series b/debian/patches/series index 82ef543..cdc98dd 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ GIT-Add-p-path-option-to-restrict-scripts.patch fix_systemd.patch fix_mandir.patch systemd_socket_requires.patch +libsystemd.patch diff --git a/debian/rules b/debian/rules index 3f841a5..1948009 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,7 @@ #!/usr/bin/make -f %: - dh $@ --with systemd + dh $@ --with systemd,autoreconf CONFIGURE_FLAGS := --prefix /usr ifeq (linux,$(DEB_HOST_ARCH_OS))
signature.asc
Description: OpenPGP digital signature
