From 013fd9e15ae7a31b748bf2d17452f949b4e76d49 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Sun, 14 Apr 2013 10:04:11 +0200 Subject: rename font packages Change-Id: Ib5bdf5e96b47122ac546e7dfcc7b32184d727917 --- more_fonts/ExternalPackage_dejavu.mk | 4 ++-- more_fonts/ExternalPackage_gentium.mk | 6 +++--- more_fonts/ExternalPackage_liberation.mk | 6 +++--- more_fonts/ExternalPackage_liberation_narrow.mk | 6 +++--- more_fonts/ExternalPackage_libertineg.mk | 6 +++--- more_fonts/ExternalPackage_opensans.mk | 6 +++--- more_fonts/ExternalPackage_ptserif.mk | 6 +++--- more_fonts/ExternalPackage_sourcecode.mk | 6 +++--- more_fonts/ExternalPackage_sourcesans.mk | 6 +++--- more_fonts/Package_conf.mk | 4 ++-- 10 files changed, 28 insertions(+), 28 deletions(-) (limited to 'more_fonts') diff --git a/more_fonts/ExternalPackage_dejavu.mk b/more_fonts/ExternalPackage_dejavu.mk index c1209eca5697..a6ae367f9822 100644 --- a/more_fonts/ExternalPackage_dejavu.mk +++ b/more_fonts/ExternalPackage_dejavu.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,font_dejavu_inc,font_dejavu)) +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_dejavu,font_dejavu)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,font_dejavu_inc,pck,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,pck,\ ttf/DejaVuSans-Bold.ttf \ ttf/DejaVuSans-BoldOblique.ttf \ ttf/DejaVuSans-ExtraLight.ttf \ diff --git a/more_fonts/ExternalPackage_gentium.mk b/more_fonts/ExternalPackage_gentium.mk index 3992d2b98625..ba16e43ebc50 100644 --- a/more_fonts/ExternalPackage_gentium.mk +++ b/more_fonts/ExternalPackage_gentium.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,font_gentium_inc,font_gentium)) +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gentium,font_gentium)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,font_gentium_inc,pck,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,pck,\ GenBasB.ttf \ GenBasBI.ttf \ GenBasI.ttf \ @@ -20,6 +20,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,font_gentium_inc,pck,\ GenBkBasR.ttf \ )) -$(eval $(call gb_ExternalPackage_add_unpacked_file,font_gentium_inc,pck/License_gentium.txt,OFL.txt)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_gentium,pck/License_gentium.txt,OFL.txt)) # vim: set noet sw=4 ts=4: diff --git a/more_fonts/ExternalPackage_liberation.mk b/more_fonts/ExternalPackage_liberation.mk index a0aae9a8a041..82898b3a3a0d 100644 --- a/more_fonts/ExternalPackage_liberation.mk +++ b/more_fonts/ExternalPackage_liberation.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,font_liberation_inc,font_liberation)) +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation,font_liberation)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,font_liberation_inc,pck,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,pck,\ LiberationMono-Bold.ttf \ LiberationMono-BoldItalic.ttf \ LiberationMono-Italic.ttf \ @@ -24,6 +24,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,font_liberation_inc,pck,\ LiberationSerif-Regular.ttf \ )) -$(eval $(call gb_ExternalPackage_add_unpacked_file,font_liberation_inc,pck/License_liberation.txt,LICENSE)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_liberation,pck/License_liberation.txt,LICENSE)) # vim: set noet sw=4 ts=4: diff --git a/more_fonts/ExternalPackage_liberation_narrow.mk b/more_fonts/ExternalPackage_liberation_narrow.mk index 2672d75a84ad..63d3ebe397e0 100644 --- a/more_fonts/ExternalPackage_liberation_narrow.mk +++ b/more_fonts/ExternalPackage_liberation_narrow.mk @@ -7,15 +7,15 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,font_liberation_narrow_inc,font_liberation_narrow)) +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation_narrow,font_liberation_narrow)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,font_liberation_narrow_inc,pck,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,pck,\ LiberationSansNarrow-Bold.ttf \ LiberationSansNarrow-BoldItalic.ttf \ LiberationSansNarrow-Italic.ttf \ LiberationSansNarrow-Regular.ttf \ )) -$(eval $(call gb_ExternalPackage_add_unpacked_file,font_liberation_narrow_inc,pck/License_liberation_narrow.txt,License.txt)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_liberation_narrow,pck/License_liberation_narrow.txt,License.txt)) # vim: set noet sw=4 ts=4: diff --git a/more_fonts/ExternalPackage_libertineg.mk b/more_fonts/ExternalPackage_libertineg.mk index f0e8af2ef2c8..148150a14bb0 100644 --- a/more_fonts/ExternalPackage_libertineg.mk +++ b/more_fonts/ExternalPackage_libertineg.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,font_libertineg_inc,font_libertineg)) +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_libertineg,font_libertineg)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,font_libertineg_inc,pck,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,pck,\ LinBiolinum_RB_G.ttf \ LinBiolinum_RI_G.ttf \ LinBiolinum_R_G.ttf \ @@ -22,6 +22,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,font_libertineg_inc,pck,\ LinLibertine_R_G.ttf \ )) -$(eval $(call gb_ExternalPackage_add_unpacked_file,font_libertineg_inc,pck/License_libertineg.txt,OFL.txt)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_libertineg,pck/License_libertineg.txt,OFL.txt)) # vim: set noet sw=4 ts=4: diff --git a/more_fonts/ExternalPackage_opensans.mk b/more_fonts/ExternalPackage_opensans.mk index 52c2090a4826..96cec1eb9085 100644 --- a/more_fonts/ExternalPackage_opensans.mk +++ b/more_fonts/ExternalPackage_opensans.mk @@ -7,15 +7,15 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,font_opensans_inc,font_opensans)) +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opensans,font_opensans)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,font_opensans_inc,pck,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,pck,\ OpenSans-BoldItalic.ttf \ OpenSans-Bold.ttf \ OpenSans-Italic.ttf \ OpenSans-Regular.ttf \ )) -$(eval $(call gb_ExternalPackage_add_unpacked_file,font_opensans_inc,pck/License_opensans.txt,LICENSE.txt)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_opensans,pck/License_opensans.txt,LICENSE.txt)) # vim: set noet sw=4 ts=4: diff --git a/more_fonts/ExternalPackage_ptserif.mk b/more_fonts/ExternalPackage_ptserif.mk index 6dd15b90e986..b5541fff36f8 100644 --- a/more_fonts/ExternalPackage_ptserif.mk +++ b/more_fonts/ExternalPackage_ptserif.mk @@ -7,15 +7,15 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,font_ptserif_inc,font_ptserif)) +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_ptserif,font_ptserif)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,font_ptserif_inc,pck,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,pck,\ PT_Serif-Web-BoldItalic.ttf \ PT_Serif-Web-Bold.ttf \ PT_Serif-Web-Italic.ttf \ PT_Serif-Web-Regular.ttf \ )) -$(eval $(call gb_ExternalPackage_add_unpacked_file,font_ptserif_inc,pck/License_ptserif.txt,OFL.txt)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_ptserif,pck/License_ptserif.txt,OFL.txt)) # vim: set noet sw=4 ts=4: diff --git a/more_fonts/ExternalPackage_sourcecode.mk b/more_fonts/ExternalPackage_sourcecode.mk index f1b485fa41b6..52476ee9bb81 100644 --- a/more_fonts/ExternalPackage_sourcecode.mk +++ b/more_fonts/ExternalPackage_sourcecode.mk @@ -7,13 +7,13 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,font_sourcecode_inc,font_sourcecode)) +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcecode,font_sourcecode)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,font_sourcecode_inc,pck,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,pck,\ SourceCodePro-Bold.ttf \ SourceCodePro-Regular.ttf \ )) -$(eval $(call gb_ExternalPackage_add_unpacked_file,font_sourcecode_inc,pck/License_sourcecode.txt,OFL.txt)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_sourcecode,pck/License_sourcecode.txt,OFL.txt)) # vim: set noet sw=4 ts=4: diff --git a/more_fonts/ExternalPackage_sourcesans.mk b/more_fonts/ExternalPackage_sourcesans.mk index 3a88dc2f1cdf..81df839c3040 100644 --- a/more_fonts/ExternalPackage_sourcesans.mk +++ b/more_fonts/ExternalPackage_sourcesans.mk @@ -7,15 +7,15 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,font_sourcesans_inc,font_sourcesans)) +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesans)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,font_sourcesans_inc,pck,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,pck,\ SourceSansPro-BoldItalic.ttf \ SourceSansPro-Bold.ttf \ SourceSansPro-Italic.ttf \ SourceSansPro-Regular.ttf \ )) -$(eval $(call gb_ExternalPackage_add_unpacked_file,font_sourcesans_inc,pck/License_sourcesans.txt,OFL.txt)) +$(eval $(call gb_ExternalPackage_add_unpacked_file,fonts_sourcesans,pck/License_sourcesans.txt,OFL.txt)) # vim: set noet sw=4 ts=4: diff --git a/more_fonts/Package_conf.mk b/more_fonts/Package_conf.mk index d5160bfdf0b5..c6d48d09ed94 100644 --- a/more_fonts/Package_conf.mk +++ b/more_fonts/Package_conf.mk @@ -7,8 +7,8 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,more_fonts_inc,$(SRCDIR)/more_fonts/fonts)) +$(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/more_fonts/fonts)) -$(eval $(call gb_Package_add_file,more_fonts_inc,pck/fc_local.conf,fc_local.conf)) +$(eval $(call gb_Package_add_file,more_fonts_conf,pck/fc_local.conf,fc_local.conf)) # vim: set noet sw=4 ts=4: -- cgit