--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties  2009-05-29 22:45:23.024341869 +0000
+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new  2009-05-29 22:55:13.681366890 +0000
@@ -275,73 +275,61 @@
 
 # Font File Names
 
-filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
-filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
-filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
-filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
-
-filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
-filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
-filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
-filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
-
-filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
-filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
-filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
-filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
-
-filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc
-filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc
-filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc
-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf
-
-filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
-filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
-filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf
-filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf
-filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf
-filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf
-filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf
-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
-filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
-filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf
-filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
-filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf
-
-filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf
-filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf
-filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf
-filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf
-#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
-filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf
-filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf
-filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf
-filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf
-filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf
-
-filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf
-filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf
-filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf
-filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf
-filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf
-filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf
-filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf
-filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf
-filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf
-filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf
-filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf
-filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf
-
-# AWT X11 font paths
-awtfontpath.latin-1=/usr/share/fonts/X11/Type1
-awtfontpath.umingcn=/usr/share/fonts/truetype/arphic
-awtfontpath.uminghk=/usr/share/fonts/truetype/arphic
-awtfontpath.umingtw=/usr/share/fonts/truetype/arphic
-awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic
-awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy
-awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi
-awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami
-awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
-awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
-awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
+filename.DejaVu_Sans=/usr/share/fonts/dejavu/DejaVuSans.ttf
+filename.DejaVu_Sans_Bold=/usr/share/fonts/dejavu/DejaVuSans-Bold.ttf
+filename.DejaVu_Sans_Oblique=/usr/share/fonts/dejavu/DejaVuSans-Oblique.ttf
+filename.DejaVu_Sans_Bold_Oblique=/usr/share/dejavu/TTF/DejaVuSans-BoldOblique.ttf
+
+filename.DejaVu_Sans_Mono=/usr/share/fonts/dejavu/DejaVuSansMono.ttf
+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf
+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-Oblique.ttf
+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSansMono-BoldOblique.ttf
+
+filename.DejaVu_Serif=/usr/share/fonts/dejavu/DejaVuSerif.ttf
+filename.DejaVu_Serif_Bold=/usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf
+filename.DejaVu_Serif_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-Oblique.ttf
+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/dejavu/DejaVuSerif-BoldOblique.ttf
+
+filename.AR_PL_UMing_CN=/usr/share/fonts/arphic-uming/uming.ttc
+filename.AR_PL_UMing_HK=/usr/share/fonts/arphic-uming/uming.ttc
+filename.AR_PL_UMing_TW=/usr/share/fonts/arphic-uming/uming.ttc
+filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf
+
+filename.WenQuanYi_Zen_Hei=/usr/share/fonts/wenquanyi/wqy-zenhei/wqy-zenhei.ttc
+filename.Baekmuk_Batang=/usr/share/fonts/beakmuk/batang.ttf
+filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf
+filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf
+filename.Baekmuk_Gulim=/usr/share/fonts/beakmuk/gulim.ttf
+filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf
+filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf
+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf
+filename.Sazanami_Gothic=/usr/share/fonts/sazanami/sazanami-gothic.ttf
+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf
+filename.Sazanami_Mincho=/usr/share/fonts/sazanami/sazanami-mincho.ttf
+filename.VL_Gothic=/usr/share/fonts/vlgothic/VL-Gothic-Regular.ttf
+filename.VL_PGothic=/usr/share/fonts/vlgothic/VL-PGothic-Regular.ttf
+
+filename.Lohit_Bengali=/usr/share/fonts/lohit-assamese/Lohit-Bengali.ttf
+filename.Lohit_Gujarati=/usr/share/fonts/lohit-assamese/Lohit-Gujarati.ttf
+filename.Lohit_Hindi=/usr/share/fonts/lohit-assamese/Lohit-Hindi.ttf
+filename.Lohit_Kannda=/usr/share/fonts/lohit-assamese/Lohit-Kannada.ttf
+#filename.Lohit_Malayalam=/usr/share/fonts/lohit-assamese/Lohit-Malayalam.ttf
+filename.Lohit_Oriya=/usr/share/fonts/lohit-assamese/Lohit-Oriya.ttf
+filename.Lohit_Punjabi=/usr/share/fonts/lohit-assamese/Lohit-Punjabi.ttf
+filename.Lohit_Tamil=/usr/share/fonts/lohit-assamese/Lohit-Tamil.ttf
+filename.Lohit_Telugu=/usr/share/fonts/lohit-assamese/Lohit-Telugu.ttf
+filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf
+
+filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf
+filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf
+filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf
+filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf
+filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf
+filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf
+filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf
+filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf
+filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf
+filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf
+filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf
+filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf
+ 