[monopd] 02/07: Build-depend directly on libsystemd-dev.

[Peter Pentchev]

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

roam-guest pushed a commit to branch jessie-experimental
in repository monopd.

commit 441c5b0ae4cc192bc94fc8f5a39927a4029766c2
Author: Peter Pentchev <roam at ringlet.net>
Date:   Thu Mar 5 14:15:42 2015 +0200

    Build-depend directly on libsystemd-dev.
    
    Closes:		#779763
    Thanks:		Michael Biebl for the report
---
 debian/control                            |  2 +-
 debian/patches/01-libsystemd-daemon.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index f92777a..04c4cdf 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  dh-autoreconf,
  dh-systemd (>= 1.5),
  libmath++-dev,
- libsystemd-daemon-dev [linux-any],
+ libsystemd-dev [linux-any],
  pkg-config
 Standards-Version: 3.9.5
 Homepage: http://gtkatlantic.gradator.net/
diff --git a/debian/patches/01-libsystemd-daemon.patch b/debian/patches/01-libsystemd-daemon.patch
new file mode 100644
index 0000000..8c8dfc7
--- /dev/null
+++ b/debian/patches/01-libsystemd-daemon.patch
@@ -0,0 +1,25 @@
+Description: Check for libsystemd in preference to libsystemd-daemon.
+Forwarded: not-yet
+Author: Peter Pentchev <roam at ringlet.net>
+Debian-Bug: https://bugs.debian.org/779763
+Last-Update: 2015-03-05
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,10 +29,13 @@
+             [Add support for systemd startup notification (default is autodetected)]),
+             [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
+ AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
+-    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
++    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
+         [AC_DEFINE(USE_SYSTEMD_DAEMON, 1, [Use systemd startup notification])],
+-        [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
+-            [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
++        [PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
++            [AC_DEFINE(USE_SYSTEMD_DAEMON, 1, [Use systemd startup notification])],
++            [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
++                [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
++            )]
+         )]
+     )
+ ])
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3a1ac39
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-libsystemd-daemon.patch

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