On Sun, 15 Jul 2012, Cyril Brulebois wrote: > Hello Alexander, > > Alexander Wirt <formo...@debian.org> (15/07/2012): > > Please unblock package mpd not my day, this time its attached.
At least I hope so Alex
--- mpd-0.16.8/debian/changelog 2012-07-15 19:56:23.000000000 +0200
+++ mpd-0.17/debian/changelog 2012-07-15 19:56:23.000000000 +0200
@@ -1,3 +1,19 @@
+mpd (0.17-2) unstable; urgency=low
+
+ * Remove systemd support until wheezy+1
+ * Import patch from upstream to fix bug in software
+ volume code (Closes: #679889)
+
+ -- Alexander Wirt <formo...@debian.org> Sun, 15 Jul 2012 18:08:12 +0200
+
+mpd (0.17-1) unstable; urgency=low
+
+ * [7bd0a55] Imported Upstream version 0.17
+ * [2caba61] Enable some new modules
+ * [ace771f] Add systemd support
+
+ -- Alexander Wirt <formo...@debian.org> Sat, 30 Jun 2012 00:07:05 +0200
+
mpd (0.16.8-1) unstable; urgency=low
* [73d225a] Imported Upstream version 0.16.8
--- mpd-0.16.8/debian/control 2012-07-15 19:56:23.000000000 +0200
+++ mpd-0.17/debian/control 2012-07-15 19:56:23.000000000 +0200
@@ -10,12 +10,20 @@
libavahi-client-dev,
libavahi-glib-dev,
libavcodec-dev,
+ libsndfile1-dev,
+ libyajl-dev,
+ libsidutils-dev,
+ libmodplug-dev,
+ libcdio-paranoia-dev,
+ libfluidsynth-dev,
+ libmpg123-dev,
libavformat-dev,
+ libiso9660-dev,
libcurl4-gnutls-dev | libcurl-dev,
libfaad-dev,
libflac-dev (>= 1.1.4),
libid3tag0-dev,
- libjack-dev,
+ libjack-jackd2-dev,
libmad0-dev,
libmikmod2-dev,
libmms-dev,
@@ -31,6 +39,7 @@
libvorbis-dev [!arm !armel !armeb],
libvorbisidec-dev [arm armel armeb],
libwavpack-dev,
+ quilt,
xmlto,
zlib1g-dev
Standards-Version: 3.9.3
--- mpd-0.16.8/debian/mpd.conf 2012-07-15 19:56:23.000000000 +0200
+++ mpd-0.17/debian/mpd.conf 2012-07-15 19:56:23.000000000 +0200
@@ -200,11 +200,11 @@
audio_output {
type "alsa"
name "My ALSA Device"
- device "hw:0,0" # optional
- format "44100:16:2" # optional
- mixer_device "default" # optional
- mixer_control "PCM" # optional
- mixer_index "0" # optional
+# device "hw:0,0" optional
+# format "44100:16:2" optional
+# mixer_device "default" optional
+# mixer_control "PCM" optional
+# mixer_index "0" optional
}
#
# An example of an OSS output:
--- mpd-0.16.8/debian/patches/10_fix_audio_output.patch 1970-01-01 01:00:00.000000000 +0100
+++ mpd-0.17/debian/patches/10_fix_audio_output.patch 2012-07-15 19:56:23.000000000 +0200
@@ -0,0 +1,41 @@
+commit dbee2f199640ec296b049801fe79e35c4b3424f6
+Author: Max Kellermann <m...@duempel.org>
+Date: Tue Jul 10 01:14:43 2012 +0200
+
+ output_init: put the "convert" filter at the end of the list
+
+ No, really! This fixes a regression of commit 74617389, which
+ changed the order of filter plugins.
+
+Index: b/src/output_init.c
+===================================================================
+--- a/src/output_init.c 2012-06-27 19:26:54.295905280 +0200
++++ b/src/output_init.c 2012-07-15 18:03:48.673921843 +0200
+@@ -213,13 +213,6 @@
+ ao->replay_gain_filter = NULL;
+ ao->other_replay_gain_filter = NULL;
+
+- /* the "convert" filter must be the last one in the chain */
+-
+- ao->convert_filter = filter_new(&convert_filter_plugin, NULL, NULL);
+- assert(ao->convert_filter != NULL);
+-
+- filter_chain_append(ao->filter, ao->convert_filter);
+-
+ /* done */
+
+ return true;
+@@ -280,6 +273,13 @@
+ return false;
+ }
+
++ /* the "convert" filter must be the last one in the chain */
++
++ ao->convert_filter = filter_new(&convert_filter_plugin, NULL, NULL);
++ assert(ao->convert_filter != NULL);
++
++ filter_chain_append(ao->filter, ao->convert_filter);
++
+ return true;
+ }
+
--- mpd-0.16.8/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ mpd-0.17/debian/patches/series 2012-07-15 19:56:23.000000000 +0200
@@ -0,0 +1 @@
+10_fix_audio_output.patch
--- mpd-0.16.8/debian/.pc/.version 2012-07-15 19:56:23.000000000 +0200
+++ mpd-0.17/debian/.pc/.version 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-2
--- mpd-0.16.8/debian/rules 2012-07-15 19:56:23.000000000 +0200
+++ mpd-0.17/debian/rules 2012-07-15 19:56:23.000000000 +0200
@@ -14,7 +14,7 @@
LDFLAGS += -Wl,--as-needed
%:
- dh $@
+ dh $@ --with-quilt
override_dh_auto_configure:
./configure $(WITH_TREMOR) --enable-sqlite \
@@ -25,6 +25,10 @@
--enable-lame-encoder \
--disable-cue \
--enable-mikmod \
+ --enable-soundcloud \
+ --enable-iso9660 \
+ --enable-modplug \
+ --enable-curl \
--prefix=/usr \
--sysconfdir=/etc/mpd
pgpy1L8I7m9WW.pgp
Description: PGP signature
