diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-10-06 13:36:10 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-10-06 13:36:10 +0200 |
| commit | 222fa931c47a197fb498f1daf1234b62b8021a8c (patch) | |
| tree | 3a72de15c3cd876f01a1a367ae8e4d434e2337a7 | |
| parent | f17f2e55ad37874904d754fe64350b2549093635 (diff) | |
| parent | 5117ec7cc53e5ec3a03eca74bf1305ace8fe7f64 (diff) | |
Merge commit 'ooo/OOO330_m9'
| -rw-r--r-- | more_fonts/fonts/ttf_dejavu/makefile.mk | 6 | ||||
| -rw-r--r-- | more_fonts/prj/d.lst | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/more_fonts/fonts/ttf_dejavu/makefile.mk b/more_fonts/fonts/ttf_dejavu/makefile.mk index f9fa78a7664b..090661bbde02 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 b1a534d8d2e1..b944b155bedc 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 |