[SCM] mpd-sima/master: Switched to /run instead of /var/run

[kaliko-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit eb0e34c3fcbffd905e04f51e9a992dd6edcefdba
Author: Geoffroy Youri Berret <efrim at azylum.org>
Date:   Sat Apr 6 18:49:30 2013 +0200

    Switched to /run instead of /var/run
    
    Removed also useless use of dpkg-statoverride
    
    Git-Dch: Ignore

diff --git a/debian/changelog b/debian/changelog
index a64d2cc..ffadff2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ mpd-sima (0.10.0-1) UNRELEASED; urgency=low
   * New upstream version 0.10.0 (LP: #1056738)
   * Bumped Standards-Version to 3.9.4.0
   * Adjust Build-Depends
-  * init script ensure creation of /var/run/mpd-sima
+  * init script ensure creation of /run/mpd-sima
 
  -- Geoffroy Youri Berret <efrim at azylum.org>  Thu, 07 Mar 2013 00:38:02 +0100
 
diff --git a/debian/mpd-sima.init b/debian/mpd-sima.init
index 444633f..24ba7e4 100755
--- a/debian/mpd-sima.init
+++ b/debian/mpd-sima.init
@@ -18,7 +18,7 @@ DESC="MPD_sima autoqueue utility"
 NAME=mpd-sima
 USER=$NAME
 DAEMON="/usr/bin/$NAME"
-PIDFILE="/var/run/$NAME/pid"
+PIDFILE="/run/$NAME/pid"
 LOGFILE="/var/log/mpd-sima/mpd-sima.log"
 VARDIR="/var/lib/mpd-sima/"
 CONF="/etc/mpd-sima.cfg"
@@ -41,18 +41,12 @@ DAEMON_ARGS="--daemon --var_dir=$VARDIR \
 # and status_of_proc is working.
 . /lib/lsb/init-functions
 
-# Ensure /var/run/mpd-sima is there, cf. Debian policy 9.4.1
+# Ensure /run/mpd-sima is there, cf. Debian policy 9.4.1
 # http://www.debian.org/doc/debian-policy/ch-opersys.html#s-fhs-run
 if [ ! -d "$(dirname $PIDFILE)" ]; then
     mkdir "$(dirname $PIDFILE)"
-    if dpkg-statoverride --list --quiet "$(dirname $PIDFILE)" > /dev/null; then
-        #if dpkg-statoverride is used update it with permissions there
-        dpkg-statoverride --force --quiet --update --add $( dpkg-statoverride --list --quiet "$(dirname $PIDFILE)" ) 2> /dev/null
-    else
-        #use defaults
-        chown $USER:$USER "$(dirname $PIDFILE)"
-        chmod 755 "$(dirname $PIDFILE)"
-    fi
+    chown $USER:$USER "$(dirname $PIDFILE)"
+    chmod 755 "$(dirname $PIDFILE)"
 fi
 
 #
diff --git a/debian/mpd-sima.postinst b/debian/mpd-sima.postinst
index 75c470c..94258c4 100755
--- a/debian/mpd-sima.postinst
+++ b/debian/mpd-sima.postinst
@@ -30,7 +30,7 @@ do_mpd_sima_adduser () {
 }
 
 do_mpd_sima_perms () {
-    for i in /var/log/mpd-sima /var/run/mpd-sima; do
+    for i in /var/log/mpd-sima; do
         if ! dpkg-statoverride --list --quiet "$i" >/dev/null; then
             dpkg-statoverride --force --quiet --update --add mpd-sima mpd-sima 0755 "$i"
         fi

-- 
mpd-sima packaging