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

[Behdad Esfahbod]

 .gitignore              |    1 +
 README                  |   27 +++++++++++++++++++++++++--
 configure.in            |    8 ++++----
 fontconfig/fontconfig.h |    2 +-
 4 files changed, 31 insertions(+), 7 deletions(-)

New commits:
commit d2c8ac373e9ac45df66627cfc42679636d017f6e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jul 27 17:53:26 2009 -0400

    Bump version to 2.7.1

diff --git a/README b/README
index 1fbbb95..1106dba 100644
--- a/README
+++ b/README
@@ -1,12 +1,35 @@
                               Fontconfig
              Font configuration and customization library
-                              Version 2.7
-                              2009-06-24
+                             Version 2.7.1
+                              2009-07-27
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.7.1
+
+Behdad Esfahbod (16):
+      git-tag -s again
+      Fix win32 build
+      Replace spaces with tabs in conf files
+      Remove unused ftglue code
+      Add Inconsolata to monospace config (#22710)
+      Fix leak with string VStack objects
+      Improve libtool version parsing (#22122)
+      Use GetSystemWindowsDirectory() instead of GetWindowsDirectory() (#22037)
+      Remove unused macros
+      Fix FcNameUnparseLangSet()
+      Fix doc syntax (#22902)
+      TT_MS_ID_UCS_4 is really UTF-16BE, not UTF-32
+      [doc] Add ~/fonts.conf.d to user docs
+      Hardcode /etc/fonts instead of @CONFDIR@ in docs (#22911)
+      Bump libtool versions that 2.7.0 (I forgot to do back then)
+      Update .gitignore
+
+Karl Tomlinson (1):
+      Don't change the order of names unnecessarily (#20128)
+
 2.7
 
 Alexey Khoroshilov (1):
diff --git a/configure.in b/configure.in
index ec2182c..a28a7f0 100644
--- a/configure.in
+++ b/configure.in
@@ -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.7.0)
+AM_INIT_AUTOMAKE(fontconfig, 2.7.1)
 AM_MAINTAINER_MODE
 
 dnl libtool versioning
@@ -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=5
-LIBT_REVISION=0
+LIBT_REVISION=1
 AC_SUBST(LIBT_CURRENT)
 AC_SUBST(LIBT_REVISION)
 LIBT_AGE=4
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 935e4f1..c36b8f5 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -53,7 +53,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	7
-#define FC_REVISION	0
+#define FC_REVISION	1
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
commit 16630692ec590bd70f4e426125e358251e05435d
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jul 27 17:51:17 2009 -0400

    Update .gitignore

diff --git a/.gitignore b/.gitignore
index 3879fa3..4c336d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,7 @@ doc/fcconfig.sgml
 doc/fcconstant.sgml
 doc/fcdircache.sgml
 doc/fcfile.sgml
+doc/fcformat.sgml
 doc/fcfontset.sgml
 doc/fcfreetype.sgml
 doc/fclangset.sgml
commit 50d937b0e110ee21d9861b8fb973d62534db98ae
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jul 27 17:48:29 2009 -0400

    Bump libtool versions that 2.7.0 (I forgot to do back then)

diff --git a/configure.in b/configure.in
index fe93459..ec2182c 100644
--- a/configure.in
+++ b/configure.in
@@ -41,11 +41,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=4
+LIBT_CURRENT=5
 LIBT_REVISION=0
 AC_SUBST(LIBT_CURRENT)
 AC_SUBST(LIBT_REVISION)
-LIBT_AGE=3
+LIBT_AGE=4
 
 LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE"
 AC_SUBST(LIBT_VERSION_INFO)