fontconfig: Branch 'master' - 3 commits

[Akira TAGOH-3]

 INSTALL                 |    2 +-
 README                  |   11 ++++++++++-
 configure.ac            |    4 ++--
 fontconfig/fontconfig.h |    4 ++--
 4 files changed, 15 insertions(+), 6 deletions(-)

New commits:
commit 92bad770e505ec8683aad2e6e063232843734ece
Author: Akira TAGOH <akira@...>
Date:   Tue Jul 17 11:36:01 2012 +0900

    Bump version to 2.10

diff --git a/README b/README
index 12ef056..624ffa4 100644
--- a/README
+++ b/README
@@ -1,12 +1,21 @@
                               Fontconfig
              Font configuration and customization library
-                       Version 2.9.92 (2.10 RC2)
+                            Version 2.10.0
                               2012-03-11
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.10.0
+
+Akira TAGOH (5):
+      Bug 34266 - configs silently ignored if libxml2 doesn't support SAX1 interface
+      Update CaseFolding.txt to Unicode 6.1
+      Fix a build fail with gcc 2.95, not supporting the flexible array members.
+      Bump libtool revision
+      Update INSTALL
+
 2.9.92 (2.10 RC2)
 
 Akira TAGOH (9):
diff --git a/configure.ac b/configure.ac
index 32e886e..79f9597 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,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.9.92)
+AM_INIT_AUTOMAKE(fontconfig, 2.10)
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 dnl libtool versioning
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 8980b31..41af470 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -51,8 +51,8 @@ typedef int FcBool;
  */
 
 #define FC_MAJOR 2
-#define FC_MINOR 9
-#define FC_REVISION 92
+#define FC_MINOR 10
+#define FC_REVISION 0
 
 #define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
commit f513f53347ae943a03192e83f7a6d7c40bcdfd5d
Author: Akira TAGOH <akira@...>
Date:   Tue Jul 17 11:35:41 2012 +0900

    Update INSTALL

diff --git a/INSTALL b/INSTALL
index f3cf9f8..670add1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -32,7 +32,7 @@ important steps:
 
  6. Update the fontconfig documentation
 
- scp -rp doc/fontconfig-user.html doc/fontconfig-devel fontconfig.org:/srv/www.freedesktop.org/www/software/fontconfig
+ scp -rp doc/fontconfig-user.html doc/fontconfig-devel freedesktop.org:/srv/www.freedesktop.org/www/software/fontconfig
 
  7. Compute md5sums for release files:
  md5sum fontconfig-2.4.x.tar.gz ChangeLog-2.4.x
commit 14d23ef330808b480393196984cb06efb5724160
Author: Akira TAGOH <akira@...>
Date:   Tue Jul 17 11:34:31 2012 +0900

    Bump libtool revision

diff --git a/configure.ac b/configure.ac
index 12e4d5a..32e886e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ dnl bump revision when fixing bugs
 dnl bump current and age, reset revision to zero when adding APIs
 dnl bump current, leave age, reset revision to zero when changing/removing APIS
 LIBT_CURRENT=7
-LIBT_REVISION=1
+LIBT_REVISION=2
 AC_SUBST(LIBT_CURRENT)
 AC_SUBST(LIBT_REVISION)
 LIBT_AGE=6
_______________________________________________
Fontconfig mailing list
Fontconfig@...
http://lists.freedesktop.org/mailman/listinfo/fontconfig