summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2004-05-29 19:36:32 +0000
committerKeith Packard <keithp@keithp.com>2004-05-29 19:36:32 +0000
commitd81271eb21db058d0e816044874b3a8b88439e82 (patch)
tree3bed67e27150b819115a065689bb09288a4dd4ac
parentec0c740e392e6e05ae0fa204ebe191cbe27073cf (diff)
Update for 2.2.95
-rw-r--r--ChangeLog7
-rw-r--r--README11
-rw-r--r--configure.in2
-rw-r--r--fontconfig/fontconfig.h2
4 files changed, 18 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 756bffc..4f120fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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:
* src/fcmatch.c: (FcFontSetMatch):
Add FcResultOutOfMemory to provide an accurate error when
diff --git a/README b/README
index 8e9b731..bea578f 100644
--- 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 de03087..f4b4cc2 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.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 225ce75..8028d02 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 94
+#define FC_REVISION 95
#define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))