[SCM] cmus/master: Removed, applied upstream

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 596b561e9a62a8d315070da6a6b253b5fc1da82b
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Sun Mar 6 21:27:39 2016 +0100

    Removed, applied upstream

diff --git a/debian/patches/01_config.mk.diff b/debian/patches/01_config.mk.diff
deleted file mode 100644
index 19c70e2..0000000
--- a/debian/patches/01_config.mk.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Don't FTBFS if config.mk doesn't exist
- The config.mk file isn't guaranteed to exist (it gets removed by the Makefile's
- "distclean" target). Including it with a straight "include" causes cmus to
- FTBFS on the initial clean, since it doesn't exist and make aborts because it
- can't include it. Instead, include it using "-include", which ignores it if it
- doesn't exist.
-Author: Ryan Kavanagh <rak at debian.org>
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/720781
-Forwarded: no
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: cmus/Makefile
-===================================================================
---- cmus.orig/Makefile	2013-08-27 13:22:47.248230918 -0400
-+++ cmus/Makefile	2013-08-28 09:09:23.541042003 -0400
-@@ -13,7 +13,7 @@
- 
- all: main plugins man
- 
--include config.mk
-+-include config.mk
- include scripts/lib.mk
- 
- CFLAGS += -D_FILE_OFFSET_BITS=64
diff --git a/debian/patches/02_link_avcodec.patch b/debian/patches/02_link_avcodec.patch
deleted file mode 100644
index e9fab78..0000000
--- a/debian/patches/02_link_avcodec.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Link against libavcodec
- The ffmpeg plugin uses functions from libavcodec, so ensure that it is linked
- against libavcodec.
-Author: Sebastian Ramacher <sramacher at debian.org>
-Forwarded: https://github.com/cmus/cmus/pull/360
-Last-Update: 2015-11-15
-
---- cmus-2.7.1.orig/Makefile
-+++ cmus-2.7.1/Makefile
-@@ -18,8 +18,8 @@ include scripts/lib.mk
- 
- CFLAGS += -D_FILE_OFFSET_BITS=64
- 
--FFMPEG_CFLAGS += $(shell pkg-config --cflags libswresample)
--FFMPEG_LIBS += $(shell pkg-config --libs libswresample)
-+FFMPEG_CFLAGS += $(shell pkg-config --cflags libswresample libavcodec)
-+FFMPEG_LIBS += $(shell pkg-config --libs libswresample libavcodec)
- 
- CMUS_LIBS = $(PTHREAD_LIBS) $(NCURSES_LIBS) $(ICONV_LIBS) $(DL_LIBS) $(DISCID_LIBS) $(CUE_LIBS) -lm $(COMPAT_LIBS)
- 
diff --git a/debian/patches/series b/debian/patches/series
index c2cfb69..b76d9da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-01_config.mk.diff
-02_link_avcodec.patch
 11-fix_modplug_detection.patch

-- 
cmus packaging