Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: pu

Hi,
attached debdiff fixes a FTBFS of cmus in stable.

[Adding Alessio to CC]

Cheers,
        Moritz

-- System Information:
Debian Release: 7.5
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru cmus-2.4.3/debian/changelog cmus-2.4.3/debian/changelog
--- cmus-2.4.3/debian/changelog	2012-06-02 20:08:09.000000000 +0200
+++ cmus-2.4.3/debian/changelog	2014-06-18 14:18:17.000000000 +0200
@@ -1,3 +1,10 @@
+cmus (2.4.3-2+deb7u1) wheezy; urgency=low
+
+  * Fix FTBFS related to the libmodplug upgrade in DSA 2751, patch as used in
+    2.5.0-4 (Closes: #724181)
+
+ -- Moritz Mühlenhoff <muehlenh...@univention.de>  Wed, 18 Jun 2014 14:16:56 +0200
+
 cmus (2.4.3-2) unstable; urgency=low
 
   [ Ryan Kavanagh ]
diff -Nru cmus-2.4.3/debian/patches/fix-modplug-build.patch cmus-2.4.3/debian/patches/fix-modplug-build.patch
--- cmus-2.4.3/debian/patches/fix-modplug-build.patch	1970-01-01 01:00:00.000000000 +0100
+++ cmus-2.4.3/debian/patches/fix-modplug-build.patch	2014-06-18 14:16:49.000000000 +0200
@@ -0,0 +1,19 @@
+Description: Horrible fix for misdetection of modplug.
+Author: Alessio Treglia <ales...@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724181
+Forwarded: no
+---
+
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+--- cmus-2.4.3.orig/Makefile
++++ cmus-2.4.3/Makefile
+@@ -90,7 +90,7 @@ ip-$(CONFIG_FFMPEG)	+= ffmpeg.so
+ $(flac-objs):		CFLAGS += $(FLAC_CFLAGS)
+ $(mad-objs):		CFLAGS += $(MAD_CFLAGS)
+ $(mikmod-objs):		CFLAGS += $(MIKMOD_CFLAGS)
+-$(modplug-objs):	CFLAGS += $(MODPLUG_CFLAGS)
++$(modplug-objs):	CFLAGS += $(MODPLUG_CFLAGS) -I/usr/include/libmodplug
+ $(mpc-objs):		CFLAGS += $(MPC_CFLAGS)
+ $(vorbis-objs):		CFLAGS += $(VORBIS_CFLAGS)
+ $(wavpack-objs):	CFLAGS += $(WAVPACK_CFLAGS)
diff -Nru cmus-2.4.3/debian/patches/series cmus-2.4.3/debian/patches/series
--- cmus-2.4.3/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ cmus-2.4.3/debian/patches/series	2014-06-18 14:16:25.000000000 +0200
@@ -0,0 +1 @@
+fix-modplug-build.patch

Reply via email to