Keith Packard
2006-Sep-11 11:11 UTC
[Fontconfig] fontconfig: Branch ''master'' - 3 commits
INSTALL | 22 +++++++++++++++-------
README | 38 ++++++++++++++++++++++++++++++++++++--
configure.in | 2 +-
fc-arch/fcarch.tmpl.h | 1 +
fontconfig/fontconfig.h | 4 ++--
5 files changed, 55 insertions(+), 12 deletions(-)
New commits:
diff-tree fb47a1f752417d45ad0eac98526cf9de893fc9ca (from
0fc03ffe443f4bfb1c830eb75c14ca336f2186e1)
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Sep 11 11:10:48 2006 -0700
Add ppc64 signature. Bug 8227
diff --git a/fc-arch/fcarch.tmpl.h b/fc-arch/fcarch.tmpl.h
index 7b20b21..73bdf07 100644
--- a/fc-arch/fcarch.tmpl.h
+++ b/fc-arch/fcarch.tmpl.h
@@ -32,3 +32,4 @@
x86
78563412_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_0000000c_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_0000001c
x86-64
78563412_00000001_00000008_00000004_00000008_00000018_00000008_00000008_00000010_00000004_00000008_00000010_00000004_00000008_00000018_00000008_00000008_00000002_00000020_00000004_00000030
ppc
12345678_00000001_00000004_00000004_00000004_00000010_00000004_00000004_00000008_00000004_00000004_00000010_00000004_00000004_00000010_00000004_00000004_00000002_00000020_00000004_0000001c
+ppc64
12345678_00000001_00000008_00000004_00000008_00000018_00000008_00000008_00000010_00000004_00000008_00000010_00000004_00000008_00000018_00000008_00000008_00000002_00000020_00000004_00000030
diff-tree 0fc03ffe443f4bfb1c830eb75c14ca336f2186e1 (from
76c443222313577236c898f7644098e7cad80c75)
Author: Keith Packard <keithp@neko.keithp.com>
Date: Mon Sep 11 11:09:26 2006 -0700
Update installation notes for 2.4 base.
diff --git a/INSTALL b/INSTALL
index 20925d3..1c8d3e3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -29,20 +29,25 @@ important steps:
5. make distcheck (NB: won''t work without docbook-utils -PL)
6. tag the tree
- git-tag -u 096c4dd3 -m''Version 2.3.xx'' 2.3.xx
+ git-tag -u 096c4dd3 -m ''Version 2.4.x'' 2.4.x
- 7. make Changelog-2.3.xx
- git-log 2.3.(xx-1).. > ChangeLog-2.3.xx
+ 7. make Changelog-2.4.x
+ git-log --stat 2.4.(x-1).. > ChangeLog-2.4.x
- 8. Copy ChangeLog-2.3.xx and fontconfig-2.3.xx.tar.gz to
+ 8. Copy ChangeLog-2.4.x and fontconfig-2.4.x.tar.gz to
freedesktop.org:/srv/fontconfig.freedesktop.org/www/release
9. Update the Fontconfig Devel wiki page
http://fontconfig.org/wiki/Devel
-10. Compute md5sums for release files:
- md5sum fontconfig-2.3.xx.tar.gz ChangeLog-2.3.xx
+10. Update the fontconfig documentation
+
+ scp -rp doc/fontconfig-user.html doc/fontconfig-devel
fontconfig.org:/srv/fontconfig.freedesktop.org/www
+
+11. Compute md5sums for release files:
+ md5sum fontconfig-2.4.x.tar.gz ChangeLog-2.4.x
-11. Post a note to fontconfig@fontconfig.org. Include the md5sums.
+12. Post a note to fontconfig@fontconfig.org. Include the md5sums.
gpg sign the message.
+
diff-tree 76c443222313577236c898f7644098e7cad80c75 (from
6c5619a08575943f75d2341e1a4931ec5faf716b)
Author: Keith Packard <keithp@neko.keithp.com>
Date: Sat Sep 9 22:08:40 2006 -0700
Update to version 2.4.0
diff --git a/INSTALL b/INSTALL
index ddd94f8..20925d3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -17,6 +17,9 @@ important steps:
2. Fix the README
Change version number
Set the date
+ Append the short log
+
+ git-log --pretty=short 2.4.xx | git-shortlog
3. Commit those changes
diff --git a/README b/README
index 288a53b..bd80cbb 100644
--- a/README
+++ b/README
@@ -1,12 +1,46 @@
Fontconfig
Font configuration and customization library
- Version 2.3.97
- 2006-09-06
+ Version 2.4.0
+ 2006-09-09
Check INSTALL for compilation and installation instructions.
Report bugs to https://bugs.freedesktop.org in the fontconfig module.
+2.4.0
+
+David Turner:
+ Replace character discovery loop with simpler, faster version.
+
+James Cloos:
+ Move files from conf.d to conf.avail
+ Standardize conf.avail number prefixing convention
+ Support all five possibilities for sub-pixel
+ Move user and local conf file loading into conf.avail files
+ Number the remaining conf.avail files
+ Update Makefile.am to match conf.avail changes
+ Replace load of conf.d in fonts.conf.in
+ Make room for chunks from fonts.conf in conf.avail
+ Re-order old conf.d files
+ Move some section from fonts.conf into conf.avail files
+ Update Makefile.am files
+ Make conf.avail and conf.d work
+
+Keith Packard:
+ Create fc_cachedir at install time. Bug 8157.
+ Reference patterns in FcCacheCopySet.
+ Replace gnu-specific sed command with simple grep.
+ Attempt to fix makealias usage for build on Mac OS X.
+ Accept locale environment variables that do not contain territory.
+ Merge branch ''jhcloos''
+ Insert newly created caches into reference data structure.
+ Add XML headers to new conf files. Move link make commands to conf.avail
dir
+ Rename conf.avail to conf.d
+ Fix conf.d directory sorting.
+ Include cachedir in fonts.dtd.
+ Don''t display tests for DESTDIR on make install.
+ Split much of the configuration into separate files. Renumber files
+
2.3.97
Carl Worth:
diff --git a/configure.in b/configure.in
index 3226dd0..4511113 100644
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,7 @@ dnl This is the package version number,
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.3.97)
+AM_INIT_AUTOMAKE(fontconfig, 2.4.0)
AM_MAINTAINER_MODE
dnl libtool versioning
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 927249a..0df38aa 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -52,8 +52,8 @@ typedef int FcBool;
*/
#define FC_MAJOR 2
-#define FC_MINOR 3
-#define FC_REVISION 97
+#define FC_MINOR 4
+#define FC_REVISION 0
#define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))