[SCM] gmerlin/master: Also patch configure.ac

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Dec 13 10:49:08 UTC 2012


The following commit has been merged in the master branch:
commit 8ee73180b80ce262de7b3c60469b1ce032a4e9da
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Dec 13 10:47:19 2012 +0000

    Also patch configure.ac

diff --git a/debian/patches/strip_doc_out.patch b/debian/patches/strip_doc_out.patch
index b19a1bb..3e5fd6c 100644
--- a/debian/patches/strip_doc_out.patch
+++ b/debian/patches/strip_doc_out.patch
@@ -3,8 +3,9 @@ Description: Don't generate documentation, it's been removed as it was licensed
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: not-needed
 ---
- Makefile.am |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ Makefile.am  |    2 +-
+ configure.ac |    2 --
+ 2 files changed, 1 insertion(+), 3 deletions(-)
 
 --- gmerlin.orig/Makefile.am
 +++ gmerlin/Makefile.am
@@ -17,3 +18,14 @@ Forwarded: not-needed
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = gmerlin.pc $(gtk_pc) 
+--- gmerlin.orig/configure.ac
++++ gmerlin/configure.ac
+@@ -1022,8 +1022,6 @@ apps/visualizer/Makefile \
+ apps/kbd/Makefile \
+ apps/thumbnailer/Makefile \
+ apps/nmjedit/Makefile \
+-doc/Makefile \
+-doc/Doxyfile \
+ icons/Makefile \
+ m4/Makefile \
+ utils/Makefile \

-- 
gmerlin packaging



More information about the pkg-multimedia-commits mailing list