summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2004-12-05 05:49:20 +0000
committerKeith Packard <keithp@keithp.com>2004-12-05 05:49:20 +0000
commitc5a0b541df8be0b66f4ecf531570242693aac930 (patch)
treec4c2a9538d68a3b13565988d516d8d2fdff40399
parent2d9c79c049d084c82fdda9a71c5a65502ae94cee (diff)
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
-rw-r--r--ChangeLog10
-rw-r--r--fonts.conf.in2
-rw-r--r--src/Makefile.am23
3 files changed, 34 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f8df2b..979f0b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
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:
Change default set of fonts to include all of
/usr/X11R6/lib/X11/fonts (or wherever the X fonts are located).
diff --git a/fonts.conf.in b/fonts.conf.in
index 4ba79ac..d1becba 100644
--- 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 0e42b24..1891c3c 100644
--- 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