[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Keith Packard]

 Makefile.am             |    4 ++--
 README                  |   41 +++++++++++++++++++++++++++++++++++++++--
 configure.in            |    2 +-
 fontconfig/fontconfig.h |    2 +-
 4 files changed, 43 insertions(+), 6 deletions(-)

New commits:
diff-tree 4c34c0c52a4e943c6770a6178e5012a3d6fe96d0 (from 88b6bebc3d648464ad9bcb7f106694ed85a84460)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Thu Sep 7 10:37:24 2006 -0700

    Create fc_cachedir at install time. Bug 8157.

diff --git a/Makefile.am b/Makefile.am
index 24229fb..cf90617 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,7 +85,7 @@ $(srcdir)/ChangeLog:
 .PHONY: ChangeLog $(srcdir)/ChangeLog
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(configdir)
+	$(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
 	if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
 	  echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
 	  mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \
diff-tree 88b6bebc3d648464ad9bcb7f106694ed85a84460 (from c3796ac6061373bcf0276a931036987c01741215)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Wed Sep 6 23:58:14 2006 -0700

    Update for version 2.3.97.

diff --git a/Makefile.am b/Makefile.am
index 1b28303..24229fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -97,7 +97,7 @@ install-data-local:
 	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
 	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
 	fi; fi
-	@(if $(RUN_FC_CACHE_TEST); then \
+	(if $(RUN_FC_CACHE_TEST); then \
 	    echo " fc-cache/fc-cache -s -f -v"; \
 	    fc-cache/fc-cache -s -f -v; \
 	else \
diff --git a/README b/README
index 9cae1ab..288a53b 100644
--- a/README
+++ b/README
@@ -1,12 +1,49 @@
 			Fontconfig
 	Font configuration and customization library
-		      Version 2.3.96
-		         2006-09-03
+		      Version 2.3.97
+		         2006-09-06
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.3.97
+
+Carl Worth:
+      Rename FcPatternThawAll to FcPatternFini.
+      Add a configuration file that disables hinting for the Lohit Gujarati font
+
+Keith Packard:
+      Various GCC 4 cleanups for signed vs unsigned char
+      Finish INSTALL changes. .gitignore ChangeLog
+      Merge branch 'fc-2_4_branch' to master
+      Remove all .cvsignore files
+      Hide private functions in shared library. Export functionality for utilities.
+      Hide FreeType glue code from library ABI.
+      Can't typecheck values for objects with no known type.
+      Leave cache files mapped permanently.
+      Reference count cache objects.
+      Make cache reference counting more efficient.
+      Oops, fc-lang broke when I added cache referencing.
+      Correct reference count when sharing cache file objects.
+      Eliminate .so PLT entries for local symbols. (thanks to Arjan van de Ven)
+      Update architecture signatures for x86-64 and ppc.
+      Parallel build fix for fcalias.h and fcaliastail.h
+      Charset hashing depended on uniqueness of leaves.
+
+Patrick Lam:
+      file Makefile.am was initially added on branch fc-2_4_branch.
+      Modify config file to use Greek fonts before Asian fonts with Greek glyphs.
+      Use libtool -no-undefined flag on all platforms.
+      file ftglue.c was initially added on branch fc-2_4_branch.
+      2005-11-23 Frederic Crozat <fcrozat at mandriva.com>: reviewed by: plam
+      file 10-fonts-persian.conf was initially added on branch fc-2_4_branch.
+      Sort directory entries while scanning them from disk; prevents Heisenbugs
+      file ln.orth was initially added on branch fc-2_4_branch.
+      Fix typos in orth files. Reported by Denis Jacquerye.
+      On Windows, unlink before rename. Reported by Tim Evans.
+      file fc-match.sgml was initially added on branch fc-2_4_branch.
+
 2.3.96
 
 Keith Packard:
diff --git a/configure.in b/configure.in
index 8aac36e..3226dd0 100644
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,7 @@ dnl This is the package version number, 
 dnl version.  This same version number must appear in fontconfig/fontconfig.h
 dnl Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
 dnl not possible to extract the version number here from fontconfig.h
-AM_INIT_AUTOMAKE(fontconfig, 2.3.96)
+AM_INIT_AUTOMAKE(fontconfig, 2.3.97)
 AM_MAINTAINER_MODE
 
 dnl libtool versioning
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 523d471..08153a0 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -53,7 +53,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	3
-#define FC_REVISION	96
+#define FC_REVISION	97
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))