Just remove the FC_FONTDATE -- it has locale issues and annoys redhat

    multi-arch installs. Now that all X fonts are included without
    prejudice, the chances of the date being at all interesting are rather
    limited. Bug #415.
Add copyright and license

diff --git a/ChangeLog b/ChangeLog
index 3f8df2be5fca87ac906185bf3b7886c710b60063..979f0b94c391c315e88523225606201882b93236 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-12-04  Keith Packard  <keithp@keithp.com>
+
+       * fonts.conf.in:
+       Just remove the FC_FONTDATE -- it has locale issues and
+       annoys redhat multi-arch installs.  Now that all X fonts are
+       included without prejudice, the chances of the date being at
+       all interesting are rather limited.  Bug #415.
+       * src/Makefile.am:
+       Add copyright and license
+
 2004-12-04  Keith Packard  <keithp@keithp.com>
 
        * configure.in:

diff --git a/fonts.conf.in b/fonts.conf.in
index 4ba79acbde7bb31e8920ce7d8d8a21864ce0a962..d1becbabd499f3e0b40dc3d32f07b2ea0285ac0d 100644 (file)
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -21,7 +21,7 @@
        Keith Packard
 -->
 
-<!-- Font directory list configured on @FC_FONTDATE@ -->
+<!-- Font directory list -->
 
        <dir>@FC_DEFAULT_FONTS@</dir>
        @FC_FONTPATH@

diff --git a/src/Makefile.am b/src/Makefile.am
index 0e42b2466dadbdf34cc2cf3116d35c66dde9a5ee..1891c3c900a779d34b2ddf1db39c2c47b34bbfcd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,26 @@
+#
+# $Id$
+#
+# Copyright © 2003 Keith Packard
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of Keith Packard not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission.  Keith Packard makes no
+# representations about the suitability of this software for any purpose.  It
+# is provided "as is" without express or implied warranty.
+#
+# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
 if OS_WIN32
 
 no_undefined = -no-undefined