[SCM] gmerlin/master: Don't generate non DFSG-compliant documentation.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 73a8632d70fcc2cbb7e42d55067dab01d82c51a3
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Dec 12 17:02:44 2012 +0000

    Don't generate non DFSG-compliant documentation.

diff --git a/debian/patches/series b/debian/patches/series
index 0bc1937..cd80bc6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fix_zeroplugins.patch
 gmerlin_visualizer_slave.patch
 fix_typos.patch
 binutils_gold.patch
+strip_doc_out.patch
diff --git a/debian/patches/strip_doc_out.patch b/debian/patches/strip_doc_out.patch
new file mode 100644
index 0000000..b19a1bb
--- /dev/null
+++ b/debian/patches/strip_doc_out.patch
@@ -0,0 +1,19 @@
+Description: Don't generate documentation, it's been removed as it was licensed under
+ GFDL-1.1 license, which is DFSG incompatible.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: not-needed
+---
+ Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- gmerlin.orig/Makefile.am
++++ gmerlin/Makefile.am
+@@ -7,7 +7,7 @@ else
+ gtk_pc = 
+ endif
+ 
+-SUBDIRS = po lib plugins tests apps icons skins include doc m4 utils osd
++SUBDIRS = po lib plugins tests apps icons skins include m4 utils osd
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = gmerlin.pc $(gtk_pc) 

-- 
gmerlin packaging