Update for 2.2.95

diff --git a/ChangeLog b/ChangeLog
index 756bffc90467b2a117647264f8fb330fd7b507d4..4f120faf678353e3e1a260219f6b7671c06c3619 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-29  Keith Packard  <keithp@keithp.com>
+
+       * README:
+       * configure.in:
+       * fontconfig/fontconfig.h:
+       Update for 2.2.95
+
 2004-05-29  Keith Packard  <keithp@keithp.com>
 
        * fontconfig/fontconfig.h:

diff --git a/README b/README
index 8e9b73185155fc1254248efe01de0ac71e49495e..bea578f35fd02ba127dbcddfcfaea9b7335d5d14 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,14 @@
                        Fontconfig
        Font configuration and customization library
-                     Version 2.2.94
-                       2004-4-23
+                     Version 2.2.95
+                       2004-5-29
+
+2.2.95
+
+Add FcResultOutOfMemory so FcFontSetMatch can return accurate error.
+
+Replace MIN/MAX/ABS macros which happened to be in old FreeType releases
+with FC_MIN/FC_MAX/FC_ABS macros owned by fontconfig.
 
 2.2.94
 

diff --git a/configure.in b/configure.in
index de030877083c6612be4c7d426263312e669747bb..f4b4cc256e4756cb238415a05816cbdd77ded044 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.2.94)
+AM_INIT_AUTOMAKE(fontconfig, 2.2.95)
 AM_MAINTAINER_MODE
 
 dnl libtool versioning

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 225ce7588e89540ba8ad7cd67fb07c3e5d630170..8028d022c5f202b79769295a01d8e7fea449d416 100644 (file)
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -40,7 +40,7 @@ typedef int           FcBool;
 
 #define FC_MAJOR       2
 #define FC_MINOR       2
-#define FC_REVISION    94
+#define FC_REVISION    95
 
 #define FC_VERSION     ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))