[Pkg-mpd-commits] [pkg-mpd] 11/13: Install system user unit from upstream

[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 5640b710792deb91b87244c029a58468f65456f2
Author: Florian Schlichting <fsfs at debian.org>
Date:   Tue Dec 13 21:28:50 2016 +0100

    Install system user unit from upstream
---
 debian/mpd.service.user | 13 -------------
 debian/rules            |  7 +------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/debian/mpd.service.user b/debian/mpd.service.user
deleted file mode 100644
index f75956a..0000000
--- a/debian/mpd.service.user
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Music Player Daemon (user unit)
-Documentation=man:mpd(1) man:mpd.conf(5)
-Documentation=file:///usr/share/doc/mpd/user-manual.html
-
-[Service]
-ExecStart=/usr/bin/mpd --no-daemon
-
-# disallow writing to /usr, /bin, /sbin, ...
-ProtectSystem=yes
-
-[Install]
-WantedBy=default.target
diff --git a/debian/rules b/debian/rules
index 8032b6c..4bafe16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ endif
 
 # no systemd and no alsa on non-linux arches
 ifeq ($(DEB_HOST_ARCH_OS), linux)
-WITH_SYSTEMD=--enable-systemd --with-systemdsystemunitdir=/lib/systemd/system --enable-alsa
+WITH_SYSTEMD=--enable-systemd --with-systemdsystemunitdir=/lib/systemd/system --with-systemduserunitdir=/usr/lib/systemd/user --enable-alsa
 else
 WITH_SYSTEMD=--disable-systemd --disable-alsa
 endif
@@ -137,11 +137,6 @@ override_dh_auto_build:
 	/usr/bin/xmlto --stringparam chunker.output.encoding=utf-8 html-nochunks $(CURDIR)/doc/user.xml
 	mv user.html user-manual.html
 
-override_dh_auto_install:
-	dh_auto_install
-	test -f $(CURDIR)/debian/mpd/lib/systemd/system/mpd.service && \
-	    install -Dm644 $(CURDIR)/debian/mpd.service.user $(CURDIR)/debian/mpd/usr/lib/systemd/user/mpd.service
-
 override_dh_strip:
 	# can be dropped after Stretch
 	dh_strip  --ddeb-migration='mpd-dbg (<< 0.19.14-1~)'

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