[Libreoffice-commits] .: more_fonts/Package_dejavu.mk

[Libreoffice Gerrit user]

 more_fonts/Package_dejavu.mk |   47 ++++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 25 deletions(-)

New commits:
commit 862a205e05557942fda4d8b3288bd21d599181ab
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Sep 24 00:37:47 2012 -0500

    more_font: fix dejavu delivery
    
    Change-Id: I557057bfbbbf34a426225ce02052d81a3c190c57

diff --git a/more_fonts/Package_dejavu.mk b/more_fonts/Package_dejavu.mk
index 565442b..f7dc3b8 100644
--- a/more_fonts/Package_dejavu.mk
+++ b/more_fonts/Package_dejavu.mk
@@ -7,35 +7,32 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,font_dejavu_inc,$(call gb_UnpackedTarball_get_dir,font_dejavu/ttf)))
+$(eval $(call gb_Package_Package,font_dejavu_inc,$(call gb_UnpackedTarball_get_dir,font_dejavu)))
 
 $(eval $(call gb_Package_use_unpacked,font_dejavu_inc,font_dejavu))
 
 $(eval $(call gb_Package_add_files,font_dejavu_inc,pck,\
-	DejaVuSans-Bold.ttf \
-	DejaVuSans-BoldOblique.ttf \
-	DejaVuSans-ExtraLight.ttf \
-	DejaVuSans-Oblique.ttf \
-	DejaVuSans.ttf \
-	DejaVuSansCondensed-Bold.ttf \
-	DejaVuSansCondensed-BoldOblique.ttf \
-	DejaVuSansCondensed-Oblique.ttf \
-	DejaVuSansCondensed.ttf \
-	DejaVuSansMono-Bold.ttf \
-	DejaVuSansMono-BoldOblique.ttf \
-	DejaVuSansMono-Oblique.ttf \
-	DejaVuSansMono.ttf \
-	DejaVuSerif-Bold.ttf \
-	DejaVuSerif-BoldItalic.ttf \
-	DejaVuSerif-Italic.ttf \
-	DejaVuSerif.ttf \
-	DejaVuSerifCondensed-Bold.ttf \
-	DejaVuSerifCondensed-BoldItalic.ttf \
-	DejaVuSerifCondensed-Italic.ttf \
-	DejaVuSerifCondensed.ttf \
+	ttf/DejaVuSans-Bold.ttf \
+	ttf/DejaVuSans-BoldOblique.ttf \
+	ttf/DejaVuSans-ExtraLight.ttf \
+	ttf/DejaVuSans-Oblique.ttf \
+	ttf/DejaVuSans.ttf \
+	ttf/DejaVuSansCondensed-Bold.ttf \
+	ttf/DejaVuSansCondensed-BoldOblique.ttf \
+	ttf/DejaVuSansCondensed-Oblique.ttf \
+	ttf/DejaVuSansCondensed.ttf \
+	ttf/DejaVuSansMono-Bold.ttf \
+	ttf/DejaVuSansMono-BoldOblique.ttf \
+	ttf/DejaVuSansMono-Oblique.ttf \
+	ttf/DejaVuSansMono.ttf \
+	ttf/DejaVuSerif-Bold.ttf \
+	ttf/DejaVuSerif-BoldItalic.ttf \
+	ttf/DejaVuSerif-Italic.ttf \
+	ttf/DejaVuSerif.ttf \
+	ttf/DejaVuSerifCondensed-Bold.ttf \
+	ttf/DejaVuSerifCondensed-BoldItalic.ttf \
+	ttf/DejaVuSerifCondensed-Italic.ttf \
+	ttf/DejaVuSerifCondensed.ttf \
 ))
 
-
-$(eval $(call gb_Package_Package,font_dejavu_lic,$(call gb_UnpackedTarball_get_dir,font_dejavu/)))
-$(eval $(call gb_Package_use_unpacked,font_dejavu_lic,font_dejavu))
 $(eval $(call gb_Package_add_file,font_dejavu_lic,pck/License_dejavu.txt,LICENSE))