summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2004-06-30 20:06:41 +0000
committerKeith Packard <keithp@keithp.com>2004-06-30 20:06:41 +0000
commitb5f36ca0b54d30d790f84ce68ea43a1bd0e606e9 (patch)
treed5ec03b0909ad4082c4e1b0b880744d9094c83b9
parent28f93bc4122337f59afad31e610ce17c3d2b00a2 (diff)
Update for 2.2.96fc-2_2_96
-rw-r--r--ChangeLog7
-rw-r--r--README12
-rw-r--r--configure.in2
-rw-r--r--fontconfig/fontconfig.h2
4 files changed, 19 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 552bc67..37ea4e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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>
* src/fccfg.c: (FcConfigUptoDate):
diff --git a/README b/README
index bea578f..c0c7b52 100644
--- 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 f4b4cc2..604d56e 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.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 522de22..2e667cb 100644
--- 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))