libxfont: Changes to 'upstream-unstable'
.gitignore | 74 ++++++++++++++++++++++++++++++++++---------
COPYING | 71 ++++++++++++-----------------------------
Makefile.am | 33 ++++---------------
configure.ac | 38 ++++++++--------------
doc/.gitignore | 6 +++
doc/Makefile.am | 66 ++++++++++++++++++++++++++++++++++++++
doc/fontlib.css | 46 --------------------------
doc/fontlib.xml | 1
doc/fontlib.xsl | 38 ----------------------
include/X11/fonts/.gitignore | 2 +
include/X11/fonts/bdfint.h | 3 -
include/X11/fonts/bitmap.h | 3 -
include/X11/fonts/bufio.h | 3 -
include/X11/fonts/fntfil.h | 3 -
include/X11/fonts/fntfilio.h | 3 -
include/X11/fonts/fntfilst.h | 3 -
include/X11/fonts/fontencc.h | 1
include/X11/fonts/fontmisc.h | 1
include/X11/fonts/fontshow.h | 2 -
include/X11/fonts/fontutil.h | 2 -
include/X11/fonts/fontxlfd.h | 3 -
include/X11/fonts/pcf.h | 3 -
src/FreeType/ft.h | 8 +---
src/FreeType/ftenc.c | 1
src/FreeType/ftfuncs.c | 27 ++++-----------
src/FreeType/ftfuncs.h | 1
src/FreeType/fttools.c | 2 -
src/FreeType/xttcap.c | 1
src/FreeType/xttcap.h | 1
src/Makefile.am | 2 -
src/bitmap/bdfread.c | 3 -
src/bitmap/bdfutils.c | 2 -
src/bitmap/bitmap.c | 3 -
src/bitmap/bitmapfunc.c | 4 --
src/bitmap/bitmaputil.c | 3 -
src/bitmap/bitscale.c | 1
src/bitmap/fontink.c | 3 -
src/bitmap/pcfread.c | 1
src/bitmap/pcfwrite.c | 2 -
src/bitmap/snfread.c | 2 -
src/bitmap/snfstr.h | 2 -
src/builtins/builtin.h | 2 -
src/builtins/file.c | 3 -
src/builtins/fonts.c | 3 -
src/builtins/fpe.c | 4 --
src/builtins/render.c | 4 --
src/fc/fsconvert.c | 2 -
src/fc/fserve.c | 3 -
src/fc/fserve.h | 2 -
src/fc/fservestr.h | 2 -
src/fc/fsio.c | 2 -
src/fc/fsio.h | 2 -
src/fc/fslibos.h | 2 -
src/fontfile/bitsource.c | 3 -
src/fontfile/bufio.c | 3 -
src/fontfile/bunzip2.c | 41 ++++++++++-------------
src/fontfile/decompress.c | 2 -
src/fontfile/defaults.c | 3 -
src/fontfile/dirfile.c | 3 -
src/fontfile/fileio.c | 3 -
src/fontfile/filewr.c | 3 -
src/fontfile/fontdir.c | 4 --
src/fontfile/fontencc.c | 1
src/fontfile/fontfile.c | 5 --
src/fontfile/fontscale.c | 3 -
src/fontfile/gunzip.c | 2 -
src/fontfile/renderers.c | 1
src/stubs/stubs.h | 16 +++++++--
src/util/atom.c | 3 -
src/util/fontaccel.c | 3 -
src/util/fontnames.c | 4 --
src/util/fontutil.c | 3 -
src/util/fontxlfd.c | 3 -
src/util/format.c | 2 -
src/util/miscutil.c | 12 +++++-
src/util/patcache.c | 3 -
src/util/private.c | 3 -
src/util/utilbitmap.c | 1
xfont.pc.in | 2 -
79 files changed, 229 insertions(+), 408 deletions(-)
New commits:
commit 12157fbebc35c2d039df2df4fc5ac2b299eeec03
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 28 20:43:27 2010 -0700
libXfont 1.4.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 46fe9f7..8389dfc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
AC_INIT([libXfont],
- 1.4.2,
+ [1.4.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXfont)
# Autoheader generates config.h.in. No new lines allowed in the list.
commit f29f1d68d7eca96e45ba3758686be07993d82e03
Author: Jesse Adkins <jesserayadkins@gmail.com>
Date: Tue Sep 28 13:30:02 2010 -0700
Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/doc/fontlib.xml b/doc/fontlib.xml
index 8b7245e..f2e4811 100644
--- a/doc/fontlib.xml
+++ b/doc/fontlib.xml
@@ -6,7 +6,6 @@
<article id='fontlibms'>
<!-- .ps 12 -->
-<!-- $Xorg: fontlib.ms,v 1.3 2000/08/17 19:42:42 cpqbld Exp $ -->
<!-- .EF 'Font Library Interface'\- % \-'July 27, 1991' -->
<!-- .OF 'Font Library Interface'\- % \-'July 27, 1991' -->
<!-- .EH '''' -->
diff --git a/include/X11/fonts/bdfint.h b/include/X11/fonts/bdfint.h
index d41c4a5..913f660 100644
--- a/include/X11/fonts/bdfint.h
+++ b/include/X11/fonts/bdfint.h
@@ -1,5 +1,3 @@
-/* $Xorg: bdfint.h,v 1.4 2001/02/09 02:04:01 xorgcvs Exp $ */
-
/*
Copyright 1990, 1998 The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/bdfint.h,v 1.4 2001/01/17 19:43:26 dawes Exp $ */
#ifndef BDFINT_H
#define BDFINT_H
diff --git a/include/X11/fonts/bitmap.h b/include/X11/fonts/bitmap.h
index 9b170a9..c023427 100644
--- a/include/X11/fonts/bitmap.h
+++ b/include/X11/fonts/bitmap.h
@@ -1,5 +1,3 @@
-/* $Xorg: bitmap.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
/*
Copyright 1990, 1998 The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/include/bitmap.h,v 1.9 2001/01/17 19:43:31 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/bufio.h b/include/X11/fonts/bufio.h
index f8e5815..e7a9f4a 100644
--- a/include/X11/fonts/bufio.h
+++ b/include/X11/fonts/bufio.h
@@ -1,5 +1,3 @@
-/* $Xorg: bufio.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
/*
Copyright 1993, 1998 The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/include/bufio.h,v 1.6 2001/07/31 16:44:55 alanh Exp $ */
#ifndef ___BUFIO_H___
#define ___BUFIO_H___ 1
diff --git a/include/X11/fonts/fntfil.h b/include/X11/fonts/fntfil.h
index 074f2d0..25d1f30 100644
--- a/include/X11/fonts/fntfil.h
+++ b/include/X11/fonts/fntfil.h
@@ -1,5 +1,3 @@
-/* $Xorg: fntfil.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
/*
Copyright 1991, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/include/fntfil.h,v 1.9 2001/12/14 19:56:54 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/fntfilio.h b/include/X11/fonts/fntfilio.h
index f8e24f3..3a8f4ca 100644
--- a/include/X11/fonts/fntfilio.h
+++ b/include/X11/fonts/fntfilio.h
@@ -1,5 +1,3 @@
-/* $Xorg: fntfilio.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
/*
Copyright 1991, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/include/fntfilio.h,v 1.6 2001/10/31 22:50:26 tsi Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/fntfilst.h b/include/X11/fonts/fntfilst.h
index 407c4cf..29e0a56 100644
--- a/include/X11/fonts/fntfilst.h
+++ b/include/X11/fonts/fntfilst.h
@@ -1,5 +1,3 @@
-/* $Xorg: fntfilst.h,v 1.5 2001/02/09 02:04:04 xorgcvs Exp $ */
-
/*
Copyright 1991, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/include/fntfilst.h,v 3.8 2002/12/09 17:30:00 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/fontencc.h b/include/X11/fonts/fontencc.h
index 51e0e14..987cbfb 100644
--- a/include/X11/fonts/fontencc.h
+++ b/include/X11/fonts/fontencc.h
@@ -19,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $XFree86$ */
/* Binary compatibility entry points. */
diff --git a/include/X11/fonts/fontmisc.h b/include/X11/fonts/fontmisc.h
index ed5fd19..cd9d52a 100644
--- a/include/X11/fonts/fontmisc.h
+++ b/include/X11/fonts/fontmisc.h
@@ -23,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/include/fontmisc.h,v 3.16 2001/12/14 19:56:54 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/fontshow.h b/include/X11/fonts/fontshow.h
index 5bb48fe..126cab6 100644
--- a/include/X11/fonts/fontshow.h
+++ b/include/X11/fonts/fontshow.h
@@ -1,5 +1,3 @@
-/* $Xorg: fontshow.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
/*
Copyright 1990, 1998 The Open Group
diff --git a/include/X11/fonts/fontutil.h b/include/X11/fonts/fontutil.h
index 9a73eaa..71d507b 100644
--- a/include/X11/fonts/fontutil.h
+++ b/include/X11/fonts/fontutil.h
@@ -1,5 +1,3 @@
-/* $XFree86: xc/lib/font/include/fontutil.h,v 1.1 1999/03/14 11:17:49 dawes Exp $ */
-
#ifndef _FONTUTIL_H_
#define _FONTUTIL_H_
diff --git a/include/X11/fonts/fontxlfd.h b/include/X11/fonts/fontxlfd.h
index e87b931..3555706 100644
--- a/include/X11/fonts/fontxlfd.h
+++ b/include/X11/fonts/fontxlfd.h
@@ -1,5 +1,3 @@
-/* $Xorg: fontxlfd.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */
-
/*
Copyright 1990, 1994, 1998 The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/include/fontxlfd.h,v 1.5 2001/01/17 19:43:32 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/include/X11/fonts/pcf.h b/include/X11/fonts/pcf.h
index 34bdf7b..a5fdbcd 100644
--- a/include/X11/fonts/pcf.h
+++ b/include/X11/fonts/pcf.h
@@ -1,5 +1,3 @@
-/* $Xorg: pcf.h,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */
-
/*
Copyright 1991, 1998 The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.4 2001/12/14 19:56:47 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/src/FreeType/ft.h b/src/FreeType/ft.h
index a5fba76..8cf31d4 100644
--- a/src/FreeType/ft.h
+++ b/src/FreeType/ft.h
@@ -21,8 +21,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $XFree86: xc/lib/font/FreeType/ft.h,v 1.22 2003/06/08 15:41:13 herrb Exp $ */
-
#ifndef _FT_H_
#define _FT_H_
diff --git a/src/FreeType/ftenc.c b/src/FreeType/ftenc.c
index 27964b0..99defbe 100644
--- a/src/FreeType/ftenc.c
+++ b/src/FreeType/ftenc.c
@@ -19,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $XFree86: xc/lib/font/FreeType/ftenc.c,v 1.24 2003/10/19 18:53:49 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c
index 6dc3f4e..fd8e53e 100644
--- a/src/FreeType/ftfuncs.c
+++ b/src/FreeType/ftfuncs.c
@@ -25,9 +25,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $XdotOrg: xc/lib/font/FreeType/ftfuncs.c,v 1.11 2005/07/03 07:00:58 daniels Exp $ */
-
-/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.43 2004/02/07 04:37:18 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/FreeType/ftfuncs.h b/src/FreeType/ftfuncs.h
index e522dde..068a595 100644
--- a/src/FreeType/ftfuncs.h
+++ b/src/FreeType/ftfuncs.h
@@ -20,7 +20,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $XFree86: xc/lib/font/FreeType/ftfuncs.h,v 1.17 2003/12/21 04:02:07 dawes Exp $ */
/* Number of buckets in the hashtable holding faces */
#define NUMFACEBUCKETS 32
diff --git a/src/FreeType/fttools.c b/src/FreeType/fttools.c
index 7277273..bc75b7e 100644
--- a/src/FreeType/fttools.c
+++ b/src/FreeType/fttools.c
@@ -21,8 +21,6 @@
THE SOFTWARE.
*/
-/* $XFree86: xc/lib/font/FreeType/fttools.c,v 1.6 2003/06/08 15:41:13 herrb Exp $ */
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/src/FreeType/xttcap.c b/src/FreeType/xttcap.c
index 89e092b..c2a4120 100644
--- a/src/FreeType/xttcap.c
+++ b/src/FreeType/xttcap.c
@@ -30,7 +30,6 @@
Notice===
*/
-/* $XFree86: xc/lib/font/FreeType/xttcap.c,v 1.1 2003/10/19 18:53:50 dawes Exp $ */
/*
#include "xttversion.h"
diff --git a/src/FreeType/xttcap.h b/src/FreeType/xttcap.h
index e91e523..6a09cf6 100644
--- a/src/FreeType/xttcap.h
+++ b/src/FreeType/xttcap.h
@@ -30,7 +30,6 @@
Notice===
*/
-/* $XFree86: xc/extras/X-TrueType/xttcap.h,v 1.2 2001/08/01 00:44:33 tsi Exp $ */
#ifndef _XTTCAP_H_
#define _XTTCAP_H_ (1)
diff --git a/src/bitmap/bdfread.c b/src/bitmap/bdfread.c
index 0835653..2464c03 100644
--- a/src/bitmap/bdfread.c
+++ b/src/bitmap/bdfread.c
@@ -1,5 +1,3 @@
-/* $Xorg: bdfread.c,v 1.5 2001/02/09 02:04:01 xorgcvs Exp $ */
-
/************************************************************************
Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -50,7 +48,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/bdfread.c,v 1.12tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/bitmap/bdfutils.c b/src/bitmap/bdfutils.c
index 17596c3..1d6cc72 100644
--- a/src/bitmap/bdfutils.c
+++ b/src/bitmap/bdfutils.c
@@ -1,4 +1,3 @@
-/* $Xorg: bdfutils.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */
/************************************************************************
Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -49,7 +48,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/bdfutils.c,v 1.10 2001/12/14 19:56:45 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/bitmap/bitmap.c b/src/bitmap/bitmap.c
index d238f4d..1ceb4bb 100644
--- a/src/bitmap/bitmap.c
+++ b/src/bitmap/bitmap.c
@@ -1,5 +1,3 @@
-/* $Xorg: bitmap.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */
-
/*
Copyright 1991, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/bitmap.c,v 1.6 2001/01/17 19:43:27 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/src/bitmap/bitmapfunc.c b/src/bitmap/bitmapfunc.c
index 80d7da1..47ce488 100644
--- a/src/bitmap/bitmapfunc.c
+++ b/src/bitmap/bitmapfunc.c
@@ -1,5 +1,3 @@
-/* $Xorg: bitmapfunc.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */
-
/*
Copyright 1991, 1998 The Open Group
@@ -26,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/bitmapfunc.c,v 3.17 2002/09/19 13:21:58 tsi Exp $ */
-
/*
* Author: Keith Packard, MIT X Consortium
*/
diff --git a/src/bitmap/bitmaputil.c b/src/bitmap/bitmaputil.c
index 3a7bbc7..0a1c87e 100644
--- a/src/bitmap/bitmaputil.c
+++ b/src/bitmap/bitmaputil.c
@@ -1,5 +1,3 @@
-/* $Xorg: bitmaputil.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */
-
/*
Copyright 1990, 1994, 1998 The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/bitmaputil.c,v 1.10 2002/09/24 20:52:48 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/bitmap/bitscale.c b/src/bitmap/bitscale.c
index a4d991d..cf16bff 100644
--- a/src/bitmap/bitscale.c
+++ b/src/bitmap/bitscale.c
@@ -25,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/bitscale.c,v 3.29tsi Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/src/bitmap/fontink.c b/src/bitmap/fontink.c
index a9606f0..ad7091f 100644
--- a/src/bitmap/fontink.c
+++ b/src/bitmap/fontink.c
@@ -1,5 +1,3 @@
-/* $Xorg: fontink.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */
-
/*
Copyright 1990, 1998 The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/fontink.c,v 1.6 2001/01/17 19:43:27 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c
index 182144a..32f9856 100644
--- a/src/bitmap/pcfread.c
+++ b/src/bitmap/pcfread.c
@@ -25,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/pcfread.c,v 1.21 2003/11/17 22:20:22 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/src/bitmap/pcfwrite.c b/src/bitmap/pcfwrite.c
index 5d1aab1..3ac07b3 100644
--- a/src/bitmap/pcfwrite.c
+++ b/src/bitmap/pcfwrite.c
@@ -1,4 +1,3 @@
-/* $Xorg: pcfwrite.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */
/*
Copyright 1990, 1994, 1998 The Open Group
@@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/pcfwrite.c,v 1.11 2003/11/17 22:20:22 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/src/bitmap/snfread.c b/src/bitmap/snfread.c
index 53a72da..d003cc5 100644
--- a/src/bitmap/snfread.c
+++ b/src/bitmap/snfread.c
@@ -1,4 +1,3 @@
-/* $Xorg: snfread.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */
/************************************************************************
Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -49,7 +48,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/snfread.c,v 1.12 2003/11/17 22:20:22 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/bitmap/snfstr.h b/src/bitmap/snfstr.h
index 531b19c..148bb1f 100644
--- a/src/bitmap/snfstr.h
+++ b/src/bitmap/snfstr.h
@@ -1,4 +1,3 @@
-/* $Xorg: snfstr.h,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */
/***********************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -49,7 +48,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/snfstr.h,v 1.5 2001/12/14 19:56:47 dawes Exp $ */
#ifndef SNFSTR_H
#define SNFSTR_H 1
diff --git a/src/builtins/builtin.h b/src/builtins/builtin.h
index f12f9b0..418bfe9 100644
--- a/src/builtins/builtin.h
+++ b/src/builtins/builtin.h
@@ -1,5 +1,4 @@
/*
- * Id: builtin.h,v 1.2 1999/11/02 06:16:47 keithp Exp $
*
* Copyright 1999 SuSE, Inc.
*
@@ -22,7 +21,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $XFree86: xc/lib/font/builtins/builtin.h,v 1.3 1999/12/30 02:29:49 robin Exp $ */
#include <X11/Xdefs.h>
#include <X11/fonts/font.h>
diff --git a/src/builtins/file.c b/src/builtins/file.c
index f08f67f..5492539 100644
--- a/src/builtins/file.c
+++ b/src/builtins/file.c
@@ -1,6 +1,4 @@
/*
- * Id: file.c,v 1.2 1999/11/02 06:16:47 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $XFree86: xc/lib/font/builtins/file.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/builtins/fonts.c b/src/builtins/fonts.c
index ef5f5ef..9a9d7d2 100644
--- a/src/builtins/fonts.c
+++ b/src/builtins/fonts.c
@@ -1,6 +1,4 @@
/*
- * Id: fonts.c,v 1.2 1999/11/02 06:16:47 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -22,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $XFree86: xc/lib/font/builtins/fonts.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/builtins/fpe.c b/src/builtins/fpe.c
index 5fce45b..403dbb7 100644
--- a/src/builtins/fpe.c
+++ b/src/builtins/fpe.c
@@ -1,7 +1,4 @@
-/* $XdotOrg: $ */
/*
- * Id: fpe.c,v 1.2 1999/11/02 06:16:48 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $XFree86: xc/lib/font/builtins/fpe.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/builtins/render.c b/src/builtins/render.c
index 52c24b9..4d10483 100644
--- a/src/builtins/render.c
+++ b/src/builtins/render.c
@@ -1,7 +1,4 @@
-/* $XdotOrg: $ */
/*
- * Id: render.c,v 1.2 1999/11/02 06:16:48 keithp Exp $
- *
* Copyright 1999 SuSE, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,7 +20,6 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $XFree86: xc/lib/font/builtins/render.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/fc/fsconvert.c b/src/fc/fsconvert.c
index 724bc5f..15c5e42 100644
--- a/src/fc/fsconvert.c
+++ b/src/fc/fsconvert.c
@@ -1,4 +1,3 @@
-/* $Xorg: fsconvert.c,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */
/*
* Copyright 1990 Network Computing Devices
*
@@ -22,7 +21,6 @@
*
* Author: Dave Lemke, Network Computing Devices, Inc
*/
-/* $XFree86: xc/lib/font/fc/fsconvert.c,v 1.14 2003/08/30 18:06:29 dawes Exp $ */
/*
* FS data conversion
*/
diff --git a/src/fc/fserve.c b/src/fc/fserve.c
index 2ba08e8..b02b0b7 100644
--- a/src/fc/fserve.c
+++ b/src/fc/fserve.c
@@ -1,5 +1,3 @@
-/* $XdotOrg: lib/Xfont/src/fc/fserve.c,v 1.8 2005/07/09 06:36:12 keithp Exp $ */
-/* $Xorg: fserve.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */
/*
Copyright 1990, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/fc/fserve.c,v 3.26tsi Exp $ */
/*
* Copyright 1990 Network Computing Devices
diff --git a/src/fc/fserve.h b/src/fc/fserve.h
index 3b08526..5999861 100644
--- a/src/fc/fserve.h
+++ b/src/fc/fserve.h
@@ -1,4 +1,3 @@
-/* $Xorg: fserve.h,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */
/*
* Copyright 1990 Network Computing Devices
*
@@ -24,7 +23,6 @@
* Author: Dave Lemke, Network Computing Devices, Inc
*
*/
-/* $XFree86: xc/lib/font/fc/fserve.h,v 1.4 2001/01/17 19:43:29 dawes Exp $ */
#ifndef _FSERVE_H_
#define _FSERVE_H_
diff --git a/src/fc/fservestr.h b/src/fc/fservestr.h
index 1993de8..a6d0d1d 100644
--- a/src/fc/fservestr.h
+++ b/src/fc/fservestr.h
@@ -1,4 +1,3 @@
-/* $Xorg: fservestr.h,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */
/*
* Copyright 1990 Network Computing Devices
*
@@ -23,7 +22,6 @@
*
* Author: Dave Lemke, Network Computing Devices, Inc
*/
-/* $XFree86: xc/lib/font/fc/fservestr.h,v 3.3 2001/01/17 19:43:29 dawes Exp $ */
#ifndef _FSERVESTR_H_
#define _FSERVESTR_H_
diff --git a/src/fc/fsio.c b/src/fc/fsio.c
index 79dc0d6..63d3b4f 100644
--- a/src/fc/fsio.c
+++ b/src/fc/fsio.c
@@ -1,4 +1,3 @@
-/* $Xorg: fsio.c,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */
/*
* Copyright 1990 Network Computing Devices
*
@@ -23,7 +22,6 @@
*
* Author: Dave Lemke, Network Computing Devices, Inc
*/
-/* $XFree86: xc/lib/font/fc/fsio.c,v 3.16tsi Exp $ */
/*
* font server i/o routines
*/
diff --git a/src/fc/fsio.h b/src/fc/fsio.h
index 1454b44..bd0c621 100644
--- a/src/fc/fsio.h
+++ b/src/fc/fsio.h
@@ -1,4 +1,3 @@
-/* $Xorg: fsio.h,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */
/*
* Copyright 1990 Network Computing Devices
*
@@ -23,7 +22,6 @@
*
* Author: Dave Lemke, Network Computing Devices, Inc
*/
-/* $XFree86: xc/lib/font/fc/fsio.h,v 1.5 1999/12/30 02:39:06 robin Exp $ */
#ifndef _FSIO_H_
#define _FSIO_H_
diff --git a/src/fc/fslibos.h b/src/fc/fslibos.h
index 65c440c..c49f52e 100644
--- a/src/fc/fslibos.h
+++ b/src/fc/fslibos.h
@@ -1,4 +1,3 @@
-/* $Xorg: fslibos.h,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
/*
* Copyright 1990 Network Computing Devices;
* Portions Copyright 1987 by Digital Equipment Corporation
@@ -31,7 +30,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.8 2003/08/29 18:01:14 herrb Exp $ */
/*
* FSlib networking & os include file
diff --git a/src/fontfile/bitsource.c b/src/fontfile/bitsource.c
index d828ce8..1b79c2b 100644
--- a/src/fontfile/bitsource.c
+++ b/src/fontfile/bitsource.c
@@ -1,5 +1,3 @@
-/* $Xorg: bitsource.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
/*
Copyright 1991, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/fontfile/bitsource.c,v 1.3 2001/01/17 19:43:29 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/src/fontfile/bufio.c b/src/fontfile/bufio.c
index dd8d6e2..34b7f36 100644
--- a/src/fontfile/bufio.c
+++ b/src/fontfile/bufio.c
@@ -1,5 +1,3 @@
-/* $Xorg: bufio.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
/*
Copyright 1991, 1998 The Open Group
@@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/fontfile/bufio.c,v 3.9 2001/12/14 19:56:50 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/src/fontfile/decompress.c b/src/fontfile/decompress.c
index cdfb492..b1fc37b 100644
--- a/src/fontfile/decompress.c
+++ b/src/fontfile/decompress.c
@@ -1,4 +1,3 @@
-/* $Xorg: decompress.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
/*
* Copyright 1985, 1986 The Regents of the University of California.
* All rights reserved.
@@ -45,7 +44,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/fontfile/decompress.c,v 1.4 2001/01/17 19:43:29 dawes Exp $ */
/*
* decompress - cat a compressed file
*/
diff --git a/src/fontfile/defaults.c b/src/fontfile/defaults.c
index 7f20cab..1ad7d7c 100644
--- a/src/fontfile/defaults.c
+++ b/src/fontfile/defaults.c
@@ -1,5 +1,3 @@
-/* $Xorg: defaults.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
/*
Copyright 1990, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/fontfile/defaults.c,v 1.7 2001/01/17 19:43:29 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/src/fontfile/dirfile.c b/src/fontfile/dirfile.c
index 588464f..c8aff6f 100644
--- a/src/fontfile/dirfile.c
+++ b/src/fontfile/dirfile.c
@@ -1,5 +1,3 @@
-/* $Xorg: dirfile.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
/*
Copyright 1991, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/fontfile/dirfile.c,v 3.17 2004/02/08 01:52:27 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/src/fontfile/fileio.c b/src/fontfile/fileio.c
index 3e2f98a..80af511 100644
--- a/src/fontfile/fileio.c
+++ b/src/fontfile/fileio.c
@@ -1,5 +1,3 @@
-/* $Xorg: fileio.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
/*
Copyright 1991, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/fontfile/fileio.c,v 3.9 2001/12/14 19:56:51 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/src/fontfile/filewr.c b/src/fontfile/filewr.c
index f9c53a2..bcc7b1e 100644
--- a/src/fontfile/filewr.c
+++ b/src/fontfile/filewr.c
@@ -1,5 +1,3 @@
-/* $Xorg: filewr.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
/*
Copyright 1991, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/fontfile/filewr.c,v 3.6 2001/12/14 19:56:51 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c
index 70f1b0f..e052bb3 100644
--- a/src/fontfile/fontdir.c
+++ b/src/fontfile/fontdir.c
@@ -1,6 +1,3 @@
-/* $XdotOrg: xc/lib/font/fontfile/fontdir.c,v 1.4 2005/07/03 07:01:00 daniels Exp $ */
-/* $Xorg: fontdir.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
/*
Copyright 1991, 1998 The Open Group
@@ -26,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/fontfile/fontdir.c,v 3.22 2003/07/07 16:40:11 eich Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/src/fontfile/fontencc.c b/src/fontfile/fontencc.c
index b54079a..7997785 100644
--- a/src/fontfile/fontencc.c
+++ b/src/fontfile/fontencc.c
@@ -19,7 +19,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $XFree86: xc/lib/font/fontfile/fontencc.c,v 1.1 2001/08/13 21:46:47 dawes Exp $ */
/* Binary compatibility code. */
diff --git a/src/fontfile/fontfile.c b/src/fontfile/fontfile.c
index a738c4d..eb37a87 100644
--- a/src/fontfile/fontfile.c
+++ b/src/fontfile/fontfile.c
@@ -1,6 +1,3 @@
-/* $XdotOrg: xc/lib/font/fontfile/fontfile.c,v 1.4 2005/07/03 07:01:00 daniels Exp $ */
-/* $Xorg: fontfile.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
-
/*
Copyright 1991, 1998 The Open Group
@@ -26,12 +23,10 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/fontfile/fontfile.c,v 3.21 2003/12/02 19:50:40 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
*/
-/* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/src/fontfile/fontscale.c b/src/fontfile/fontscale.c
index 8002dde..55aca29 100644
--- a/src/fontfile/fontscale.c
+++ b/src/fontfile/fontscale.c
@@ -1,5 +1,3 @@
-/* $Xorg: fontscale.c,v 1.5 2001/02/09 02:04:03 xorgcvs Exp $ */
-
/*
Copyright 1991, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/fontfile/fontscale.c,v 3.9 2001/08/27 19:49:54 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium
diff --git a/src/fontfile/gunzip.c b/src/fontfile/gunzip.c
index 6cf192b..9fa3eed 100644
Reply to: