tags 597731 + patch
tags 597731 + pending
thanks

Dear maintainer,

I've prepared a NMU for mpd and will upload it to the archive shortly.
Please find the NMU diff attached.

Cheers,
Julien
diff -u mpd-0.15.12/debian/rules mpd-0.15.12/debian/rules
--- mpd-0.15.12/debian/rules
+++ mpd-0.15.12/debian/rules
@@ -12,7 +12,7 @@
 endif
 
 DEB_BUILDDIR := debian/build
-DEB_CONFIGURE_USER_FLAGS += $(WITH_TREMOR) --enable-sqlite --enable-un --enable-ao --enable-lastfm --disable-lame
+DEB_CONFIGURE_USER_FLAGS += $(WITH_TREMOR) --enable-sqlite --enable-un --enable-ao --enable-lastfm --disable-lame --disable-cue
 LDFLAGS += -Wl,--as-needed
 
 include /usr/share/cdbs/1/rules/debhelper.mk
diff -u mpd-0.15.12/debian/changelog mpd-0.15.12/debian/changelog
--- mpd-0.15.12/debian/changelog
+++ mpd-0.15.12/debian/changelog
@@ -1,3 +1,11 @@
+mpd (0.15.12-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Disable libcue support.  It has a symbol conflict with libcdio, which we
+    also use (closes: #597731).
+
+ -- Julien Cristau <jcris...@debian.org>  Mon, 04 Oct 2010 15:46:56 +0200
+
 mpd (0.15.12-1) unstable; urgency=low
 
   * New upstream release
diff -u mpd-0.15.12/debian/control mpd-0.15.12/debian/control
--- mpd-0.15.12/debian/control
+++ mpd-0.15.12/debian/control
@@ -2,7 +2,7 @@
 Section: sound
 Priority: optional
 Maintainer: Decklin Foster <deck...@red-bean.com>
-Build-Depends: debhelper (>= 6), cdbs, libsqlite3-dev, libcurl4-gnutls-dev | libcurl-dev, libmms-dev, libavahi-client-dev, libsamplerate0-dev, libaudiofile-dev, libasound2-dev  [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386], libao-dev (>= 0.8.3), libpulse-dev, libjack-dev, libshout3-dev, libogg-dev, libvorbis-dev [!arm !armel !armeb], libvorbisidec-dev [arm armel armeb], libflac-dev (>= 1.1.4), libmpcdec-dev, libmad0-dev, libfaad-dev, libmikmod2-dev, libwavpack-dev, libsidplay2-dev, libresid-builder-dev, libavcodec-dev, libavformat-dev, libcue-dev, libid3tag0-dev, zlib1g-dev, quilt, xmlto
+Build-Depends: debhelper (>= 6), cdbs, libsqlite3-dev, libcurl4-gnutls-dev | libcurl-dev, libmms-dev, libavahi-client-dev, libsamplerate0-dev, libaudiofile-dev, libasound2-dev  [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386], libao-dev (>= 0.8.3), libpulse-dev, libjack-dev, libshout3-dev, libogg-dev, libvorbis-dev [!arm !armel !armeb], libvorbisidec-dev [arm armel armeb], libflac-dev (>= 1.1.4), libmpcdec-dev, libmad0-dev, libfaad-dev, libmikmod2-dev, libwavpack-dev, libsidplay2-dev, libresid-builder-dev, libavcodec-dev, libavformat-dev, libid3tag0-dev, zlib1g-dev, quilt, xmlto
 Standards-Version: 3.8.0
 Homepage: http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki
 

Attachment: signature.asc
Description: Digital signature

Reply via email to