Update for 2.2.96

diff --git a/ChangeLog b/ChangeLog
index 552bc67313a4cbd2dc51f066aac1073cdcbabfd0..37ea4e496cdbf8675ccb458aeff4e3a0e406bb86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-30  Keith Packard  <keithp@keithp.com>
+
+       * README:
+       * configure.in:
+       * fontconfig/fontconfig.h:
+       Update for 2.2.96
+
 2004-06-30  Keith Packard  <keithp@keithp.com>
 
        Provided by: Lubos Lunak <l.lunak@suse.cz>

diff --git a/README b/README
index bea578f35fd02ba127dbcddfcfaea9b7335d5d14..c0c7b52c79c2edf221286e297781adfdf4455bc9 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,15 @@
                        Fontconfig
        Font configuration and customization library
-                     Version 2.2.95
-                       2004-5-29
+                     Version 2.2.96
+                       2004-6-30
+
+2.2.96
+
+Fix FcConfigUpToDate to actually check all font directories and eliminate
+a typo which completely prevented it from working (Lubos Lunak
+<l.lunak@suse.cz>)
+
+Remove comma at end of FcResult enum definition for picky compilers.
 
 2.2.95
 

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

diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 522de220dfc40b24c7956cecbcdd3b89d72dc238..2e667cb14bac1171c24bbe4b4023cca71fcb4934 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    95
+#define FC_REVISION    96
 
 #define FC_VERSION     ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))