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

[alessio at users.alioth.debian.org]

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

    Drop underlinking.patch, applied upstream.

diff --git a/debian/patches/series b/debian/patches/series
index de22402..3e5a9ab 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
-underlinking.patch
 gmerlin_visualizer_slave.patch
 fix_typos.patch
 binutils_gold.patch
diff --git a/debian/patches/underlinking.patch b/debian/patches/underlinking.patch
deleted file mode 100644
index ff31718..0000000
--- a/debian/patches/underlinking.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Cristian Morales Vega <reddwarf at opensuse.org>
-Description: link libgmerlin against libxml and libm
-as these are needed and obviously forgotten by upstream
---- gmerlin.orig/configure.ac
-+++ gmerlin/configure.ac
-@@ -139,6 +139,8 @@
- 
- dnl Required
- 
-+LT_LIB_M
-+
- XML2_REQUIRED="2.4.0"
- PKG_CHECK_MODULES(XML2, libxml-2.0 >= $XML2_REQUIRED, , AC_MSG_ERROR("libxml2 not found"))
- AC_SUBST(XML2_REQUIRED)
---- gmerlin.orig/lib/gtk/Makefile.am
-+++ gmerlin/lib/gtk/Makefile.am
-@@ -64,5 +64,5 @@
- urlselect.c \
- vumeter.c
- 
--libgmerlin_gtk_la_LIBADD = @GTK_LIBS@ $(top_builddir)/lib/libgmerlin.la
-+libgmerlin_gtk_la_LIBADD = @GTK_LIBS@ $(top_builddir)/lib/libgmerlin.la @XML2_LIBS@ @LIBM@
- 
-Binary files gmerlin.orig/.git/index and gmerlin/.git/index differ

-- 
gmerlin packaging