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

[Keith Packard]

 .gitignore              |    1 +
 README                  |   40 ++++++++++++++++++++++++++++++++++++++--
 configure.in            |    2 +-
 fontconfig/fontconfig.h |    2 +-
 new-version.sh          |    4 ++--
 5 files changed, 43 insertions(+), 6 deletions(-)

New commits:
commit d33d23ada05a688046e4cc0a48b149fbf44c9ce3
Author: Keith Packard <keithp at keithp.com>
Date:   Sat May 3 20:39:07 2008 -0700

    Bump version to 2.5.92

diff --git a/README b/README
index 2bedf5a..bab8eb1 100644
--- a/README
+++ b/README
@@ -1,12 +1,48 @@
                               Fontconfig
              Font configuration and customization library
-                       Version 2.5.91 (2.6 RC1)
-                              2008-01-10
+                       Version 2.5.92 (2.6 RC2)
+                              2008-05-03
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.5.92 (2.6 RC2)
+
+Carlo Bramini (1):
+      Add FreeType-dependent functions to fontconfig.def file. (bug 15415)
+
+Changwoo Ryu (1):
+      Korean font in the default config - replacing baekmuk with un (bug 13569)
+
+Dennis Schridde (1):
+      Proper config path for static libraries in win32
+
+Eric Anholt (1):
+      Fix build with !ENABLE_DOCS and no built manpages.
+
+Frederic Crozat (1):
+      Merge some of Mandriva configuration into upstream configuration. Bug 13247
+
+Keith Packard (11):
+      Use DOLT if available
+      Work around for bitmap-only TrueType fonts that are missing the glyf table.
+      Remove size and dpi values from bitmap fonts. Bug 8765.
+      Add some sample cursive and fantasy families.
+      Add --all flag to fc-match to show the untrimmed list. Bug 13018.
+      Remove doltcompile in distclean
+      Use of ":=" in src/Makefile.am is unportable (bug 14420)
+      Make fc-match behave better when style is unknown (bug 15332)
+      Deal with libtool 2.2 which doesn't let us use LT_ variables. (bug 15692)
+      Allow for RC versions in README update
+      git ignore doltcompile
+
+Ryan Schmidt (1):
+      fontconfig build fails if "head" is missing or unusable (bug 14304)
+
+Sylvain Pasche (1):
+      Fontconfig options for freetype sub-pixel filter configuration
+
 2.5.91 (2.6 RC1)
 
 Hongbo Zhao (1):
diff --git a/configure.in b/configure.in
index 0a72824..c6e3311 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.5.91)
+AM_INIT_AUTOMAKE(fontconfig, 2.5.92)
 AM_MAINTAINER_MODE
 
 dnl libtool versioning
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 8280a3a..23e82f9 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -53,7 +53,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	5
-#define FC_REVISION	91
+#define FC_REVISION	92
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
commit 366887c3845973a6f81dd2e9e7aec60afbc61c32
Author: Keith Packard <keithp at keithp.com>
Date:   Sat May 3 20:38:29 2008 -0700

    git ignore doltcompile

diff --git a/.gitignore b/.gitignore
index 4a5cd58..b46262c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ fontconfig.pc
 fontconfig.spec
 fonts.conf
 install-sh
+doltcompile
 libtool
 ltmain.sh
 missing
commit 0b15b5f38b94ca1eda2b8b25de939776198c017a
Author: Keith Packard <keithp at keithp.com>
Date:   Sat May 3 20:37:49 2008 -0700

    Allow for RC versions in README update

diff --git a/new-version.sh b/new-version.sh
index b6a156d..c771aeb 100644
--- a/new-version.sh
+++ b/new-version.sh
@@ -70,7 +70,7 @@ if [ $version != $last ]; then
 	#
 	# header
 	#
-	(sed '/^2\.[0-9.]*$/,$d' README | 
+	(sed '/^2\.[0-9.]*/,$d' README | 
 		sed -e "s/Version.*/Version $version_note/" \
 		    -e "s/200.*/$date/" | awk '
 		    /^[ \t]/ {
@@ -98,7 +98,7 @@ if [ $version != $last ]; then
 	# previous changelogs
 	#
 	
-	sed -n '/^2\.[0-9.]*$/,$p' README) > README.tmp ||
+	sed -n '/^2\.[0-9.]*/,$p' README) > README.tmp ||
 		(echo "README update failed"; exit 1)
 	
 	mv README.tmp README