[SCM] cinelerra-cv/master: fonts directory has been removed, so skip it

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri May 20 07:54:19 UTC 2011


The following commit has been merged in the master branch:
commit 88be4202d983faef9df24d671feb56b737957644
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri May 20 09:54:02 2011 +0200

    fonts directory has been removed, so skip it

diff --git a/debian/patches/11-buildsystem.patch b/debian/patches/11-buildsystem.patch
new file mode 100644
index 0000000..1f1b42c
--- /dev/null
+++ b/debian/patches/11-buildsystem.patch
@@ -0,0 +1,31 @@
+Author: Alessio Treglia <alessio at debian.org>
+Description: fonts direcoty has been removed, so ignore it
+---
+ plugins/Makefile.am |    3 +--
+ plugins/Makefile.in |    3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+--- cinelerra-cv.orig/plugins/Makefile.am
++++ cinelerra-cv/plugins/Makefile.am
+@@ -102,8 +102,7 @@ SUBDIRS= \
+ 	whirl \
+ 	wipe \
+ 	yuv \
+-	zoomblur \
+-	fonts
++	zoomblur
+ 
+ AUTOMAKE_OPTIONS=foreign
+ 
+--- cinelerra-cv.orig/plugins/Makefile.in
++++ cinelerra-cv/plugins/Makefile.in
+@@ -402,8 +402,7 @@ SUBDIRS = \
+ 	whirl \
+ 	wipe \
+ 	yuv \
+-	zoomblur \
+-	fonts
++	zoomblur
+ 
+ AUTOMAKE_OPTIONS = foreign
+ EXTRA_DIST = 
diff --git a/debian/patches/series b/debian/patches/series
index 43670df..304a7a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_desktop.patch
 02_FTBFS.diff
+11-buildsystem.patch

-- 
cinelerra-cv packaging



More information about the pkg-multimedia-commits mailing list