[Fontconfig] fontconfig: Branch 'master' - 3 commits

[Akira TAGOH]

 README                  |   29 +++++++++++++++++++++++++++--
 configure.ac            |    6 +++---
 fc-case/CaseFolding.txt |    6 +++---
 fontconfig/fontconfig.h |    4 ++--
 4 files changed, 35 insertions(+), 10 deletions(-)

New commits:
commit f16c3118e25546c1b749f9823c51827a60aeb5c1
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Oct 11 13:27:33 2013 +0900

    Bump version to 2.11.0

diff --git a/README b/README
index 06f862b..d2288a5 100644
--- a/README
+++ b/README
@@ -1,12 +1,37 @@
                               Fontconfig
              Font configuration and customization library
-                      Version 2.10.95 (2.11 RC5)
-                              2013-08-31
+                             Version 2.11
+                              2013-10-11
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.11
+
+Akira TAGOH (15):
+      Do not create a config dir for migration when no config files nor dirs
+      Add a test case of the migration for config place
+      Fix memory leaks in FcFreeTypeQueryFace
+      Bug 68955 - Deprecate / remove FC_RASTERIZER
+      Copy all values from the font to the pattern if the pattern doesn't have the element
+      Fix a crash when FcPattern is set to null on FcFontSetList() and FcFontList()
+      Add the description of -q option to the man page
+      avoid reading config.h twice
+      clean up
+      Add the relative path for <include> to fonts.conf if the parent path is same to fonts.conf
+      Workaround the race condition issue on updating cache
+      exit with the error code when FcNameParse() failed
+      Add missing doc for FcStrListFirst and fix a typo
+      Bump libtool revision
+      Update CaseFolding.txt to Unicode 6.3
+
+Jan Alexander Steffens (heftig) (1):
+      Further changes to 30-metric-aliases.conf
+
+W. Trevor King (1):
+      doc/fccharset.fncs: Describe the map format in more detail
+
 2.10.95 (2.11 RC5)
 
 Akira TAGOH (2):
diff --git a/configure.ac b/configure.ac
index 7106aa3..c3743f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
-AC_INIT([fontconfig], [2.10.95], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
+AC_INIT([fontconfig], [2.11.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
 AM_INIT_AUTOMAKE([1.11 parallel-tests dist-bzip2])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index e588579..dfc48f9 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -51,8 +51,8 @@ typedef int		FcBool;
  */
 
 #define FC_MAJOR	2
-#define FC_MINOR	10
-#define FC_REVISION	95
+#define FC_MINOR	11
+#define FC_REVISION	0
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
commit f82a032f417445abbb4399344766102aff255b6c
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Oct 11 13:27:24 2013 +0900

    Update CaseFolding.txt to Unicode 6.3
    
    No real updates between 6.2 and 6.3.

diff --git a/fc-case/CaseFolding.txt b/fc-case/CaseFolding.txt
index df1813d..cf5779f 100644
--- a/fc-case/CaseFolding.txt
+++ b/fc-case/CaseFolding.txt
@@ -1,8 +1,8 @@
-# CaseFolding-6.2.0.txt
-# Date: 2012-08-14, 17:54:49 GMT [MD]
+# CaseFolding-6.3.0.txt
+# Date: 2012-12-20, 22:14:35 GMT [MD]
 #
 # Unicode Character Database
-# Copyright (c) 1991-2012 Unicode, Inc.
+# Copyright (c) 1991-2013 Unicode, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 # For documentation, see http://www.unicode.org/reports/tr44/
 #
commit c4c90ffc7a7eec42fc0b84f1a7af464a4c9fcfd8
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Oct 11 12:40:23 2013 +0900

    Bump libtool revision

diff --git a/configure.ac b/configure.ac
index 4b631bd..7106aa3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,11 +42,11 @@ dnl libtool versioning
 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=8
+LIBT_CURRENT=9
 LIBT_REVISION=0
 AC_SUBST(LIBT_CURRENT)
 AC_SUBST(LIBT_REVISION)
-LIBT_AGE=7
+LIBT_AGE=8
 
 LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE"
 AC_SUBST(LIBT_VERSION_INFO)