ChangeLog | 104 +++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 27 ----------- configure.ac | 10 ++-- debian/changelog | 13 +++++ debian/control | 5 -- debian/libxfont-dev.install | 5 ++ debian/rules | 13 +---- debian/watch | 1 doc/.gitignore | 10 ++-- doc/Makefile.am | 66 +++++++++++++++++++++++++++ doc/fontlib.css | 41 ---------------- doc/fontlib.xml | 1 doc/fontlib.xsl | 32 ------------- 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/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 | 5 -- src/util/patcache.c | 3 - src/util/private.c | 3 - src/util/utilbitmap.c | 1 80 files changed, 233 insertions(+), 307 deletions(-)
New commits: commit 9e85911d68e52d7776c22ed3776f7339b4f45921 Author: Cyril Brulebois <[email protected]> Date: Fri Nov 19 01:18:02 2010 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index 44f0496..9f62375 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxfont (1:1.4.3-1) UNRELEASED; urgency=low +libxfont (1:1.4.3-1) experimental; urgency=low * New upstream release. * Bump xutils-dev build-dep for new macros. @@ -9,7 +9,7 @@ libxfont (1:1.4.3-1) UNRELEASED; urgency=low * Add --fail-missing -XlibXfont.la for the second dh_install call (the udeb one), for additional safety. - -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 15:05:02 +0100 + -- Cyril Brulebois <[email protected]> Fri, 19 Nov 2010 01:17:48 +0100 libxfont (1:1.4.2-1) experimental; urgency=low commit 7386c9f1a44d64ef89e5dbe9a5b47be5997c07c7 Author: Cyril Brulebois <[email protected]> Date: Thu Nov 18 15:10:44 2010 +0100 Mention upstream git URL in a comment. diff --git a/debian/watch b/debian/watch index a241b87..b369043 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/lib/libXfont version=3 http://xorg.freedesktop.org/releases/individual/lib/ libXfont-(.*)\.tar\.gz commit e5071177f8ea1ab78c693279ee774bfa2ee817be Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 15:30:02 2010 +0100 Add --fail-missing -XlibXfont.la for the second dh_install call (the udeb one), for additional safety. diff --git a/debian/changelog b/debian/changelog index 8c4b6a2..44f0496 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ libxfont (1:1.4.3-1) UNRELEASED; urgency=low * Pass --with-xmlto and --without-fop for the regular build (we want html and txt only). Disable both for the udeb build. * Tweak doc filenames, and handle that through dh_install. + * Add --fail-missing -XlibXfont.la for the second dh_install call (the + udeb one), for additional safety. -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 15:05:02 +0100 diff --git a/debian/rules b/debian/rules index 55ddad3..7aa4d00 100755 --- a/debian/rules +++ b/debian/rules @@ -101,7 +101,7 @@ binary-arch: build install dh_installdocs dh_install --sourcedir=debian/tmp --fail-missing -XlibXfont.la - dh_install -p$(PACKAGE)-udeb --sourcedir=debian/tmp-udeb + dh_install -p$(PACKAGE)-udeb --sourcedir=debian/tmp-udeb --fail-missing -XlibXfont.la dh_installchangelogs ChangeLog dh_link dh_strip --dbg-package=$(PACKAGE)-dbg commit 7b6de573e49dcd62786892580b6b474c0d5e9917 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 15:23:45 2010 +0100 Tweak doc filenames, and handle that through dh_install. diff --git a/debian/changelog b/debian/changelog index 6ca33c0..8c4b6a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ libxfont (1:1.4.3-1) UNRELEASED; urgency=low * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. * Pass --with-xmlto and --without-fop for the regular build (we want html and txt only). Disable both for the udeb build. + * Tweak doc filenames, and handle that through dh_install. -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 15:05:02 +0100 diff --git a/debian/libxfont-dev.install b/debian/libxfont-dev.install index 4c72416..ed6389c 100644 --- a/debian/libxfont-dev.install +++ b/debian/libxfont-dev.install @@ -2,3 +2,8 @@ usr/include/X11/* usr/lib/libXfont.a usr/lib/libXfont.so usr/lib/pkgconfig/xfont.pc + +# Extra doc, under noinst_* in doc/Makefile.am: +../../build/doc/*.html usr/share/doc/libxfont-dev/ +../../build/doc/*.css usr/share/doc/libxfont-dev/ +../../build/doc/*.txt usr/share/doc/libxfont-dev/ diff --git a/debian/rules b/debian/rules index 791106c..55ddad3 100755 --- a/debian/rules +++ b/debian/rules @@ -31,11 +31,6 @@ else confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) endif -doc_files = \ - doc/fontlib.css \ - build/doc/fontlib.txt \ - build/doc/fontlib.html - confflags += \ --enable-fc \ --enable-builtins \ @@ -105,10 +100,8 @@ binary-arch: build install dh_testroot dh_installdocs - dh_install --sourcedir=debian/tmp --list-missing -XlibXfont.la + dh_install --sourcedir=debian/tmp --fail-missing -XlibXfont.la dh_install -p$(PACKAGE)-udeb --sourcedir=debian/tmp-udeb - install -d debian/libxfont-dev/usr/share/doc/libxfont-dev - install -m 644 $(doc_files) debian/libxfont-dev/usr/share/doc/libxfont-dev dh_installchangelogs ChangeLog dh_link dh_strip --dbg-package=$(PACKAGE)-dbg commit 7231f5f2bd0cbccdbc0304189f8c82f73990aa32 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 15:08:39 2010 +0100 Pass --with-xmlto and --without-fop for the regular build (we want html and txt only). Disable both for the udeb build. diff --git a/debian/changelog b/debian/changelog index 6408e5e..6ca33c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ libxfont (1:1.4.3-1) UNRELEASED; urgency=low * New upstream release. * Bump xutils-dev build-dep for new macros. * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. + * Pass --with-xmlto and --without-fop for the regular build (we want + html and txt only). Disable both for the udeb build. -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 15:05:02 +0100 diff --git a/debian/rules b/debian/rules index 463192f..791106c 100755 --- a/debian/rules +++ b/debian/rules @@ -52,6 +52,7 @@ build/config.status: configure ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ --with-bzip2 \ + --with-xmlto --without-fop \ CFLAGS="$(CFLAGS)" LDFLAGS="" build-udeb/config.status: configure @@ -60,6 +61,7 @@ build-udeb/config.status: configure ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info $(confflags) \ --without-bzip2 \ + --without-xmlto --without-fop \ CFLAGS="$(CFLAGS)" LDFLAGS="" build: build-stamp commit 0b0921435d173c3bebd4f8ebd0711a9a970e0e39 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 15:07:11 2010 +0100 Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. diff --git a/debian/changelog b/debian/changelog index fd9fb32..6408e5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libxfont (1:1.4.3-1) UNRELEASED; urgency=low * New upstream release. * Bump xutils-dev build-dep for new macros. + * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 15:05:02 +0100 diff --git a/debian/control b/debian/control index b14e50d..ed5ba40 100644 --- a/debian/control +++ b/debian/control @@ -19,8 +19,7 @@ Build-Depends: automake, libtool, # devel-docs - xmlto, - lynx, + xmlto, xorg-sgml-doctools (>= 1:1.5), w3m, Standards-Version: 3.9.0 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxfont Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxfont.git commit f4b9194c547cb41dd1b0ed1b8577b6235fa6d5b8 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 15:06:43 2010 +0100 Bump xutils-dev build-dep for new macros. diff --git a/debian/changelog b/debian/changelog index 350d3a6..fd9fb32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libxfont (1:1.4.3-1) UNRELEASED; urgency=low * New upstream release. + * Bump xutils-dev build-dep for new macros. -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 15:05:02 +0100 diff --git a/debian/control b/debian/control index 29b5ee0..b14e50d 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: zlib1g-dev, libbz2-dev, quilt, - xutils-dev (>= 1:7.5+3), + xutils-dev (>= 1:7.5+4), autoconf, automake, libtool, commit 56248e091ec320d568af2c6c75cdf4e5567ab67e Author: Cyril Brulebois <[email protected]> Date: Sat Nov 6 15:05:15 2010 +0100 Update changelogs. diff --git a/ChangeLog b/ChangeLog index bc78814..b734a4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,107 @@ +commit 12157fbebc35c2d039df2df4fc5ac2b299eeec03 +Author: Alan Coopersmith <[email protected]> +Date: Thu Oct 28 20:43:27 2010 -0700 + + libXfont 1.4.3 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit f29f1d68d7eca96e45ba3758686be07993d82e03 +Author: Jesse Adkins <[email protected]> +Date: Tue Sep 28 13:30:02 2010 -0700 + + Purge cvs tags. + + Signed-off-by: Jesse Adkins <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 6628b4d82426cf9ac240da363cd8a8252e6f71ef +Author: Jeremy Huddleston <[email protected]> +Date: Mon Sep 27 12:31:50 2010 -0700 + + FreeType: Cleanup MUMBLE and fix printing of XLFD in debug spew. + + Signed-off-by: Jeremy Huddleston <[email protected]> + +commit c482a2c104aa5cd1a265c2ca310a308dcc418fe7 +Author: Yaakov Selkowitz <[email protected]> +Date: Wed Apr 14 05:58:28 2010 -0500 + + Revert "Bug #6247: Fix build on Cygwin" + + libtool requires the '-no-undefined' flag in order to create shared + libraries on PE/COFF platforms (Cygwin/MinGW); on other platforms this + flag has no effect. + + The problem with libXfont is that PE weak symbols do not behave exactly + as they do on ELF platforms. Since PE binaries (both executables and + libraries) must have all symbols resolved at link time, there is no way + for the real symbols in xserver to "displace" those in libXfont at + runtime, so the result is that libXfont uses its stubs, which do + nothing, and xserver ends up unable to find its fonts. + + Solving this will require either significant changes to libXfont or some + major improvement to the toolchain to handle this case. Until that + happens, removing '-no-undefined' will result in a static-only library + on these platforms, which is the only currently working solution. + + http://sourceware.org/bugzilla/show_bug.cgi?id=11306 + http://cygwin.com/ml/cygwin/2010-04/msg00281.html + + This reverts commit 69c4ae1e3e14a58bc2eb9b9b8820dc7183b82a67. + + Conflicts: + + ChangeLog + + Signed-off-by: Yaakov Selkowitz <[email protected]> + +commit 455ec66e82e3c4bedd9e789d2ab33030b8e64ffa +Author: Alan Coopersmith <[email protected]> +Date: Sun Aug 8 00:19:36 2010 -0700 + + Fix builds with Sun compilers + + Sun compilers use #pragma weak in the *.c files to declare weak symbols, + so should have weak defined to empty, but not define NO_WEAK_SYMBOLS + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 0386fa77367a305deea3cc27f8a3865cc3c467c0 +Author: Jeremy Huddleston <[email protected]> +Date: Sat Jul 10 10:08:21 2010 -0700 + + darwin: Fix build regression introduced by previous patch + + Signed-off-by: Jeremy Huddleston <[email protected]> + +commit 8f75706901da0141590d46f0f898e5678feac953 +Author: Jon TURNEY <[email protected]> +Date: Mon Jun 28 17:56:07 2010 +0100 + + Build fix for platforms which don't have weak linkage + + Since we fix this by removing the serverGeneration symbol, assuming + an external definition will be provided, this means on Windows libXfont + can only be built as a static library (since PE shared libraries cannot + contain undefined symbols). This produces a libXfont which might only + be useful to the xserver, but the only other users we might care about + are xfs, which is obsolete, and bdftopcf, which fortunately doesn't + pull in any objects which reference serverGeneration from libXfont. + + Signed-off-by: Jon TURNEY <[email protected]> + Reviewed-by: Colin Harrison <[email protected]> + +commit 5c49c956e9c85d89f6b2e719eb9b6fbde62c2f72 +Author: Gaetan Nadon <[email protected]> +Date: Mon Jun 28 13:18:22 2010 -0400 + + doc: use xorg-docs xorg.css stylesheet + + Use latest DocBook XML util-macros infrastructure + + Signed-off-by: Gaetan Nadon <[email protected]> + commit 27270de56f7da5e047784434f3b29fa672f97ffd Author: Tiago Vignatti <[email protected]> Date: Thu Jun 10 16:29:37 2010 +0300 diff --git a/debian/changelog b/debian/changelog index 1876885..350d3a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxfont (1:1.4.3-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Cyril Brulebois <[email protected]> Sat, 06 Nov 2010 15:05:02 +0100 + libxfont (1:1.4.2-1) experimental; urgency=low * New upstream release. commit 12157fbebc35c2d039df2df4fc5ac2b299eeec03 Author: Alan Coopersmith <[email protected]> Date: Thu Oct 28 20:43:27 2010 -0700 libXfont 1.4.3 Signed-off-by: Alan Coopersmith <[email protected]> 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 <[email protected]> Date: Tue Sep 28 13:30:02 2010 -0700 Purge cvs tags. Signed-off-by: Jesse Adkins <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> 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 @@ /* -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
