[Pkg-mpd-commits] [SCM] Git repository for pkg-mpd branch, master, updated. debian/0.17.1-1-36-gff61ccb

[Florian Schlichting]

The following commit has been merged in the master branch:
commit ff61ccb486b53365bd269e69493da79e1f7bcfd1
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Sun Feb 24 20:55:33 2013 +0100

    dont check for $PIDDIR twice

diff --git a/debian/changelog b/debian/changelog
index 9ee6562..81b8486 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-mpd (0.17.3-1) UNRELEASED; urgency=low
+mpd (0.17.3-1) unstable; urgency=low
 
   [ Florian Schlichting ]
   * Imported Upstream version 0.17.3 (closes: #694377).
-  * debian/mpd.init.d: remove start-create-db option from Usage string
-    (closes: #662088, LP: #902485).
+  * debian/mpd.init.d: 
+      + remove start-create-db option from Usage string (closes: #662088,
+        LP: #902485)
+      + allow stopping mpd even when START_MPD=false (closes: #545559)
+      + don't check for and create $PIDDIR twice
   * Don't tell mpd to look for non-existant /etc/mpd/mpd.conf instead of plain
     /etc/mpd.conf (closes: #681774).
   * Move pidfile from legacy /var/run/mpd to /run/mpd and drop lintian
@@ -24,9 +27,9 @@ mpd (0.17.3-1) UNRELEASED; urgency=low
   * Add myself to Uploaders.
 
   [ Alexander Wirt ]
-  * Remove myself from the list up uploaders.
+  * Remove myself from the list of uploaders.
 
- -- Florian Schlichting <fschlich at zedat.fu-berlin.de>  Thu, 21 Feb 2013 22:23:16 +0100
+ -- Florian Schlichting <fschlich at zedat.fu-berlin.de>  Sun, 24 Feb 2013 21:02:46 +0100
 
 mpd (0.17.1-1) unstable; urgency=low
 
diff --git a/debian/mpd.init.d b/debian/mpd.init.d
index be2bb37..2d0a76e 100644
--- a/debian/mpd.init.d
+++ b/debian/mpd.init.d
@@ -33,18 +33,6 @@ if [ -n "$MPD_DEBUG" ]; then
     MPD_OPTS=--verbose
 fi
 
-if [ ! -d "/run/mpd" ]; then
-	mkdir /run/mpd
-	if dpkg-statoverride --list --quiet /run/mpd > /dev/null; then
-		#if dpkg-statoverride is used update it with permissions there
-		dpkg-statoverride --force --quiet --update --add $( dpkg-statoverride --list --quiet /run/mpd ) 2> /dev/null
-	else
-		#use defaults
-		chown mpd:audio /run/mpd
-		chmod 755 /run/mpd
-	fi
-fi
-
 DBFILE=$(sed -n 's/^[[:space:]]*db_file[[:space:]]*"\?\([^"]*\)\"\?/\1/p' $MPDCONF)
 PIDFILE=$(sed -n 's/^[[:space:]]*pid_file[[:space:]]*"\?\([^"]*\)\"\?/\1/p' $MPDCONF)
 
@@ -65,7 +53,13 @@ mpd_start () {
     PIDDIR=$(dirname "$PIDFILE")
     if [ ! -d "$PIDDIR" ]; then
         mkdir -m 0755 $PIDDIR
-        chown mpd:audio $PIDDIR
+        if dpkg-statoverride --list --quiet /run/mpd > /dev/null; then
+            # if dpkg-statoverride is used update it with permissions there
+            dpkg-statoverride --force --quiet --update --add $( dpkg-statoverride --list --quiet /run/mpd ) 2> /dev/null
+        else
+            # use defaults
+            chown mpd:audio $PIDDIR
+        fi
     fi
 
     start-stop-daemon --start --quiet --oknodo --pidfile "$PIDFILE" \

-- 
Git repository for pkg-mpd