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

[Akira TAGOH]

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

New commits:
commit 9c377192bf7d59336dbe4603d73449c7090c11ca
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Jun 25 14:57:51 2012 +0900

    Bump version to 2.9.92

diff --git a/README b/README
index b9aabc8..12ef056 100644
--- a/README
+++ b/README
@@ -1,12 +1,29 @@
                               Fontconfig
              Font configuration and customization library
-                       Version 2.9.91 (2.10 RC1)
+                       Version 2.9.92 (2.10 RC2)
                               2012-03-11
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.9.92 (2.10 RC2)
+
+Akira TAGOH (9):
+      Bug 50835 - Deprecate FC_GLOBAL_ADVANCE
+      Fix a typo and build fail.
+      Fix a build fail on MINGW
+      Fix the fail of make install with --disable-shared on Win32
+      clean up the lock file properly on even hardlink-not-supported filesystem.
+      Rename configure.in to configure.ac
+      Bug 18726 - RFE: help write locale-specific tests
+      Bump libtool revision
+      Update INSTALL
+
+Marius Tolzmann (2):
+      Fix newline in warning about deprecated config includes
+      Fix warning about deprecated, non-existent config includes
+
 2.9.91 (2.10 RC1)
 
 Akira TAGOH (60):
diff --git a/configure.ac b/configure.ac
index 433c0ca..644fc1a 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
-AM_INIT_AUTOMAKE(fontconfig, 2.9.91)
+AM_INIT_AUTOMAKE(fontconfig, 2.9.92)
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 dnl libtool versioning
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 238ab65..8980b31 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -52,7 +52,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	9
-#define FC_REVISION	91
+#define FC_REVISION	92
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
commit 2162d9c2ee7ba930dca8f710ad35a83cb7c76ca6
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Jun 25 14:57:40 2012 +0900

    Update INSTALL

diff --git a/INSTALL b/INSTALL
index 754a32b..f3cf9f8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -25,14 +25,14 @@ important steps:
  
  4.	Copy ChangeLog-2.x.y and fontconfig-2.x.y.tar.gz to
  
- 		freedesktop.org:/srv/fontconfig.freedesktop.org/www/release
+ 		freedesktop.org:/srv/www.freedesktop.org/www/software/fontconfig/release
 	
  5.	Update the Fontconfig Devel wiki page
  	http://fontconfig.org/wiki/Devel
 	
  6.	Update the fontconfig documentation
 
-		scp -rp doc/fontconfig-user.html doc/fontconfig-devel fontconfig.org:/srv/fontconfig.freedesktop.org/www
+		scp -rp doc/fontconfig-user.html doc/fontconfig-devel fontconfig.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 a94c6b3b94b4a66d7f528fcc7e939b8ec19ad660
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Jun 25 14:50:18 2012 +0900

    Bump libtool revision

diff --git a/configure.ac b/configure.ac
index a8c1f87..433c0ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,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=0
+LIBT_REVISION=1
 AC_SUBST(LIBT_CURRENT)
 AC_SUBST(LIBT_REVISION)
 LIBT_AGE=6