[Pkg-mpd-commits] [pkg-mpd] 04/12: let dh_installinit do runlevel and start/stop

[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 02fe215eb26829037e9c44e83bf8a62434e1ab08
Author: Florian Schlichting <fsfs at debian.org>
Date:   Fri Nov 22 00:21:59 2013 +0100

    let dh_installinit do runlevel and start/stop
    
    insserv has obsoleted what we were trying to do, and systemd needs to be considered too.
    If we let dh_installinit do its thing we get all of that for free.
---
 debian/mpd.postinst | 47 +++++++----------------------------------------
 debian/mpd.postrm   |  4 +---
 debian/mpd.prerm    | 22 ----------------------
 debian/rules        |  3 ---
 4 files changed, 8 insertions(+), 68 deletions(-)

diff --git a/debian/mpd.postinst b/debian/mpd.postinst
index 464544c..99c94d9 100644
--- a/debian/mpd.postinst
+++ b/debian/mpd.postinst
@@ -5,60 +5,27 @@ set -e
 umask 0022
 ACTION="$1"
 VERSION="$2"
-MPDCONF="/etc/mpd.conf"
-PIDFILE=$(sed -n 's/^[[:space:]]*pid_file[[:space:]]*"\?\([^"]*\)\"\?/\1/p' $MPDCONF)
 
-if [ "$ACTION" != "configure" ]; then
-    echo "action: $ACTION not supported"
-    exit 0
-fi
-
-do_mpd_adduser () {
+if [ "$ACTION" == "configure" ]; then
+    # add the mpd user
     if ! getent passwd mpd >/dev/null; then
         adduser --quiet --ingroup audio --system --no-create-home \
             --home /var/lib/mpd mpd
     fi
-}
 
-do_mpd_perms () {
+    # set ownership and permissions on directories
     for i in /var/log/mpd /var/lib/mpd /var/lib/mpd/playlists; do
         if ! dpkg-statoverride --list --quiet "$i" >/dev/null; then
             dpkg-statoverride --force --quiet --update \
                 --add mpd audio 0755 "$i"
         fi
     done
-}
 
-do_mpd_conf () {
-    if ! dpkg-statoverride --list --quiet "$MPDCONF" >/dev/null; then
+    # set ownership and permissions on mpd.conf
+    if ! dpkg-statoverride --list --quiet /etc/mpd.conf >/dev/null; then
         dpkg-statoverride --force --quiet --update \
-            --add mpd audio 0640 "$MPDCONF"
+            --add mpd audio 0640 /etc/mpd.conf
     fi
-}
-
-do_mpd_init () {
-		  if [ -x /etc/init.d/mpd ]; then
-					 # Start after ALSA/icecast/etc and stop before them
-					 update-rc.d mpd defaults 30 14 >/dev/null
-								if [ -x /usr/sbin/invoke-rc.d ]; then
-										  invoke-rc.d mpd "$@"
-								else
-										  /etc/init.d/mpd "$@"
-								fi
-		  fi
-}
-
-do_mpd_restart () {
-    if [ -e "$PIDFILE" ]; then
-        do_mpd_init restart
-    else
-        do_mpd_init start
-    fi
-}
-
-do_mpd_adduser
-do_mpd_perms
-do_mpd_conf
-do_mpd_restart
+fi
 
 #DEBHELPER#
diff --git a/debian/mpd.postrm b/debian/mpd.postrm
index 480aa48..6a71053 100644
--- a/debian/mpd.postrm
+++ b/debian/mpd.postrm
@@ -3,10 +3,8 @@
 set -e
 
 if [ "$1" = "purge" ]; then
-	update-rc.d mpd remove defaults >/dev/null
-
 	# clean up all statoverrides that belonged to mpd, so the
-	# user can cleanly remove the mpd system user if they want to
+	# mpd system user can be removed cleanly
 	for i in $(dpkg-statoverride --list | awk '/^mpd / {print $4}'); do
 		if dpkg-statoverride --list --quiet "$i" >/dev/null; then
 			dpkg-statoverride --force --quiet --remove "$i"
diff --git a/debian/mpd.prerm b/debian/mpd.prerm
index f6a6149..c1fc8b9 100644
--- a/debian/mpd.prerm
+++ b/debian/mpd.prerm
@@ -2,26 +2,4 @@
 
 set -e
 
-do_mpd_stop () {
-    if [ -x /etc/init.d/mpd ]; then
-        if [ -x /usr/sbin/invoke-rc.d ]; then
-            invoke-rc.d mpd stop
-        else
-            /etc/init.d/mpd stop
-        fi
-    fi
-}
-
-case "$1" in
-    remove|deconfigure)
-        do_mpd_stop
-        ;;
-    upgrade|failed-upgrade)
-        ;;
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 0
-        ;;
-esac
-
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 23185b4..c10f47c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,9 +45,6 @@ override_dh_auto_build:
 override_dh_strip:
 	dh_strip  --dbg-package=mpd-dbg
 
-override_dh_installinit:
-	dh_installinit -n
-
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
 

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