[SCM] cmus/master: Refresh patchset:

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 57a6f56d58650814bbc1745bd876b8684a93aa63
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Aug 14 15:34:23 2014 +0100

    Refresh patchset:
    
    - Drop 0{2_fix_typo,3_cppflags}.diff, adopted upstream.
    - Refresh 11-fix_modplug_detection.patch.

diff --git a/debian/patches/02_fix_typo.diff b/debian/patches/02_fix_typo.diff
deleted file mode 100644
index 4f51c39..0000000
--- a/debian/patches/02_fix_typo.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix typo in binary
-Author: Ryan Kavanagh <rak at debian.org>
-Origin: vendor
-Forwarded: yes
-Applied-Upstream: https://github.com/cmus/cmus/commit/f0eb35d
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: cmus/expr.c
-===================================================================
---- cmus.orig/expr.c	2013-08-28 09:14:52.366499178 -0400
-+++ cmus/expr.c	2013-08-28 11:22:22.599950113 -0400
-@@ -567,7 +567,7 @@
- 			stack4_pop(&state_stack);
- 			key = lookup_long_key(c);
- 			if (!key) {
--				set_error("unkown short key %c", c);
-+				set_error("unknown short key %c", c);
- 				goto error_exit;
- 			}
- 			etype = lookup_key_type(key);
diff --git a/debian/patches/03_cppflags.diff b/debian/patches/03_cppflags.diff
deleted file mode 100644
index 39621bc..0000000
--- a/debian/patches/03_cppflags.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Use CPPFLAGS to enable function fortification / hardening
- Based off of GNU Make's implicit rule
-Author: Ryan Kavanagh <rak at debian.org>
-Origin: vendor
-Forwarded: yes
-Applied-Upstream: https://github.com/cmus/cmus/commit/543ae8e
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: cmus/scripts/lib.mk
-===================================================================
---- cmus.orig/scripts/lib.mk	2013-08-29 13:27:50.000000000 -0400
-+++ cmus/scripts/lib.mk	2013-08-29 13:31:39.852947960 -0400
-@@ -83,7 +83,7 @@
- 
- # CC for program object files (.o)
- quiet_cmd_cc    = CC     $@
--      cmd_cc    = $(CC) -c $(CFLAGS) -o $@ $<
-+      cmd_cc    = $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
- 
- # HOSTCC for program object files (.o)
- quiet_cmd_hostcc    = HOSTCC     $@
-@@ -91,7 +91,7 @@
- 
- # CC for shared library and dynamically loadable module objects (.lo)
- quiet_cmd_cc_lo = CC     $@
--      cmd_cc_lo = $(CC) -c $(CFLAGS) $(SOFLAGS) -o $@ $<
-+      cmd_cc_lo = $(CC) -c $(CPPFLAGS) $(CFLAGS) $(SOFLAGS) -o $@ $<
- 
- # LD for programs, optional parameter: libraries
- quiet_cmd_ld = LD     $@
-@@ -111,11 +111,11 @@
- 
- # CXX for program object files (.o)
- quiet_cmd_cxx    = CXX    $@
--      cmd_cxx    = $(CXX) -c $(CXXFLAGS) -o $@ $<
-+      cmd_cxx    = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
- 
- # CXX for shared library and dynamically loadable module objects (.lo)
- quiet_cmd_cxx_lo = CXX    $@
--      cmd_cxx_lo = $(CXX) -c $(CXXFLAGS) $(SOFLAGS) -o $@ $<
-+      cmd_cxx_lo = $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(SOFLAGS) -o $@ $<
- 
- # CXXLD for programs, optional parameter: libraries
- quiet_cmd_cxxld = CXXLD  $@
diff --git a/debian/patches/11-fix_modplug_detection.patch b/debian/patches/11-fix_modplug_detection.patch
index 83b1612..8cf3d0f 100644
--- a/debian/patches/11-fix_modplug_detection.patch
+++ b/debian/patches/11-fix_modplug_detection.patch
@@ -8,7 +8,7 @@ Forwarded: no
 
 --- cmus.orig/Makefile
 +++ cmus/Makefile
-@@ -99,7 +99,7 @@ $(cdio-objs):		CFLAGS += $(CDIO_CFLAGS)
+@@ -104,7 +104,7 @@ $(cdio-objs):		CFLAGS += $(CDIO_CFLAGS)
  $(flac-objs):		CFLAGS += $(FLAC_CFLAGS)
  $(mad-objs):		CFLAGS += $(MAD_CFLAGS)
  $(mikmod-objs):		CFLAGS += $(MIKMOD_CFLAGS)
@@ -16,4 +16,4 @@ Forwarded: no
 +$(modplug-objs):	CFLAGS += $(MODPLUG_CFLAGS) -I/usr/include/libmodplug
  $(mpc-objs):		CFLAGS += $(MPC_CFLAGS)
  $(vorbis-objs):		CFLAGS += $(VORBIS_CFLAGS)
- $(wavpack-objs):	CFLAGS += $(WAVPACK_CFLAGS)
+ $(opus-objs):		CFLAGS += $(OPUS_CFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
index 9b68c0e..5d2fde5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 01_config.mk.diff
-02_fix_typo.diff
-03_cppflags.diff
 11-fix_modplug_detection.patch
 libav10.patch

-- 
cmus packaging