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

[Akira TAGOH]

 README                  |   22 ++++++++++++++++++++--
 configure.ac            |    4 ++--
 fontconfig/fontconfig.h |    2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

New commits:
commit 14d70d3a8ae6f2652305daeb019e518f7e0c505b
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Sep 21 17:06:17 2017 +0900

    Bump version to 2.12.6

diff --git a/README b/README
index 40f807c..6f36f05 100644
--- a/README
+++ b/README
@@ -1,12 +1,30 @@
                               Fontconfig
              Font configuration and customization library
-                            Version 2.12.5
-                              2017-09-09
+                            Version 2.12.6
+                              2017-09-21
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.12.6
+
+Akira TAGOH (4):
+      und_zsye.orth: polish to get for NotoEmoji-Regular.ttf
+      Revert "Keep the same behavior to the return value of FcConfigParseAndLoad"
+      Fix again to keep the same behavior to the return value of FcConfigParseAndLoad
+      Update libtool revision
+
+Behdad Esfahbod (2):
+      Minor
+      [fc-query] Fix linking order
+
+David Kaspar [Dee'Kej] (1):
+      conf.d: Drop aliases for (URW)++ fonts
+
+Florian Müllner (1):
+      build: Remove references to deleted file
+
 2.12.5
 
 Akira TAGOH (17):
diff --git a/configure.ac b/configure.ac
index ba0d776..2b9b036 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.12.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
+AC_INIT([fontconfig], [2.12.6], [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 0f4dcb9..4d90279 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -53,7 +53,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	12
-#define FC_REVISION	5
+#define FC_REVISION	6
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
commit 3f96450be0291e4903ebccf601e5af46b55cd193
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Sep 21 17:05:51 2017 +0900

    Update libtool revision

diff --git a/configure.ac b/configure.ac
index 47a9df6..ba0d776 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,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=11
-LIBT_REVISION=0
+LIBT_REVISION=1
 AC_SUBST(LIBT_CURRENT)
 AC_SUBST(LIBT_REVISION)
 LIBT_AGE=10