svn merge ^/branches/released .

1 files changed, 123 insertions, 14 deletions

diff --git a/xorg-server/fonts.src/TTF/ChangeLog b/xorg-server/fonts.src/TTF/ChangeLog
index b553c1a3e..4af87c9d8 100644
--- a/xorg-server/fonts.src/TTF/ChangeLog
+++ b/xorg-server/fonts.src/TTF/ChangeLog
@@ -1,21 +1,130 @@
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 195d8a6841730c3ca8d30936f0e7151d21894f6d
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Sat Oct 10 17:54:58 2009 -0700
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    font-bh-ttf 1.0.1
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
 
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 04def8129edca8e7e9005690e608a77d995005b6
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Oct 5 19:41:20 2009 -0700
 
-	* configure.ac:
-	Add m4 magic to allow AS_HELP_STRING to work with older versions
-	of autoconf 2.57.
+    Migrate to xorg macros 1.3 & font-util 1.1 macros
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
 
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit cd2c3164a0da65cadcc55f02c23161f9a15beb66
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Tue Oct 6 19:14:26 2009 -0700
 
-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
+    Add pointers to mailing lists, bugzilla, & git to README
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
 
-2005-11-15  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit fc50baa2f533586e442a366fd072369d450fe2bb
+Author: Ryan Hill <dirtyepic@gentoo.org>
+Date:   Sun Aug 16 14:38:19 2009 -0600
 
-	* Makefile.am:
-	* configure.ac:
-	Add configure option to change the installed font dir.
+    bh-ttf: Skip fc-cache with DESTDIR.
+    
+    Fontconfig-2.7.0 runs chmod on the cachedir, causing access violations
+    when installing into a sandboxed environment.
+    
+    Signed-off-by: Ryan Hill <dirtyepic@gentoo.org>
+    Signed-off-by: Rémi Cardona <remi@gentoo.org>
+
+commit 6225ea97ec6c354164a2437e08f1c9d6a21886b8
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Tue Jan 27 19:11:07 2009 -0200
+
+    Janitor: Correct make distcheck and configure.ac simplification
+
+commit b2da25346f5fa9ef6f7f3829cf3ee4f1fc607b43
+Author: Andres Salomon <dilinger@debian.org>
+Date:   Sat Oct 25 20:50:21 2008 +0200
+
+    Bug#5176: cause configure to bail if mkfontscale or mkfontdir are not found
+    
+    Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit ff992ba2f5de0ff419f5ab0610feda5ec4a7289d
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Dec 6 16:37:47 2007 -0500
+
+    Replace static ChangeLog with dist-hook to generate from git log
+
+commit be1cb23a76afd9fd8420b948b5825518174f6759
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Sep 3 05:53:02 2007 -0400
+
+    Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 9e51a0a6370c3a0627fa29e11b8d97b32507f5e5
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Aug 23 19:26:21 2007 -0400
+
+    Rename .cvsignore to .gitignore
+
+commit 446d89fc26208f81b0fde439e635879f718cb2f8
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:23 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 9d7064887dbeacb3cca569444e4e5125d71aa0f4
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 17:08:51 2005 +0000
+
+    Add m4 magic to allow AS_HELP_STRING to work with older versions of
+        autoconf 2.57.
+
+commit 865237158ef97d03eadfeeca788b71bfe9552a4c
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:38 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit ddca6714c4ed21cbaafa327737d91a4eb28ecab9
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Tue Nov 22 02:00:19 2005 +0000
+
+    Add .cvsignores for fonts.
+
+commit cac47c41bba50c0b406c0142cb63ad42e2b64b81
+Author: Kevin E Martin <kem@kem.org>
+Date:   Tue Nov 15 08:29:16 2005 +0000
+
+    Add configure option to change the installed font dir.
+
+commit f42d82a2b60d4d78e1e1668900afc09a91d804ac
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:47 2005 +0000
+
+    Various changes preparing packages for RC0:
+    - Verify and update package version numbers as needed
+    - Implement versioning scheme
+    - Change bug address to point to bugzilla bug entry form
+    - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+        reenable it)
+    - Fix makedepend to use pkgconfig and pass distcheck
+    - Update build script to build macros first
+    - Update modular Xorg version
+
+commit c715d6873588b9de1db9a0f3c941bda3888a9393
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Jun 30 22:28:06 2005 +0000
+
+    Initial build system files for font module
+
+commit 425ba2e686ed734b0581044d45a18fbe1c068f6a
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:42 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 9c265bd972ba1b92e0ce03f4bb5febefe7cbaae7
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:42 2003 +0000
+
+    Initial revision