Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-baseXORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGE

9 files changed, 17 insertions, 12 deletions

diff --git a/data.h b/data.h
index e006271..326cf85 100644
--- a/data.h
+++ b/data.h
@@ -19,7 +19,7 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-/* $XFree86: xc/programs/mkfontscale/data.h,v 1.4 2003/07/08 15:39:49 tsi Exp $ */
+/* $XFree86: xc/programs/mkfontscale/data.h,v 1.3 2003/04/30 20:39:43 herrb Exp $ */
 
 #ifndef _MKS_DATA_H_
 #define _MKS_DATA_H_ 1
@@ -39,6 +39,7 @@ char *notice_foundries[][2] =
      {"International Typeface Corporation", "itc"},
      {"Tiro Typeworks", "tiro"},
      {"XFree86", "xfree86"},
+     {"Xorg", "xorg"},
      {"Microsoft", "microsoft"},
      {"Omega", "omega"},
      {"Font21", "hwan"},
diff --git a/hash.c b/hash.c
index 97d1f1b..36c95a9 100644
--- a/hash.c
+++ b/hash.c
@@ -19,7 +19,7 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-/* $XFree86: xc/programs/mkfontscale/hash.c,v 1.3 2003/07/08 15:39:49 tsi Exp $ */
+/* $XFree86$ */
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/hash.h b/hash.h
index d8dcf4d..a2ed339 100644
--- a/hash.h
+++ b/hash.h
@@ -19,7 +19,7 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-/* $XFree86: xc/programs/mkfontscale/hash.h,v 1.3 2003/07/08 15:39:49 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _MKS_HASH_H_
 #define _MKS_HASH_H_ 1
diff --git a/ident.c b/ident.c
index cfbe6c1..18402d2 100644
--- a/ident.c
+++ b/ident.c
@@ -19,7 +19,7 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-/* $XFree86: xc/programs/mkfontscale/ident.c,v 1.4 2003/10/24 20:38:13 tsi Exp $ */
+/* $XFree86: xc/programs/mkfontscale/ident.c,v 1.3tsi Exp $ */
 
 /* The function identifyBitmap returns -1 if filename is definitively not
    a font file, 1 if it is a single-face bitmap font with a XLFD name,
diff --git a/ident.h b/ident.h
index ebe5866..03933a3 100644
--- a/ident.h
+++ b/ident.h
@@ -20,7 +20,7 @@
   THE SOFTWARE.
 */
 
-/* $XFree86: xc/programs/mkfontscale/ident.h,v 1.2 2003/07/08 15:39:49 tsi Exp $ */
+/* $XFree86$ */
 
 #ifndef _MKS_IDENT_H_
 #define _MKS_IDENT_H_ 1
diff --git a/list.c b/list.c
index ff33a0e..2f5bc2b 100644
--- a/list.c
+++ b/list.c
@@ -19,7 +19,7 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-/* $XFree86: xc/programs/mkfontscale/list.c,v 1.6 2003/07/08 15:39:49 tsi Exp $ */
+/* $XFree86: xc/programs/mkfontscale/list.c,v 1.5 2003/07/04 16:24:30 eich Exp $ */
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/list.h b/list.h
index 6c1ed35..68fa35f 100644
--- a/list.h
+++ b/list.h
@@ -19,7 +19,7 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-/* $XFree86: xc/programs/mkfontscale/list.h,v 1.3 2003/07/08 15:39:49 tsi Exp $ */
+/* $XFree86: xc/programs/mkfontscale/list.h,v 1.2 2003/06/20 15:49:52 eich Exp $ */
 
 #ifndef _MKS_LIST_H_
 #define _MKS_LIST_H_ 1
diff --git a/mkfontscale.c b/mkfontscale.c
index 989cf4c..721a6a9 100644
--- a/mkfontscale.c
+++ b/mkfontscale.c
@@ -19,7 +19,8 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-/* $XFree86: xc/programs/mkfontscale/mkfontscale.c,v 1.22 2003/12/19 02:05:39 dawes Exp $ */
+/* $XdotOrg: xc/programs/mkfontscale/mkfontscale.c,v 1.1.4.4 2004/03/05 13:41:16 eich Exp $ */
+/* $XFree86: xc/programs/mkfontscale/mkfontscale.c,v 1.21 2003/12/10 02:58:07 dawes Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -69,10 +70,11 @@ char *encodings_array[] =
       "iso8859-15", "iso8859-16",
       "ansi-1251", "koi8-r", "koi8-u", "koi8-ru", "koi8-e", "koi8-uni",
       "tis620-2",
-      "sun.unicode.india-0",
+      "sun.unicode.india-0", "suneu-greek",
       "adobe-standard", "adobe-symbol",
       "ibm-cp437", "ibm-cp850", "ibm-cp852", "ibm-cp866", "microsoft-cp1252",
       /* But not "adobe-dingbats", as it uses generic glyph names. */
+      "cns11643-1", "cns11643-2", "cns11643-3",
       "jisx0201.1976-0", "jisx0208.1983-0", "jisx0208.1990-0",
       "jisx0212.1990-0", "big5-0", "big5.eten-0", "big5hkscs-0",
       "gb2312.1980-0", "gb18030.2000-0", "gb18030.2000-1",
diff --git a/mkfontscale.man b/mkfontscale.man
index 5882a97..6cb3b9f 100644
--- a/mkfontscale.man
+++ b/mkfontscale.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/mkfontscale/mkfontscale.man,v 1.5 2003/07/04 16:24:30 eich Exp $
+.\" $XFree86: xc/programs/mkfontscale/mkfontscale.man,v 1.4 2003/06/20 15:49:52 eich Exp $
 .\"
 .TH MKFONTSCALE 1 __vendorversion__
 .SH NAME
@@ -144,8 +144,10 @@ file even if it has been hand-edited.
 is equivalent to
 .BR mkfontdir .
 .SH AUTHOR
-.B Mkfontscale
-was written by Juliusz Chroboczek <jch@xfree86.org> for the XFree86
+The version of
+.B mkfontscale
+included in this X.Org Foundataion release 
+was originally written by Juliusz Chroboczek <jch@xfree86.org> for the XFree86
 project.  The functionality of this program was inspired by the
 .B ttmkfdir
 utility by Joerg Pommnitz.