diff -u mpd-0.14~beta3/debian/control mpd-0.14~beta3/debian/control --- mpd-0.14~beta3/debian/control +++ mpd-0.14~beta3/debian/control @@ -1,7 +1,8 @@ Source: mpd Section: sound Priority: optional -Maintainer: Decklin Foster +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Decklin Foster Build-Depends: debhelper (>= 6), cdbs, libcurl-dev, libavahi-client-dev, libsamplerate0-dev, libaudiofile-dev, libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386], libao-dev (>= 0.8.3-1), libpulse-dev, libjack-dev, libshout3-dev, libogg-dev, libvorbis-dev [!arm !armel !armeb], libvorbisidec-dev [arm armel armeb], libflac-dev (>= 1.1.4-1), libmpcdec-dev, libmad0-dev, libfaad-dev, libmikmod2-dev, libwavpack-dev, libavcodec-dev, libid3tag0-dev, zlib1g-dev, quilt, xmlto Standards-Version: 3.8.0 Homepage: http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki diff -u mpd-0.14~beta3/debian/mpd.init.d mpd-0.14~beta3/debian/mpd.init.d --- mpd-0.14~beta3/debian/mpd.init.d +++ mpd-0.14~beta3/debian/mpd.init.d @@ -35,6 +35,9 @@ PIDFILE=$(sed -n 's/^[[:space:]]*pid_file[[:space:]]*"\?\([^"]*\)\"\?/\1/p' $MPDCONF) DBFILE=$(sed -n 's/^[[:space:]]*db_file[[:space:]]*"\?\([^"]*\)\"\?/\1/p' $MPDCONF) +PIDFILE=$(sed -n 's/^[[:space:]]*pid_file[[:space:]]*"\?\([^"]*\)\"\?/\1/p' $MPDCONF) +DBFILE=$(sed -n 's/^[[:space:]]*db_file[[:space:]]*"\?\([^"]*\)\"\?/\1/p' $MPDCONF) +USER=`awk 'BEGIN{ao=0} /[ \t]*audio_output[ \t]*{/{ ao = 1 } /[ \t]*}/{ ao = 0 } /^[ \t]*user[ \t]*/{ if (ao == 0) user = $2 } END{ print substr(user, 2, length(user) - 2) }' $MPDCONF` mpd_start () { log_daemon_msg "Starting $DESC" "$NAME" @@ -53,7 +56,7 @@ PIDDIR=$(dirname "$PIDFILE") if [ ! -d "$PIDDIR" ]; then mkdir -m 0755 $PIDDIR - chown mpd:audio $PIDDIR + chown $USER:audio $PIDDIR fi if [ "$FORCE_CREATE_DB" -o ! -f "$DBFILE" ]; then diff -u mpd-0.14~beta3/debian/changelog mpd-0.14~beta3/debian/changelog --- mpd-0.14~beta3/debian/changelog +++ mpd-0.14~beta3/debian/changelog @@ -1,9 +1,40 @@ +mpd (0.14~beta3-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes (LP: #311083): + - debian/mpd.init.d: read mpd user from mpd.conf. + + -- Nick Ellery Tue, 23 Dec 2008 19:17:02 -0800 + mpd (0.14~beta3-1) unstable; urgency=low * New upstream release -- Decklin Foster Mon, 22 Dec 2008 19:44:34 -0500 +mpd (0.14~beta2-2ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes (LP: #310430): + - debian/mpd.init.d: read mpd user from mpd.conf. + + -- Nick Ellery Sun, 21 Dec 2008 19:54:19 -0800 + +mpd (0.14~beta2-2) unstable; urgency=low + + * Build a -dbg package + * Remove obsolete CDBS clean hack, useless "-1" build-deps + * Correctly delete redundant mpd.conf and copy of GPL + * Add Suggests: avahi-daemon + + -- Decklin Foster Wed, 10 Dec 2008 19:36:43 -0500 + +mpd (0.14~beta2-1ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/mpd.init.d: read mpd user from mpd.conf (Forwarded to Debian, bug 504609) + - debian/control: Recommends: avahi-daemon + + -- Lionel Porcheron Sun, 07 Dec 2008 23:22:56 +0100 + mpd (0.14~beta2-1) unstable; urgency=low * New upstream release @@ -48,18 +79,45 @@ -- Decklin Foster Sat, 08 Nov 2008 19:05:56 -0500 +mpd (0.13.2-3ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes (LP: #294200): + - debian/mpd.init.d: read mpd user from mpd.conf (Forwarded to Debian, bug 504609) + - debian/control: Recommends: avahi-daemon + + -- David Futcher Wed, 05 Nov 2008 15:36:17 +0000 + mpd (0.13.2-3) unstable; urgency=low * Remove "|| true" hack from init.d -- Decklin Foster Tue, 21 Oct 2008 15:03:42 -0400 +mpd (0.13.2-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes + (LP: #274457, #240356, #273586, #230740) + - debian/mpd.init.d: read mpd user from mpd.conf + - debian/control: set Maintainer to Ubuntu MOTU Developers + - debian/control: Recommends: avahi-daemon + + -- David Futcher Thu, 25 Sep 2008 16:50:03 +0100 + mpd (0.13.2-2) unstable; urgency=low * Don't die if start-stop-daemon fails (Closes: #478018, #498911) -- Decklin Foster Tue, 23 Sep 2008 22:00:43 -0400 +mpd (0.13.2-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/mpd.init.d: read mpd user from mpd.conf + - debian/control: set Maintainer to Ubuntu MOTU Developers + - debian/control: Recommends: avahi-daemon + + -- Luke Yelavich Thu, 19 Jun 2008 19:44:12 +1000 + mpd (0.13.2-1) unstable; urgency=low * New upstream release @@ -67,6 +125,15 @@ -- Decklin Foster Wed, 18 Jun 2008 10:06:01 -0400 +mpd (0.13.1-3ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #189435), Ubuntu remaining changes: + - debian/mpd.init.d: read mpd user from mpd.conf + - debian/control: set Maintainer to Ubuntu MOTU Developers + - debian/control: Recommends: avahi-daemon + + -- Pedro Fragoso Wed, 06 Feb 2008 10:50:06 +0000 + mpd (0.13.1-3) unstable; urgency=low * Fix upgrade in prerm (Closes: #464245) @@ -85,6 +152,15 @@ -- Decklin Foster Tue, 05 Feb 2008 09:31:46 -0500 +mpd (0.13.1-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #187392), Ubuntu remaining changes: + - debian/mpd.init.d: read mpd user from mpd.conf + - debian/control: set Maintainer to Ubuntu MOTU Developers + - debian/control: Recommends: avahi-daemon + + -- Pedro Fragoso Wed, 30 Jan 2008 09:44:27 +0000 + mpd (0.13.1-1) unstable; urgency=low * New upstream release, includes avahi-crash.diff @@ -95,6 +171,17 @@ -- Decklin Foster Tue, 29 Jan 2008 22:25:42 -0500 +mpd (0.13.0-7ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #181774), Ubuntu remaining changes: + - removed libfaad-dev build-dep (we have libfaad2-dev, which + is in multiverse) + - debian/mpd.init.d: read mpd user from mpd.conf + - debian/control: set Maintainer to Ubuntu MOTU Developers + - debian/control: Recommends: avahi-daemon + + -- Pedro Fragoso Sun, 13 Jan 2008 10:54:59 +0000 + mpd (0.13.0-7) unstable; urgency=low * Check MPD_START before attempting to stop the daemon, as well, so that @@ -102,6 +189,17 @@ -- Decklin Foster Thu, 10 Jan 2008 05:34:22 -0500 +mpd (0.13.0-6ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #181514), Ubuntu remaining changes: + - removed libfaad-dev build-dep (we have libfaad2-dev, which + is in multiverse) + - debian/mpd.init.d: read mpd user from mpd.conf + - debian/control: set Maintainer to Ubuntu MOTU Developers + - debian/control: Recommends: avahi-daemon + + -- Pedro Fragoso Wed, 09 Jan 2008 09:38:52 +0000 + mpd (0.13.0-6) unstable; urgency=low * Several init.d changes: @@ -114,6 +212,17 @@ -- Decklin Foster Mon, 07 Jan 2008 22:59:06 -0500 +mpd (0.13.0-5ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - removed libfaad-dev build-dep (we have libfaad2-dev, which + is in multiverse) + - debian/mpd.init.d: read mpd user from mpd.conf + - debian/control: set Maintainer to Ubuntu MOTU Developers + - debian/control: Recommends: avahi-daemon + + -- Pedro Fragoso Thu, 13 Dec 2007 13:17:43 +0000 + mpd (0.13.0-5) unstable; urgency=low * Build-depend on libsamplerate0-dev (Closes: #311343) @@ -128,6 +237,17 @@ -- Decklin Foster Wed, 12 Dec 2007 00:28:16 -0500 +mpd (0.13.0-3ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - removed libfaad-dev build-dep (we have libfaad2-dev, which + is in multiverse) + - debian/mpd.init.d: read mpd user from mpd.conf + - debian/control: set Maintainer to Ubuntu MOTU Developers + - debian/control: Recommends: avahi-daemon + + -- Lionel Porcheron Sun, 02 Dec 2007 11:16:13 +0100 + mpd (0.13.0-3) unstable; urgency=low [ Joey Hess ] @@ -142,12 +262,34 @@ -- Decklin Foster Fri, 30 Nov 2007 17:25:51 -0500 +mpd (0.13.0-2ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - removed libfaad-dev build-dep (we have libfaad2-dev, which + is in multiverse) + - debian/mpd.init.d: read mpd user from mpd.conf + - debian/control: set Maintainer to Ubuntu MOTU Developers + - debian/control: Recommends: avahi-daemon + + -- Lionel Porcheron Mon, 03 Sep 2007 11:49:16 +0200 + mpd (0.13.0-2) unstable; urgency=low * Include fix from SVN (r6844) for passing NULL to Avahi (Closes: #428551) -- Decklin Foster Sun, 02 Sep 2007 01:04:06 -0400 +mpd (0.13.0-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - removed libfaad-dev build-dep (we have libfaad2-dev, which + is in multiverse) + - debian/mpd.init.d: read mpd user from mpd.conf + - debian/control: set Maintainer to Ubuntu MOTU Developers + * debian/control: Recommends: avahi-daemon + + -- Lionel Porcheron Sat, 09 Jun 2007 14:02:21 +0200 + mpd (0.13.0-1) unstable; urgency=low * New upstream release @@ -157,6 +299,15 @@ -- Decklin Foster Fri, 08 Jun 2007 10:53:45 -0400 +mpd (0.12.2-3ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - removed libfaad-dev build-dep (we have libfaad2-dev, which + is in multiverse) + - debian/mpd.init.d: read mpd user from mpd.conf + + -- Andrea Veri Sat, 26 May 2007 11:31:40 +0200 + mpd (0.12.2-3) unstable; urgency=low * Made the init.d script a little more standard, including checking for the @@ -170,6 +321,22 @@ -- Decklin Foster Fri, 25 May 2007 12:46:05 -0400 +mpd (0.12.2-2ubuntu2) feisty; urgency=low + + * debian/mpd.init.d: read mpd user from mpd.conf + + -- Lionel Porcheron Thu, 05 Apr 2007 14:34:07 +0200 + +mpd (0.12.2-2ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Remaining change: + - debian/control: set Maintainer to Ubuntu MOTU Developers + * debian/control: removed libfaad-dev build-dep (we have libfaad2-dev, which + is in multiverse) + * Version 0.12.1-2 fixes LP: #96569 (PulseAudio support) + + -- Adrien Cunin Wed, 4 Apr 2007 21:13:51 +0200 + mpd (0.12.2-2) unstable; urgency=low * Include HTTP streaming fixes from SVN: @@ -209,6 +376,25 @@ -- Decklin Foster Wed, 21 Mar 2007 18:03:57 -0400 +mpd (0.12.2-0ubuntu1) feisty; urgency=low + + * New upstream release. + - SECURITY UPDATE: denial of service by dereferencing NULL pointer. + (LP: #94238) + * Replace Debian maintainer field. + + -- William Grant Wed, 21 Mar 2007 12:57:51 +1100 + +mpd (0.12.1-1.1ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/mpd.init.d: create /var/run/ directory if necessary and set + proper permissions + * Use awk to get mpd user instead of a simple sed. Thanks Rretzbach. + (Closes Ubuntu #73096) + + -- Lionel Porcheron Fri, 02 Feb 2007 10:45:43 +0100 + mpd (0.12.1-1.1) unstable; urgency=high * Non-maintainer upload. @@ -217,6 +403,15 @@ -- Bastian Venthur Wed, 31 Jan 2007 12:35:08 +0100 +mpd (0.12.1-1ubuntu1) edgy; urgency=low + + * Sync from Debian Sid + * debian/mpd.init.d: + - create /var/run/ directory if necessary and set proper permissions + (Closes Ubuntu 64293) + + -- Lionel Porcheron Sat, 14 Oct 2006 13:02:49 +0200 + mpd (0.12.1-1) unstable; urgency=low * New upstream release