[SCM] cmus/master: Remo 21-missing_plugins.patch, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Apr 23 07:47:18 UTC 2011


The following commit has been merged in the master branch:
commit ca8059f0be4f6675a7bd6da401db09acc6948d93
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Apr 23 09:47:02 2011 +0200

    Remo 21-missing_plugins.patch, applied upstream.

diff --git a/debian/patches/21-missing_plugins.patch b/debian/patches/21-missing_plugins.patch
deleted file mode 100644
index 58c0911..0000000
--- a/debian/patches/21-missing_plugins.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Subject: Handle missing dependencies more gracefully.
-Author: Johannes Weißl <jargon at molb.org>
-Applied-Upstream: https://gitorious.org/cmus/cmus/commit/391272701
----
- input.c  |    2 +-
- output.c |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- cmus.orig/input.c
-+++ cmus/input.c
-@@ -399,7 +399,7 @@ void ip_load_plugins(void)
- 
- 		so = dlopen(filename, RTLD_NOW);
- 		if (so == NULL) {
--			error_msg("%s", dlerror());
-+			d_print("%s: %s\n", filename, dlerror());
- 			continue;
- 		}
- 
---- cmus.orig/output.c
-+++ cmus/output.c
-@@ -105,7 +105,7 @@ void op_load_plugins(void)
- 
- 		so = dlopen(filename, RTLD_NOW);
- 		if (so == NULL) {
--			error_msg("%s", dlerror());
-+			d_print("%s: %s\n", filename, dlerror());
- 			continue;
- 		}
- 
diff --git a/debian/patches/series b/debian/patches/series
index 701dce9..9b32268 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 10-roaraudio_support.patch
 20-segfault_on_adding_to_queue.patch
-21-missing_plugins.patch

-- 
cmus packaging



More information about the pkg-multimedia-commits mailing list