From 505712d1dcc52d410aa37cd2cffbc4ceb5048656 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Wed, 15 Jun 2016 20:10:38 +0900
Subject: Bump version to 2.12.0

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

diff --git a/README b/README
index c3ec5b8..6ebca65 100644
--- a/README
+++ b/README
@@ -1,12 +1,30 @@
                               Fontconfig
              Font configuration and customization library
-                      Version 2.11.95 (2.12 RC5)
-                              2016-04-06
+                             Version 2.12
+                              2016-06-15
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.12
+
+Akira TAGOH (8):
+      Modernize fc-blanks.py
+      Update URL
+      Bug 95477 - FcAtomicLock fails when SELinux denies link() syscall with EACCES
+      45-latin.conf: Add some Windows fonts to categorize them properly
+      Correct one for the previous change
+      Bug 95481 - Build fails on Android due to broken lconv struct
+      Add the static raw data to generate fcblanks.h
+      Remove unused code
+
+Erik de Castro Lopo (1):
+      Fix a couple of minor memory leaks
+
+Petr Filipsky (1):
+      Fix memory leak in FcDirCacheLock
+
 2.11.95 (2.12 RC5)
 
 Akira TAGOH (22):
diff --git a/configure.ac b/configure.ac
index 0101357..f8dadf1 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.11.95], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
+AC_INIT([fontconfig], [2.12.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 d6dd3e9..e760402 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -51,8 +51,8 @@ typedef int		FcBool;
  */
 
 #define FC_MAJOR	2
-#define FC_MINOR	11
-#define FC_REVISION	95
+#define FC_MINOR	12
+#define FC_REVISION	0
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
-- 
cgit v1.2.3