[SCM] gmerlin/master: Refresh patches

[alessio at users.alioth.debian.org]

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

    Refresh patches
    
    Git-Dch: Ignore

diff --git a/debian/patches/binutils_gold.patch b/debian/patches/binutils_gold.patch
index 8eb6c78..16433a9 100644
--- a/debian/patches/binutils_gold.patch
+++ b/debian/patches/binutils_gold.patch
@@ -4,8 +4,7 @@ Author: Alessio Treglia <alessio at debian.org>
 Forwarded: no
 ---
  apps/alsamixer/Makefile.am  |    2 +-
- apps/camelot/Makefile.am    |    3 ++-
- apps/kbd/Makefile.am        |    4 ++--
+ apps/kbd/Makefile.am        |    2 +-
  apps/player/Makefile.am     |    2 +-
  apps/plugincfg/Makefile.am  |    3 ++-
  apps/recorder/Makefile.am   |    3 ++-
@@ -13,7 +12,7 @@ Forwarded: no
  apps/visualizer/Makefile.am |    2 +-
  lib/Makefile.am             |    2 +-
  tests/Makefile.am           |   16 ++++++++--------
- 10 files changed, 22 insertions(+), 18 deletions(-)
+ 9 files changed, 19 insertions(+), 16 deletions(-)
 
 --- gmerlin.orig/lib/Makefile.am
 +++ gmerlin/lib/Makefile.am
@@ -28,7 +27,7 @@ Forwarded: no
  libgmerlin_la_SOURCES = \
 --- gmerlin.orig/tests/Makefile.am
 +++ gmerlin/tests/Makefile.am
-@@ -112,13 +112,13 @@ fvtest_LDADD = ../lib/libgmerlin.la -ldl
+@@ -124,13 +124,13 @@ fvtest_LDADD = ../lib/libgmerlin.la -ldl
  
  
  cfgtest_SOURCES = cfgtest.c
@@ -45,7 +44,7 @@ Forwarded: no
  
  
  v4ltest_SOURCES = v4ltest.c
-@@ -131,19 +131,19 @@ visualization_SOURCES = visualization.c
+@@ -143,19 +143,19 @@ visualization_SOURCES = visualization.c
  visualization_LDADD = ../lib/libgmerlin.la
  
  scrolltext_SOURCES = scrolltext.c
@@ -70,17 +69,6 @@ Forwarded: no
  
  server_SOURCES = server.c
  server_LDADD = ../lib/libgmerlin.la
---- gmerlin.orig/apps/player/Makefile.am
-+++ gmerlin/apps/player/Makefile.am
-@@ -38,7 +38,7 @@ gmerlin.h \
- player_remote.h \
- playerwindow.h
- 
--gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la
-+gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @GTK_LIBS@ @XML2_LIBS@
- gmerlin_remote_LDADD = $(top_builddir)/lib/libgmerlin.la
- 
- EXTRA_DIST = gmerlin_launcher gmerlin-player.desktop
 --- gmerlin.orig/apps/plugincfg/Makefile.am
 +++ gmerlin/apps/plugincfg/Makefile.am
 @@ -18,6 +18,7 @@ Desktop_DATA = gmerlin-plugincfg.desktop
@@ -103,18 +91,6 @@ Forwarded: no
  
  noinst_HEADERS = alsamixer.h gui.h
  
---- gmerlin.orig/apps/camelot/Makefile.am
-+++ gmerlin/apps/camelot/Makefile.am
-@@ -25,7 +25,8 @@ bin_PROGRAMS = camelot
- camelot_SOURCES = webcam.c webcam_window.c main.c $(vloopback_sources)
- camelot_LDADD = \
- $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
--$(top_builddir)/lib/libgmerlin.la
-+$(top_builddir)/lib/libgmerlin.la \
-+ at GTK_LIBS@
- 
- noinst_HEADERS = webcam.h webcam_window.h webcam_priv.h vloopback.h
- 
 --- gmerlin.orig/apps/recorder/Makefile.am
 +++ gmerlin/apps/recorder/Makefile.am
 @@ -20,7 +20,8 @@ gmerlin_recorder_SOURCES = gmerlin_recor
@@ -127,18 +103,6 @@ Forwarded: no
  
  noinst_HEADERS = recorder_window.h
  
---- gmerlin.orig/apps/kbd/Makefile.am
-+++ gmerlin/apps/kbd/Makefile.am
-@@ -33,7 +33,7 @@ noinst_HEADERS = \
- kbd.h \
- kbd_remote.h
- 
--gmerlin_kbd_LDADD = $(top_builddir)/lib/libgmerlin.la @X_LIBS@
--gmerlin_kbd_config_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la
-+gmerlin_kbd_LDADD = $(top_builddir)/lib/libgmerlin.la @X_LIBS@ @XML2_LIBS@
-+gmerlin_kbd_config_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @X_LIBS@ @GTK_LIBS@ @XML2_LIBS@
- 
- EXTRA_DIST = gmerlin-kbd.desktop
 --- gmerlin.orig/apps/transcoder/Makefile.am
 +++ gmerlin/apps/transcoder/Makefile.am
 @@ -28,7 +28,8 @@ gmerlin_transcoder_remote_SOURCES = gmer
@@ -161,3 +125,24 @@ Forwarded: no
 +gmerlin_visualizer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
  
  EXTRA_DIST = gmerlin-visualizer.desktop
+--- gmerlin.orig/apps/kbd/Makefile.am
++++ gmerlin/apps/kbd/Makefile.am
+@@ -34,6 +34,6 @@ kbd.h \
+ kbd_remote.h
+ 
+ gmerlin_kbd_LDADD = $(top_builddir)/lib/libgmerlin.la @X_LIBS@ @XML2_LIBS@
+-gmerlin_kbd_config_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@
++gmerlin_kbd_config_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@ @X_LIBS@ @GTK_LIBS@
+ 
+ EXTRA_DIST = gmerlin-kbd.desktop
+--- gmerlin.orig/apps/player/Makefile.am
++++ gmerlin/apps/player/Makefile.am
+@@ -38,7 +38,7 @@ gmerlin.h \
+ player_remote.h \
+ playerwindow.h
+ 
+-gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@
++gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@ @GTK_LIBS@
+ gmerlin_remote_LDADD = $(top_builddir)/lib/libgmerlin.la
+ 
+ EXTRA_DIST = gmerlin_launcher gmerlin-player.desktop

-- 
gmerlin packaging