Bump version number to 2.5

diff --git a/README b/README
index 3c486f74c6f0a7e8586fa25f2f889c4e98a5968a..67241870c00418b33f9ed315e8d21e30e9b6dd30 100644 (file)
--- 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 3f7e8bf697b65c9238185026817a34e3a4e7d168..ffc01173a921a35eadc896179bebce67b9eb7434 100644 (file)
--- 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 37d6652d2c8cd49bf87c3ae6cd164030b092dfed..46b4305abfb46844715d2cea32a5bdfe85157641 100644 (file)
--- 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))