diff -Nru /tmp/gpRuFF2Qfm/mpd-0.12.1/debian/changelog /tmp/1mtqTTxHbh/mpd-0.12.1/debian/changelog
--- /tmp/gpRuFF2Qfm/mpd-0.12.1/debian/changelog	2006-10-14 13:25:25.000000000 +0200
+++ /tmp/1mtqTTxHbh/mpd-0.12.1/debian/changelog	2006-10-14 13:25:25.000000000 +0200
@@ -1,3 +1,12 @@
+mpd (0.12.1-1ubuntu1) edgy; urgency=low
+
+  * merge from Debian Sid
+  * debian/mpd.init.d:
+    - create /var/run/ directory if necessary and set proper permissions
+    (Closes Ubuntu 64293)
+
+ -- Lionel Porcheron <lionel@alveonet.org>  Sat, 14 Oct 2006 13:02:49 +0200
+
 mpd (0.12.1-1) unstable; urgency=low
 
   * New upstream release
diff -Nru /tmp/gpRuFF2Qfm/mpd-0.12.1/debian/mpd.init.d /tmp/1mtqTTxHbh/mpd-0.12.1/debian/mpd.init.d
--- /tmp/gpRuFF2Qfm/mpd-0.12.1/debian/mpd.init.d	2006-10-14 13:25:25.000000000 +0200
+++ /tmp/1mtqTTxHbh/mpd-0.12.1/debian/mpd.init.d	2006-10-14 13:25:25.000000000 +0200
@@ -12,11 +12,18 @@
 DAEMON=/usr/bin/mpd
 MPDCONF=/etc/mpd.conf
 START_MPD=true
+PIDFILE=`sed -n -e 's/^[[:space:]]*pid_file[[:space:]]*"\?\([^"]*\)\"\?/\1/p' $MPDCONF`
+USER=`sed -n -e 's/^[[:space:]]*user[[:space:]]*"\?\([^"]*\)\"\?/\1/p' $MPDCONF`
 
 if [ -r /etc/default/mpd ]; then
     . /etc/default/mpd
 fi
 
+if [ ! -e `dirname $PIDFILE` ];then
+       mkdir `dirname $PIDFILE`
+       chown $USER `dirname $PIDFILE`
+fi
+
 check_conf () {
     if ! (grep -q db_file $MPDCONF && grep -q pid_file $MPDCONF); then
         echo "$MPDCONF must have db_file and pid_file set; not starting."