Mercurial Mercurial > upstream > oracle > xnv / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7069938 Stop delivering 75dpi & 100dpi iso8859-16 font dirs sans fonts
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Fri, 22 Jul 2011 16:05:14 -0700
changeset 1171 d941ec5f3d1f
parent 1170 b37bd85cfb53
child 1172 4597acbe535f
7069938 Stop delivering 75dpi & 100dpi iso8859-16 font dirs sans fonts
open-src/font/Makefile.bdf file | annotate | diff | comparison | revisions
pkg/manifests/system-font-xorg-iso8859-16.p5m file | annotate | diff | comparison | revisions 
--- a/open-src/font/Makefile.bdf	Thu Jul 21 11:18:06 2011 -0700
+++ b/open-src/font/Makefile.bdf	Fri Jul 22 16:05:14 2011 -0700
@@ -1,6 +1,6 @@
 # -*- Makefile -*- rules common to most X.Org bdf/pcf font modules
 #
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -57,15 +57,15 @@
         iso8859-10      \
         iso8859-13      \
         iso8859-14      \
-        iso8859-15      \
-        iso8859-16
+        iso8859-15
 
 misc_BDF_SUBDIR_ENCODINGS = \
 	$(ALL_BDF_SUBDIR_ENCODINGS) \
         iso8859-5       \
         iso8859-7       \
         iso8859-8	\
-        iso8859-11
+        iso8859-11      \
+        iso8859-16
 100dpi_BDF_SUBDIR_ENCODINGS = $(ALL_BDF_SUBDIR_ENCODINGS)
 75dpi_BDF_SUBDIR_ENCODINGS = $(ALL_BDF_SUBDIR_ENCODINGS)
 BDF_SUBDIR_ENCODINGS = $($(FONTSUBDIR)_BDF_SUBDIR_ENCODINGS)
--- a/pkg/manifests/system-font-xorg-iso8859-16.p5m	Thu Jul 21 11:18:06 2011 -0700
+++ b/pkg/manifests/system-font-xorg-iso8859-16.p5m	Fri Jul 22 16:05:14 2011 -0700
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -30,11 +30,7 @@
 dir path=usr/share
 dir path=usr/share/fonts
 dir path=usr/share/fonts/X11
-dir path=usr/share/fonts/X11/100dpi-ISO8859-16
-dir path=usr/share/fonts/X11/75dpi-ISO8859-16
 dir path=usr/share/fonts/X11/misc-ISO8859-16
-file path=usr/share/fonts/X11/100dpi-ISO8859-16/fonts.dir
-file path=usr/share/fonts/X11/75dpi-ISO8859-16/fonts.dir
 file path=usr/share/fonts/X11/misc-ISO8859-16/10x20-ISO8859-16.pcf
 file path=usr/share/fonts/X11/misc-ISO8859-16/4x6-ISO8859-16.pcf
 file path=usr/share/fonts/X11/misc-ISO8859-16/5x7-ISO8859-16.pcf
@@ -62,14 +58,6 @@
 legacy pkg=SUNWfont-xorg-iso8859-16 \
     desc="X Window System font files based on X.Org Foundation open source release" \
     name="X.Org Foundation X11 iso8859-16 fonts"
-link path=etc/X11/fontpath.d/100dpi-ISO8859-16:pri=91 \
-    target=../../../usr/share/fonts/X11/100dpi-ISO8859-16
-link path=etc/X11/fontpath.d/100dpi-ISO8859-16:unscaled:pri=21 \
-    target=../../../usr/share/fonts/X11/100dpi-ISO8859-16
-link path=etc/X11/fontpath.d/75dpi-ISO8859-16:pri=96 \
-    target=../../../usr/share/fonts/X11/75dpi-ISO8859-16
-link path=etc/X11/fontpath.d/75dpi-ISO8859-16:unscaled:pri=26 \
-    target=../../../usr/share/fonts/X11/75dpi-ISO8859-16
 link path=etc/X11/fontpath.d/misc-ISO8859-16:pri=86 \
     target=../../../usr/share/fonts/X11/misc-ISO8859-16
 link path=etc/X11/fontpath.d/misc-ISO8859-16:unscaled:pri=16 \
upstream/oracle/xnv