[SCM] gmerlin/master: Drop function_param_type.patch, applied upstream.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Jun 11 11:12:17 UTC 2012


The following commit has been merged in the master branch:
commit 2e98e2fb44388697f7bb4dfaab178daaaafe5819
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 13:10:37 2012 +0200

    Drop function_param_type.patch, applied upstream.

diff --git a/debian/patches/function_param_type.patch b/debian/patches/function_param_type.patch
deleted file mode 100644
index 2dcffba..0000000
--- a/debian/patches/function_param_type.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Cristian Morales Vega <reddwarf at opensuse.org>
-Description: fixed accidentally omitted type-specification in function
-declaraion
---- gmerlin.orig/lib/visualize_slave.c
-+++ gmerlin/lib/visualize_slave.c
-@@ -782,7 +782,7 @@
-   return write(STDOUT_FILENO, data, len);
-   }
- 
--static int write_message(msg)
-+static int write_message(bg_msg_t * msg)
-   {
-   int result;
- //  fprintf(stderr, "Write message slave...\n");
diff --git a/debian/patches/series b/debian/patches/series
index c8189e1..de22402 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ desktop_files.patch
 fix_manpages.patch
 replace_bg_sem_h.patch
 fix_zeroplugins.patch
-function_param_type.patch
 underlinking.patch
 gmerlin_visualizer_slave.patch
 fix_typos.patch

-- 
gmerlin packaging



More information about the pkg-multimedia-commits mailing list