[Fontconfig] fontconfig: Branch 'master'

[Keith Packard]

 README                  |   15 +++++++++++++--
 configure.in            |    2 +-
 fontconfig/fontconfig.h |    4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)

New commits:
commit 8a0bd93e8a81b105206c1433e2da55b1acef1070
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Tue Nov 13 18:56:44 2007 -0800

    Bump version number to 2.5

diff --git a/README b/README
index 3c486f7..6724187 100644
--- a/README
+++ b/README
@@ -1,12 +1,23 @@
 			Fontconfig
 	Font configuration and customization library
-		  Version 2.4.92 (2.5 RC2)
-		        2007-11-5
+		        Version 2.5
+		        2007-11-13
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.5
+
+Keith Packard (4):
+      Document several function return values (Bug 13145).
+      Document that Match calls FcFontRenderPrepare (bug 13162).
+      Document that FcConfigGetFonts returns the internal fontset (bug 13197)
+      Revert "Remove fcprivate.h, move the remaining macros to fcint.h."
+
+Tor Lillqvist (1):
+      Workaround for stat() brokenness in Microsoft's C library (bug 8526)
+
 2.4.92 (2.5 RC2)
 
 Behdad Esfahbod (14):
diff --git a/configure.in b/configure.in
index 3f7e8bf..ffc0117 100644
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,7 @@ dnl This is the package version number, not the shared library
 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.4.92)
+AM_INIT_AUTOMAKE(fontconfig, 2.5.0)
 AM_MAINTAINER_MODE
 
 dnl libtool versioning
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 37d6652..46b4305 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -52,8 +52,8 @@ typedef int		FcBool;
  */
 
 #define FC_MAJOR	2
-#define FC_MINOR	4
-#define FC_REVISION	92
+#define FC_MINOR	5
+#define FC_REVISION	0
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))