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

[Akira TAGOH]

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

New commits:
commit 3072f14bddfeb0adba52bce26d7b752207a2cffb
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed May 31 16:39:44 2017 +0900

    Bump version to 2.12.2

diff --git a/README b/README
index bf840a5..c2ee151 100644
--- a/README
+++ b/README
@@ -1,12 +1,34 @@
                               Fontconfig
              Font configuration and customization library
-                            Version 2.12.1
-                              2016-08-05
+                            Version 2.12.2
+                              2017-05-31
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.12.2
+
+Akira TAGOH (8):
+      Don't call perror() if no changes happens in errno
+      Fix FcCacheOffsetsValid()
+      Fix the build issue with gperf 3.1
+      Fix the build issue on GNU/Hurd
+      Update a bit for the changes in FreeType 2.7.1
+      Add the description of FC_LANG envvar to the doc
+      Bug 101202 - fontconfig FTBFS if docbook-utils is installed
+      Update libtool revision
+
+Alan Coopersmith (1):
+      Correct cache version info in doc/fontconfig-user.sgml
+
+Khem Raj (1):
+      Avoid conflicts with integer width macros from TS 18661-1:2014
+
+Masamichi Hosoda (2):
+      Fix PostScript font alias name
+      Update aliases for URW June 2016
+
 2.12.1
 
 Akira TAGOH (6):
diff --git a/configure.ac b/configure.ac
index b7897e4..5b3c45d 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.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
+AC_INIT([fontconfig], [2.12.2], [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 070a557..2c784a8 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -52,7 +52,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	12
-#define FC_REVISION	1
+#define FC_REVISION	2
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
commit 6c4e11a73b300963ad822838500ecdcb6a50625b
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed May 31 16:39:39 2017 +0900

    Update libtool revision

diff --git a/configure.ac b/configure.ac
index bbff035..b7897e4 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=10
-LIBT_REVISION=2
+LIBT_REVISION=3
 AC_SUBST(LIBT_CURRENT)
 AC_SUBST(LIBT_REVISION)
 LIBT_AGE=9