[Pkg-mpd-commits] [pkg-mpd] 06/10: Transition from libsystemd-daemon-dev to libsystemd-dev (closes: #779762)

[Florian Schlichting]

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

fsfs pushed a commit to branch master
in repository pkg-mpd.

commit 396adc71fdfd7a7a45e40fff82b5fb80f037c60e
Author: Florian Schlichting <fsfs at debian.org>
Date:   Mon Jun 22 23:10:51 2015 +0200

    Transition from libsystemd-daemon-dev to libsystemd-dev (closes: #779762)
---
 debian/control                  |   2 +-
 debian/patches/libsystemd.patch | 105 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |   1 +
 debian/rules                    |   4 +-
 4 files changed, 109 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index c7f78d5..7f93aad 100644
--- a/debian/control
+++ b/debian/control
@@ -54,7 +54,7 @@ Build-Depends: debhelper (>= 9),
                libsndfile1-dev,
                libsoxr-dev,
                libsqlite3-dev,
-               libsystemd-daemon-dev [linux-any],
+               libsystemd-dev [linux-any],
                libupnp-dev,
                libvorbis-dev [!arm !armel !armeb],
                libvorbisidec-dev [arm armel armeb],
diff --git a/debian/patches/libsystemd.patch b/debian/patches/libsystemd.patch
new file mode 100644
index 0000000..a63345e
--- /dev/null
+++ b/debian/patches/libsystemd.patch
@@ -0,0 +1,105 @@
+Description: transition to libsystemd from deprecated libsystemd-daemon
+ systemd 209 merged the various libsystemd-* libraries into a single
+ libsystemd.so, so we check for that instead and rename the configure
+ option, define, etc accordingly.
+Author: Florian Schlichting <fsfs at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779762
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -571,10 +571,10 @@
+ MPD_DEPENDS([enable_sqlite], [enable_glib],
+ 	[Cannot use --enable-sqlite with --disable-glib])
+ 
+-AC_ARG_ENABLE(systemd-daemon,
+-	AS_HELP_STRING([--enable-systemd-daemon],
+-		[use the systemd daemon library (default=auto)]),,
+-	[enable_systemd_daemon=$linux_auto])
++AC_ARG_ENABLE(systemd,
++	AS_HELP_STRING([--enable-systemd],
++		[use the systemd library (default=auto)]),,
++	[enable_systemd=$linux_auto])
+ 
+ AC_ARG_ENABLE(tcp,
+ 	AS_HELP_STRING([--disable-tcp],
+@@ -761,11 +761,11 @@
+ 	AC_MSG_ERROR([No client interfaces configured!])
+ fi
+ 
+-MPD_AUTO_PKG(systemd_daemon, SYSTEMD_DAEMON, libsystemd-daemon,
+-	[systemd activation], [libsystemd-daemon not found])
+-AM_CONDITIONAL(ENABLE_SYSTEMD_DAEMON, test x$enable_systemd_daemon = xyes)
+-if test x$enable_systemd_daemon = xyes; then
+-	AC_DEFINE([ENABLE_SYSTEMD_DAEMON], 1, [Define to use the systemd daemon library])
++MPD_AUTO_PKG(systemd, SYSTEMD, libsystemd,
++	[systemd activation], [libsystemd not found])
++AM_CONDITIONAL(ENABLE_SYSTEMD, test x$enable_systemd = xyes)
++if test x$enable_systemd = xyes; then
++	AC_DEFINE([ENABLE_SYSTEMD], 1, [Define to use the systemd library])
+ fi
+ 
+ dnl ---------------------------------------------------------------------------
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -58,7 +58,7 @@
+ 	$(ICU_LDADD) \
+ 	libutil.a \
+ 	$(FS_LIBS) \
+-	$(SYSTEMD_DAEMON_LIBS) \
++	$(SYSTEMD_LIBS) \
+ 	$(GLIB_LIBS)
+ 
+ src_mpd_SOURCES = \
+--- a/config.h.in
++++ b/config.h.in
+@@ -75,8 +75,8 @@
+ /* Define to enable sqlite database support */
+ #undef ENABLE_SQLITE
+ 
+-/* Define to use the systemd daemon library */
+-#undef ENABLE_SYSTEMD_DAEMON
++/* Define to use the systemd library */
++#undef ENABLE_SYSTEMD
+ 
+ /* Define to enable the TwoLAME encoder plugin */
+ #undef ENABLE_TWOLAME_ENCODER
+--- a/src/Listen.cxx
++++ b/src/Listen.cxx
+@@ -32,7 +32,7 @@
+ #include <string.h>
+ #include <assert.h>
+ 
+-#ifdef ENABLE_SYSTEMD_DAEMON
++#ifdef ENABLE_SYSTEMD
+ #include <systemd/sd-daemon.h>
+ #endif
+ 
+@@ -77,7 +77,7 @@
+ 	}
+ }
+ 
+-#ifdef ENABLE_SYSTEMD_DAEMON
++#ifdef ENABLE_SYSTEMD
+ 
+ static bool
+ listen_systemd_activation(Error &error_r)
+@@ -109,7 +109,7 @@
+ 
+ 	listen_socket = new ClientListener(loop, partition);
+ 
+-#ifdef ENABLE_SYSTEMD_DAEMON
++#ifdef ENABLE_SYSTEMD
+ 	if (listen_systemd_activation(error))
+ 		return true;
+ 
+--- a/doc/user.xml
++++ b/doc/user.xml
+@@ -109,7 +109,7 @@
+   libupnp-dev \
+   libavahi-client-dev \
+   libsqlite3-dev \
+-  libsystemd-daemon-dev libwrap0-dev \
++  libsystemd-dev libwrap0-dev \
+   libcppunit-dev xmlto \
+   libboost-dev \
+   libglib2.0-dev libicu-dev
diff --git a/debian/patches/series b/debian/patches/series
index f809b8b..fcc0566 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ typo.patch
 also-dis_en_able-socket.patch
 protect_system.patch
 unknown-lvalue-ControlGroup.patch
+libsystemd.patch
diff --git a/debian/rules b/debian/rules
index 0ebe87c..9f49e04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,10 +23,10 @@ endif
 
 # no systemd and no alsa on non-linux arches
 ifeq ($(DEB_HOST_ARCH_OS), linux)
-WITH_SYSTEMD=--enable-systemd-daemon --with-systemdsystemunitdir=/lib/systemd/system --enable-alsa
+WITH_SYSTEMD=--enable-systemd --with-systemdsystemunitdir=/lib/systemd/system --enable-alsa
 CP_SYSTEMD_UNIT=mkdir -p debian/mpd/lib/systemd && cp -a debian/tmp/lib/systemd/system debian/mpd/lib/systemd/
 else
-WITH_SYSTEMD=--disable-systemd-daemon --disable-alsa
+WITH_SYSTEMD=--disable-systemd --disable-alsa
 CP_SYSTEMD_UNIT=echo "no systemd, not copying systemd .service file"
 endif
 

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