[shibboleth-sp2] 01/12: Replace obsolete libsystemd-daemon-dev B-D with libsystemd-dev

[Ferenc Wágner]

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

wferi-guest pushed a commit to branch debian/master
in repository shibboleth-sp2.

commit 60fd77648e4f4a68e3e030ca787d00de89d942f8
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Mon Feb 1 19:19:30 2016 +0100

    Replace obsolete libsystemd-daemon-dev B-D with libsystemd-dev
    
    The systemd utility libs merged into a single libsystemd at v209
    
    New patch Search-for-libsystemd-instead-of-libsystemd-daemon.patch
    
    Closes: #813480
---
 debian/control                                     |  2 +-
 ...r-libsystemd-instead-of-libsystemd-daemon.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index dbf82e7..e3c7dff 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends:
  libmemcached-dev (>= 1.0),
  libsaml2-dev (>= 2.5),
  libssl-dev,
- libsystemd-daemon-dev,
+ libsystemd-dev,
  libxerces-c-dev,
  libxml-security-c-dev (>= 1.7),
  libxmltooling-dev (>= 1.5),
diff --git a/debian/patches/Search-for-libsystemd-instead-of-libsystemd-daemon.patch b/debian/patches/Search-for-libsystemd-instead-of-libsystemd-daemon.patch
new file mode 100644
index 0000000..3fa693a
--- /dev/null
+++ b/debian/patches/Search-for-libsystemd-instead-of-libsystemd-daemon.patch
@@ -0,0 +1,29 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Mon, 1 Feb 2016 19:28:48 +0100
+Subject: Search for libsystemd instead of libsystemd-daemon
+
+The systemd utility libraries were merged into a single libsystemd at
+version 209.
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 08037d6..c4d79dd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -446,12 +446,12 @@ AC_MSG_CHECKING(whether to build with systemd)
+ AC_MSG_RESULT($WANT_SYSTEMD)
+ if test "$WANT_SYSTEMD" = "yes" ; then
+ 	AC_CHECK_HEADER([systemd/sd-daemon.h], [
+-	    AC_CHECK_LIB([systemd-daemon], [sd_notify], [hassdnotify="y"])])
++	    AC_CHECK_LIB([systemd], [sd_notify], [hassdnotify="y"])])
+ 	AS_IF([test "x$hassdnotify=" = x], [
+ 	   AC_MSG_ERROR([Unable to find a suitable libsystemd-daemon library])
+ 	])
+ 	AC_DEFINE([HAVE_SD_NOTIFY],[1],[Define to 1 if you have the sd_notify function.])
+-	PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon])
++	PKG_CHECK_MODULES([SYSTEMD], [libsystemd])
+ 	AC_SUBST([SYSTEMD_CFLAGS])
+ 	AC_SUBST([SYSTEMD_LIBS])
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index 604f45c..bbbafd8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ Remove-WSTrust-schema-references.patch
 Debianize-the-systemd-service-file-of-shibd.patch
 Fix-typo-acccepted-accepted.patch
 Fix-typo-paremeter-parameter.patch
+Search-for-libsystemd-instead-of-libsystemd-daemon.patch

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