Mercurial Mercurial > upstream > oracle > x-cons > x-s11-update-clone / 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.
6909040 filemerge fonts broken after upgrade to nv_129 nv_132
authorAlan Coopersmith <Alan.Coopersmith@Sun.COM>
Tue, 19 Jan 2010 12:39:29 -0800
changeset 885 6c16b95e1c04
parent 884 d194a3804b81
child 886 84caa1bd7941
6909040 filemerge fonts broken after upgrade to nv_129
packages/SUNWfont-xorg-core/postinstall.tmpl file | annotate | diff | comparison | revisions
packages/SUNWfont-xorg-core/postremove file | annotate | diff | comparison | revisions
packages/SUNWfont-xorg-iso8859-1/postinstall.tmpl file | annotate | diff | comparison | revisions
packages/SUNWfont-xorg-iso8859-1/postremove file | annotate | diff | comparison | revisions 
--- a/packages/SUNWfont-xorg-core/postinstall.tmpl	Fri Jan 15 23:25:01 2010 -0800
+++ b/packages/SUNWfont-xorg-core/postinstall.tmpl	Tue Jan 19 12:39:29 2010 -0800
@@ -1,6 +1,6 @@
 ###########################################################################
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -35,12 +35,12 @@
 
 include fontcatlink
 
-make_font_catalogue_link X11/misc	misc:unscaled:pri=15
-make_font_catalogue_link X11/100dpi	100dpi:unscaled:pri=20
-make_font_catalogue_link X11/75dpi	75dpi:unscaled:pri=25
+make_font_catalogue_link X11/misc	misc:unscaled:pri=17
+make_font_catalogue_link X11/100dpi	100dpi:unscaled:pri=22
+make_font_catalogue_link X11/75dpi	75dpi:unscaled:pri=27
 make_font_catalogue_link X11/Type1	Type1:pri=45
-make_font_catalogue_link X11/misc	misc:pri=85
-make_font_catalogue_link X11/100dpi	100dpi:pri=90
-make_font_catalogue_link X11/75dpi	75dpi:pri=95
+make_font_catalogue_link X11/misc	misc:pri=87
+make_font_catalogue_link X11/100dpi	100dpi:pri=92
+make_font_catalogue_link X11/75dpi	75dpi:pri=97
 
 exit 0 
--- a/packages/SUNWfont-xorg-core/postremove	Fri Jan 15 23:25:01 2010 -0800
+++ b/packages/SUNWfont-xorg-core/postremove	Tue Jan 19 12:39:29 2010 -0800
@@ -1,6 +1,6 @@
 ###########################################################################
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -35,13 +35,23 @@
 FONTDIR=../../../usr/X11/lib/X11/fonts
 FONTPATHDIR=${BASEDIR}/../etc/X11/fontpath.d
 
+rm -f ${FONTPATHDIR}/Type1:pri=45
+
+# Links made before build 132
 rm -f ${FONTPATHDIR}/misc:unscaled:pri=15
 rm -f ${FONTPATHDIR}/100dpi:unscaled:pri=20
 rm -f ${FONTPATHDIR}/75dpi:unscaled:pri=25
 rm -f ${FONTPATHDIR}/TTF:pri=40
-rm -f ${FONTPATHDIR}/Type1:pri=45
 rm -f ${FONTPATHDIR}/misc:pri=85
 rm -f ${FONTPATHDIR}/100dpi:pri=90
 rm -f ${FONTPATHDIR}/75dpi:pri=95
 
+# Links made in builds 132 & later
+rm -f ${FONTPATHDIR}/misc:unscaled:pri=17
+rm -f ${FONTPATHDIR}/100dpi:unscaled:pri=22
+rm -f ${FONTPATHDIR}/75dpi:unscaled:pri=27
+rm -f ${FONTPATHDIR}/misc:pri=87
+rm -f ${FONTPATHDIR}/100dpi:pri=92
+rm -f ${FONTPATHDIR}/75dpi:pri=97
+
 exit 0 
--- a/packages/SUNWfont-xorg-iso8859-1/postinstall.tmpl	Fri Jan 15 23:25:01 2010 -0800
+++ b/packages/SUNWfont-xorg-iso8859-1/postinstall.tmpl	Tue Jan 19 12:39:29 2010 -0800
@@ -1,6 +1,6 @@
 ###########################################################################
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -35,11 +35,11 @@
 
 include fontcatlink
 
-make_font_catalogue_link X11/misc-ISO8859-1   misc-ISO8859-1:unscaled:pri=16
-make_font_catalogue_link X11/100dpi-ISO8859-1 100dpi-ISO8859-1:unscaled:pri=21
-make_font_catalogue_link X11/75dpi-ISO8859-1  75dpi-ISO8859-1:unscaled:pri=26
-make_font_catalogue_link X11/misc-ISO8859-1   misc-ISO8859-1:pri=86
-make_font_catalogue_link X11/100dpi-ISO8859-1 100dpi-ISO8859-1:pri=91
-make_font_catalogue_link X11/75dpi-ISO8859-1  75dpi-ISO8859-1:pri=96
+make_font_catalogue_link X11/misc-ISO8859-1   misc-ISO8859-1:unscaled:pri=15
+make_font_catalogue_link X11/100dpi-ISO8859-1 100dpi-ISO8859-1:unscaled:pri=20
+make_font_catalogue_link X11/75dpi-ISO8859-1  75dpi-ISO8859-1:unscaled:pri=25
+make_font_catalogue_link X11/misc-ISO8859-1   misc-ISO8859-1:pri=85
+make_font_catalogue_link X11/100dpi-ISO8859-1 100dpi-ISO8859-1:pri=90
+make_font_catalogue_link X11/75dpi-ISO8859-1  75dpi-ISO8859-1:pri=95
 
 exit 0 
--- a/packages/SUNWfont-xorg-iso8859-1/postremove	Fri Jan 15 23:25:01 2010 -0800
+++ b/packages/SUNWfont-xorg-iso8859-1/postremove	Tue Jan 19 12:39:29 2010 -0800
@@ -1,6 +1,6 @@
 ###########################################################################
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -35,6 +35,7 @@
 FONTDIR=../../../usr/X11/lib/X11/fonts
 FONTPATHDIR=${BASEDIR}/../etc/X11/fontpath.d
 
+# Links made before build 132
 rm -f ${FONTPATHDIR}/misc-ISO8859-1:unscaled:pri=16
 rm -f ${FONTPATHDIR}/100dpi-ISO8859-1:unscaled:pri=21
 rm -f ${FONTPATHDIR}/75dpi-ISO8859-1:unscaled:pri=26
@@ -42,4 +43,12 @@
 rm -f ${FONTPATHDIR}/100dpi-ISO8859-1:pri=91
 rm -f ${FONTPATHDIR}/75dpi-ISO8859-1:pri=96
 
+# Links made in builds 132 & later
+rm -f ${FONTPATHDIR}/misc-ISO8859-1:unscaled:pri=15
+rm -f ${FONTPATHDIR}/100dpi-ISO8859-1:unscaled:pri=20
+rm -f ${FONTPATHDIR}/75dpi-ISO8859-1:unscaled:pri=25
+rm -f ${FONTPATHDIR}/misc-ISO8859-1:pri=85
+rm -f ${FONTPATHDIR}/100dpi-ISO8859-1:pri=90
+rm -f ${FONTPATHDIR}/75dpi-ISO8859-1:pri=95
+
 exit 0
upstream/oracle/x-cons/x-s11-update-clone