r1364 - in trunk/packages: fontconfig fonts-dejavu

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Mon Jan 16 03:59:01 PST 2006


Author: alexander
Date: 2006-01-16 04:58:59 -0700 (Mon, 16 Jan 2006)
New Revision: 1364

Modified:
   trunk/packages/fontconfig/Makefile
   trunk/packages/fonts-dejavu/Makefile
Log:
Upgraded DejaVu fonts to version 2.2.


Modified: trunk/packages/fontconfig/Makefile
===================================================================
--- trunk/packages/fontconfig/Makefile	2006-01-14 11:19:37 UTC (rev 1363)
+++ trunk/packages/fontconfig/Makefile	2006-01-16 11:58:59 UTC (rev 1364)
@@ -25,9 +25,6 @@
 	make install
 	sed -i -e 's/Bitstream Vera/DejaVu/' /etc/fonts/fonts.conf
 	sed -i -e 's,^\(\t\t\t<family>Kochi.*\)$$,\1\n\t\t\t<family>AR PL New Sung</family>,' /etc/fonts/fonts.conf
-	# UGLY HACK BELOW. Remove when Greek is supported in DejaVu Sans Mono.
-	# Needed in order to avoid fallback to (ugly) FreeMono in Terminal.
-	sed -i -e '/prefer/,+2s,^\(.*Sans\) Mono\(.*$$\),&\n\1\2,' /etc/fonts/fonts.conf
 	cp $(ROOT)/etc/fonts/local.conf /etc/fonts/local.conf
 
 clean:

Modified: trunk/packages/fonts-dejavu/Makefile
===================================================================
--- trunk/packages/fonts-dejavu/Makefile	2006-01-14 11:19:37 UTC (rev 1363)
+++ trunk/packages/fonts-dejavu/Makefile	2006-01-16 11:58:59 UTC (rev 1364)
@@ -1,19 +1,14 @@
 # DejaVu fonts Makefile
 
 NM= dejavu-ttf
-VRS= 2.0
+VRS= 2.2
 DIR= $(NM)-$(VRS)
 LOCATION= /usr/share/fonts
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= http://heanet.dl.sourceforge.net/sourceforge/dejavu/$(FILE)
-SHA-$(FILE)= dd3025cf27282fb0c5b9579f5546a8c549efe874
+SHA-$(FILE)= fe40a63e3c2d0a69545662dd44e7980a3c810306
 
-# Post-release bugfix for 2.0, should be unneeded after 2.1
-FILE1= DejaVuSansMono-BoldOb.ttf
-URL-$(FILE1)= http://www.srnet.cz/~stepan/temp/.dejavu/$(FILE1)
-SHA-$(FILE1)= afcfd07ee07cf3d1d24c80e4909af83f21329be1
-
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -27,7 +22,6 @@
 
 compile-stage2:
 	cp -v ./*.ttf $(LOCATION)
-	cp -v ../$(FILE1) $(LOCATION)
 
 clean:
 	-rm -rf $(DIR)




More information about the livecd mailing list