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

[Keith Packard]

 Makefile.am             |    2 -
 README                  |   59 ++++++++++++++++++++++++++++++++++++++++++++++--
 configure.in            |    2 -
 doc/Makefile.am         |    2 -
 fontconfig/fontconfig.h |    2 -
 5 files changed, 61 insertions(+), 6 deletions(-)

New commits:
commit 89d6119c0283969cb28dc6dfc8eac4cc1b52bf6a
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Thu Oct 25 15:19:14 2007 -0700

    A few fixups for make distcheck

diff --git a/Makefile.am b/Makefile.am
index e053902..7f1605c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ EXTRA_DIST = \
         fontconfig.spec.in \
         fontconfig.spec \
 	fontconfig-zip.in
-DISTCLEANFILES = config.cache
+DISTCLEANFILES = config.cache ChangeLog
 MAINTAINERCLEANFILES = \
 	$(srcdir)/aclocal.m4 \
 	$(srcdir)/autoscan.log \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index cbb5210..bf1ab99 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -119,7 +119,7 @@ $(DOC_FUNCS_SGML): edit-sgml$(EXEEXT) $(FNCS_TMPL)
 
 fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml
 	$(RM) $@
-	$(DOC2MAN) local-fontconfig-user.sgml
+	$(DOC2MAN) local-fontconfig-user.sgml && \
 	$(RM) manpage.refs manpage.links
 	
 local-fontconfig-user.sgml: fontconfig-user.sgml
commit e66c65fd41928babb3ba2ae2dc58f13d25e57661
Author: Keith Packard <keithp at koto.keithp.com>
Date:   Thu Oct 25 15:07:54 2007 -0700

    Set version numbers to 2.4.91 (2.5 RC1)

diff --git a/README b/README
index 6bc94f2..4fdc233 100644
--- a/README
+++ b/README
@@ -1,12 +1,67 @@
 			Fontconfig
 	Font configuration and customization library
-		      Version 2.4.2
-		        2006-12-02
+		  Version 2.4.91 (2.5 RC1)
+		        2007-10-25
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.4.91 (2.5 RC1)
+
+Behdad Esfahbod (1):
+      Update CaseFolding.txt to Unicode 5.1.0
+
+Dwayne Bailey (1):
+      Add/fix *.orth files for South African languages
+
+Hideki Yamane (1):
+      Handle Japanese fonts better. (debian bug #435971)
+
+Keith Packard (32):
+      rehash increment could be zero, causing rehash infinite loop.
+      Work around FreeType bug when glyph name buffer is too small.
+      Free temporary string in FcDirCacheUnlink (Bug #11758)
+      Fix ChangeLog generation to avoid circular make dependency
+      Store font directory mtime in cache file.
+      Comment about mmaping cache files was misleading.
+      Make FC_FULLNAME include all fullname entries, elide nothing. [bug 12827]
+      Remove unneeded call to access(2) in fc-cache.
+      Improve verbose messages from fc-cache.
+      Verbose message about cleaning directories was imprecise
+      Don't use X_OK bit when checking for writable directories (bug 12438)
+      Have fc-cache remove invalid cache files from cache directories.
+      FcConfigParseAndLoad doc was missing the last param.
+      Place language name in constant array instead of pointer.
+      Must not insert cache into hash table before completely validating.
+      Eliminate relocations for glyph name table.
+      Eliminate relocations from FcCodePageRange structure (bug 10982).
+      Leave generated headers out of distribution (bug 12734).
+      Move <cachedir> elements to the end of fonts.conf.
+      Add BRAILLE PATTERN BLANK to list of blank glyphs.
+      Replace makealias pattern with something supported by POSIX grep (bug 11083)
+      FcInit should return FcFalse when FcInitLoadConfigAndFonts fails. (bug 10976)
+      There is no U+1257 (bug 10899).
+      Spelling errors in documentation. (bug 10879).
+      Oops. Left debugging printf in previous commit.
+      Handle UltraBlack weight.
+      Fix parallel build in fontconfig/docs (bug 10481).
+      Distribute man source files for command line programs (bug 9678).
+      Ensure weight/slant values present even when style is supplied (bug 9313).
+      fontconfig needs configure option to use gnu iconv (bug 4083).
+      Match 'ultra' on word boundaries to detect ultra bold fonts. (bug 2511)
+      Build fix for Solaris 10 with GCC.
+
+Mike FABIAN (1):
+      Avoid crashes if config files contain junk.
+
+Stephan Kulow (1):
+      Make FcPatternDuplicate copy the binding instead of always using Strong.
+
+Tilman Sauerbeck (2):
+      Store FcNoticeFoundries in read-only memory.
+      Store FcVendorFoundries in read-only memory.
+
 2.4.2
 
 Han-Wen Nienhuys:
diff --git a/configure.in b/configure.in
index 6c2e431..ff4057b 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.4.2)
+AM_INIT_AUTOMAKE(fontconfig, 2.4.91)
 AM_MAINTAINER_MODE
 
 dnl libtool versioning
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 17048e3..4f02809 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -53,7 +53,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	4
-#define FC_REVISION	2
+#define FC_REVISION	91
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))