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

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 3633c4ae2d291f08e0eca2234cc7a47a464730c5
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Thu Feb 21 23:50:26 2013 +0100

    move pidfile from legacy /var/run/mpd to /run/mpd and drop lintian override (closes: #689900)

diff --git a/debian/mpd.conf b/debian/mpd.conf
index 479fac1..f2bc9d7 100644
--- a/debian/mpd.conf
+++ b/debian/mpd.conf
@@ -40,7 +40,7 @@ log_file			"/var/log/mpd/mpd.log"
 # for use of mpd --kill and some init scripts. This setting is disabled by
 # default and the pid file will not be stored.
 #
-pid_file			"/var/run/mpd/pid"
+pid_file			"/run/mpd/pid"
 #
 # This setting sets the location of the file which contains information about
 # most variables to get MPD back into the same general shape it was in before
@@ -82,7 +82,7 @@ user				"mpd"
 bind_to_address		"localhost"
 #
 # And for Unix Socket
-#bind_to_address		"/var/run/mpd/socket"
+#bind_to_address		"/run/mpd/socket"
 #
 # This setting is the TCP port that is desired for the daemon to get assigned
 # to.
diff --git a/debian/mpd.dirs b/debian/mpd.dirs
index 4d4107b..0a9bb84 100644
--- a/debian/mpd.dirs
+++ b/debian/mpd.dirs
@@ -1,8 +1,4 @@
-etc
-usr/bin
-usr/share/man/man1
 var/log/mpd
 var/lib/mpd
 var/lib/mpd/playlists
 var/lib/mpd/music
-var/run/mpd
diff --git a/debian/mpd.init.d b/debian/mpd.init.d
index d5ea72b..f94d6c8 100644
--- a/debian/mpd.init.d
+++ b/debian/mpd.init.d
@@ -33,15 +33,15 @@ if [ -n "$MPD_DEBUG" ]; then
     MPD_OPTS=--verbose
 fi
 
-if [ ! -d "/var/run/mpd" ]; then
-	mkdir /var/run/mpd 
-	if dpkg-statoverride --list --quiet /var/run/mpd > /dev/null; then
+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 /var/run/mpd ) 2> /dev/null
+		dpkg-statoverride --force --quiet --update --add $( dpkg-statoverride --list --quiet /run/mpd ) 2> /dev/null
 	else
 		#use defaults
-		chown mpd:audio /var/run/mpd
-		chmod 755 /var/run/mpd
+		chown mpd:audio /run/mpd
+		chmod 755 /run/mpd
 	fi
 fi
 
diff --git a/debian/mpd.lintian-overrides b/debian/mpd.lintian-overrides
deleted file mode 100644
index d8aea44..0000000
--- a/debian/mpd.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-dir-or-file-in-var-run var/run/mpd/
diff --git a/debian/mpd.postinst b/debian/mpd.postinst
index 70577d8..d341216 100644
--- a/debian/mpd.postinst
+++ b/debian/mpd.postinst
@@ -19,7 +19,7 @@ do_mpd_adduser () {
 }
 
 do_mpd_perms () {
-    for i in /var/log/mpd /var/lib/mpd /var/lib/mpd/playlists /var/run/mpd; do
+    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"

-- 
Git repository for pkg-mpd