author | X gate hg captive account <xhg@xserver.us.oracle.com> |
Wed, 19 Aug 2015 13:48:41 -0700 | |
changeset 1484 | bc8922b8e1d2 |
parent 1068 | 0dc26c96a5af |
permissions | -rw-r--r-- |
729
d654a217cd7e
6852798 Xorg modularization: xfs 1.1.0 [LSARC 2008/009]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
1 |
############################################################################### |
d654a217cd7e
6852798 Xorg modularization: xfs 1.1.0 [LSARC 2008/009]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
2 |
# |
943
294f64612d23
6948254 Mass update of X gate sources to Oracle copyright format
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
919
diff
changeset
|
3 |
# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. |
729
d654a217cd7e
6852798 Xorg modularization: xfs 1.1.0 [LSARC 2008/009]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
4 |
# |
d654a217cd7e
6852798 Xorg modularization: xfs 1.1.0 [LSARC 2008/009]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
5 |
# Permission is hereby granted, free of charge, to any person obtaining a |
919
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
6 |
# copy of this software and associated documentation files (the "Software"), |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
7 |
# to deal in the Software without restriction, including without limitation |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
8 |
# the rights to use, copy, modify, merge, publish, distribute, sublicense, |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
9 |
# and/or sell copies of the Software, and to permit persons to whom the |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
10 |
# Software is furnished to do so, subject to the following conditions: |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
11 |
# |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
12 |
# The above copyright notice and this permission notice (including the next |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
13 |
# paragraph) shall be included in all copies or substantial portions of the |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
14 |
# Software. |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
15 |
# |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
16 |
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
17 |
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
18 |
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
19 |
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
20 |
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
21 |
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
851
diff
changeset
|
22 |
# DEALINGS IN THE SOFTWARE. |
729
d654a217cd7e
6852798 Xorg modularization: xfs 1.1.0 [LSARC 2008/009]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
23 |
# |
d654a217cd7e
6852798 Xorg modularization: xfs 1.1.0 [LSARC 2008/009]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
24 |
|
1068
0dc26c96a5af
7010624 X11R7.6 Update: Application, Utility, & Data modules [PSARC/2011/033]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
25 |
diff -urp -x '*~' -x '*.orig' config/config.cpp config/config.cpp |
0dc26c96a5af
7010624 X11R7.6 Update: Application, Utility, & Data modules [PSARC/2011/033]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
26 |
--- config/config.cpp 2010-08-06 18:40:29.000000000 -0700 |
0dc26c96a5af
7010624 X11R7.6 Update: Application, Utility, & Data modules [PSARC/2011/033]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
27 |
+++ config/config.cpp 2011-01-28 18:01:17.331211005 -0800 |
729
d654a217cd7e
6852798 Xorg modularization: xfs 1.1.0 [LSARC 2008/009]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
28 |
@@ -1,6 +1,13 @@ |
1068
0dc26c96a5af
7010624 X11R7.6 Update: Application, Utility, & Data modules [PSARC/2011/033]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
29 |
# X font server configuration file |
0dc26c96a5af
7010624 X11R7.6 Update: Application, Utility, & Data modules [PSARC/2011/033]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
30 |
# See xfs(__appmansuffix__) man page for more information. |
729
d654a217cd7e
6852798 Xorg modularization: xfs 1.1.0 [LSARC 2008/009]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
31 |
|
851
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
729
diff
changeset
|
32 |
+XCOMM DO NOT EDIT /usr/lib/X11/fs/config directly. |
729
d654a217cd7e
6852798 Xorg modularization: xfs 1.1.0 [LSARC 2008/009]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
33 |
+XCOMM |
851
d428083dbbdd
6905171 X11R7.5 / Xorg 1.7.3 integration
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
729
diff
changeset
|
34 |
+XCOMM /usr/lib/X11/fs/config is a factory-default file and will |
729
d654a217cd7e
6852798 Xorg modularization: xfs 1.1.0 [LSARC 2008/009]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
35 |
+XCOMM be unconditionally overwritten upon subsequent installation. |
d654a217cd7e
6852798 Xorg modularization: xfs 1.1.0 [LSARC 2008/009]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
36 |
+XCOMM Before making changes to the file, copy it to the system configuration |
d654a217cd7e
6852798 Xorg modularization: xfs 1.1.0 [LSARC 2008/009]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
37 |
+XCOMM location, /etc/X11/fs/config and edit it there. |
d654a217cd7e
6852798 Xorg modularization: xfs 1.1.0 [LSARC 2008/009]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
38 |
+ |
d654a217cd7e
6852798 Xorg modularization: xfs 1.1.0 [LSARC 2008/009]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
39 |
clone-self = on |
d654a217cd7e
6852798 Xorg modularization: xfs 1.1.0 [LSARC 2008/009]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
40 |
use-syslog = off |
d654a217cd7e
6852798 Xorg modularization: xfs 1.1.0 [LSARC 2008/009]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
41 |
catalogue = DEFAULTFONTPATH |