[ooo-build-commit] .: 3 commits - more_fonts/fonts more_fonts/prj

[Jan Holesovsky]

 more_fonts/fonts/ttf_dejavu/makefile.mk |    6 +++---
 more_fonts/prj/d.lst                    |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ad714dd03ecc75b6996c0c3a1b58cbd552fe1328
Merge: 18c2b6f... 8fcb658...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Oct 6 13:36:10 2010 +0200

    Merge commit 'ooo/OOO330_m9'

commit 8fcb658121244cba91754d0602ebd1f2492ff0d2
Merge: f8b897e... d2e90db...
Author: obo <obo at openoffice.org>
Date:   Tue Sep 14 12:55:12 2010 +0200

    CWS-TOOLING: integrate CWS ooo33gsl08

commit d2e90db398d281577615d44252203c7991fc5452
Author: Herbert Duerr [hdu] <herbert.duerr at oracle.com>
Date:   Wed Sep 8 10:38:58 2010 +0200

    #i114069# update DejaVu fonts to version 2.32

diff --git a/more_fonts/fonts/ttf_dejavu/makefile.mk b/more_fonts/fonts/ttf_dejavu/makefile.mk
index f9fa78a..090661b 100644
--- a/more_fonts/fonts/ttf_dejavu/makefile.mk
+++ b/more_fonts/fonts/ttf_dejavu/makefile.mk
@@ -36,9 +36,9 @@ TARGET=ttf_dejavu
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=dejavu-fonts-ttf-2.30
-TARFILE_MD5=fe5b3e2b7c4577f30dc001054365653e
-TARFILE_ROOTDIR=dejavu-fonts-ttf-2.30
+TARFILE_NAME=dejavu-fonts-ttf-2.32
+TARFILE_MD5=37282537d0ed1a087b1c8f050dc812d9
+TARFILE_ROOTDIR=dejavu-fonts-ttf-2.32
 
 PATCH_FILES=
 
diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst
index 261aae0..6dba097 100644
--- a/more_fonts/prj/d.lst
+++ b/more_fonts/prj/d.lst
@@ -1,8 +1,8 @@
 mkdir: %COMMON_DEST%\pck%_EXT%
 ..\fonts\fc_local.conf	%COMMON_DEST%\pck%_EXT%\fc_local.conf
 # TODO: replace explicit versions by wildcard when the build system learns to handle them
-..\%__SRC%\misc\build\dejavu-fonts-ttf-2.30\ttf\*.ttf	%COMMON_DEST%\pck%_EXT%\*.ttf
-..\%__SRC%\misc\build\dejavu-fonts-ttf-2.30\LICENSE		%COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
+..\%__SRC%\misc\build\dejavu-fonts-ttf-2.32\ttf\*.ttf	%COMMON_DEST%\pck%_EXT%\*.ttf
+..\%__SRC%\misc\build\dejavu-fonts-ttf-2.32\LICENSE		%COMMON_DEST%\pck%_EXT%\LICENSE_dejavu
 ..\%__SRC%\misc\build\liberation-fonts-ttf-1.06.0.20100721/Liberation*.ttf	%COMMON_DEST%\pck%_EXT%\*.ttf
 ..\%__SRC%\misc\build\liberation-fonts-ttf-1.06.0.20100721/License.txt		%COMMON_DEST%\pck%_EXT%\LICENSE_liberation
 ..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf		%COMMON_DEST%\pck%_EXT%\*.ttf