From 97bde49a2b791de9ad66aed97ca07c22302da60d Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 5 Mar 2005 20:58:39 +0000 Subject: [PATCH] Josselin Mouette: Include 2.3 release information in changelog Add Josselin Mouette as an Uploader Set hinting_type to low priority configuration option Manish Singh: yes_bitmaps.conf -> yes-bitmaps.conf Funda Wang: Johap -> Johab --- ChangeLog | 20 ++++++++++++++++++++ debian/changelog | 13 +++++++++++-- debian/control | 1 + debian/fontconfig.config | 2 +- debian/fontconfig.postinst | 2 +- debian/fontconfig.templates | 4 ++-- debian/rules | 4 ++-- src/fcfreetype.c | 2 +- 8 files changed, 39 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index f12660e..d1c8028 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2005-03-05 Keith Packard + + Josselin Mouette: + * debian/changelog: + * debian/control: + * debian/fontconfig.config: + * debian/fontconfig.templates: + * debian/rules: + Include 2.3 release information in changelog + Add Josselin Mouette as an Uploader + Set hinting_type to low priority configuration option + + Manish Singh: + * debian/fontconfig.postinst: + yes_bitmaps.conf -> yes-bitmaps.conf + + Funda Wang: + * src/fcfreetype.c: + Johap -> Johab + 2005-03-02 Keith Packard * Makefile.am: diff --git a/debian/changelog b/debian/changelog index 4afe366..160fced 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,17 @@ -fontconfig (2.3.0-1) unstable; urgency=low +fontconfig (2.3.0-1) experimental; urgency=low * Change of maintainer * New upstream release - + * Support for current Freetype versions + * Multi-lingual family/style/fullname values with parallel language + tags to enable locale-sensitive presentation of these names. + * Font black- and white-listing in the configuration file + enables users to select their desired font attributes without + having to carefully construct the font directory list. + * Support for local configuration directory provides a place for system + distributors and administrators to make local changes to the font + configuration without having to edit any configuration files. + -- Keith Packard Wed, 2 Mar 2005 00:03:56 -0800 fontconfig (2.2.3-4) unstable; urgency=low diff --git a/debian/control b/debian/control index 3059202..1db85cf 100644 --- a/debian/control +++ b/debian/control @@ -2,6 +2,7 @@ Source: fontconfig Section: devel Priority: optional Maintainer: Keith Packard +Uploaders: Keith Packard , Josselin Mouette Build-Depends: cdbs (>= 0.4.5.4), debhelper (>= 4.1.76), libfreetype6-dev (>= 2.1.7), libexpat1-dev, docbook-utils (>= 0.6.13), docbook-to-man, defoma (>= 0.7.0), binutils (>= 2.12.90.0.9) Standards-Version: 3.6.1 diff --git a/debian/fontconfig.config b/debian/fontconfig.config index dd119e1..6e364ab 100755 --- a/debian/fontconfig.config +++ b/debian/fontconfig.config @@ -4,7 +4,7 @@ set -e . /usr/share/debconf/confmodule -db_input medium fontconfig/hinting_type || true +db_input low fontconfig/hinting_type || true db_input low fontconfig/subpixel_rendering || true db_input low fontconfig/enable_bitmaps || true db_go diff --git a/debian/fontconfig.postinst b/debian/fontconfig.postinst index bf6b06e..34f9176 100755 --- a/debian/fontconfig.postinst +++ b/debian/fontconfig.postinst @@ -64,7 +64,7 @@ db_get fontconfig/enable_bitmaps enable_bitmaps="$RET" bitmaps_prio="30-debconf-" -yes_bitmaps="yes_bitmaps.conf" +yes_bitmaps="yes-bitmaps.conf" no_bitmaps="no-bitmaps.conf" if [ -h $CONFDIR/$bitmaps_prio$yes_bitmaps ]; then diff --git a/debian/fontconfig.templates b/debian/fontconfig.templates index eea8802..1b5fba7 100644 --- a/debian/fontconfig.templates +++ b/debian/fontconfig.templates @@ -18,8 +18,8 @@ _Description: With what method should fonts be hinted? such hints, then the Autohinter will work better. Yes, FreeType should do this automatically. . - You can also select None to disable all hinting and make your screen look - like Mac OS X. + You can also select None to disable all hinting, causing all text + to look fuzzy on even the sharpest monitors. . Template: fontconfig/subpixel_rendering diff --git a/debian/rules b/debian/rules index ed4afd6..06922bb 100755 --- a/debian/rules +++ b/debian/rules @@ -9,11 +9,11 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/class/autotools.mk -DEB_CONFIGURE_EXTRA_FLAGS := --enable-docs --with-add-fonts=/usr/X11R6/lib/X11/fonts/Type1,/usr/local/share/fonts +DEB_CONFIGURE_EXTRA_FLAGS := --enable-docs --with-add-fonts=/usr/X11R6/lib/X11/fonts,/usr/local/share/fonts # tight versioning DEB_DH_MAKESHLIBS_ARGS_fontconfig-udeb := --no-act -DEB_DH_MAKESHLIBS_ARGS_libfontconfig1 := -V"libfontconfig1 (>= 2.2.1)" +DEB_DH_MAKESHLIBS_ARGS_libfontconfig1 := -V"libfontconfig1 (>= 2.3.0)" DEB_SHLIBDEPS_LIBRARY_fontconfig := libfontconfig1 DEB_SHLIBDEPS_INCLUDE_fontconfig := debian/libfontconfig1/usr/lib/ diff --git a/src/fcfreetype.c b/src/fcfreetype.c index 2446170..39aaa79 100644 --- a/src/fcfreetype.c +++ b/src/fcfreetype.c @@ -128,7 +128,7 @@ static const FcFtEncoding fcFtEncoding[] = { { TT_PLATFORM_MICROSOFT, TT_MS_ID_GB2312, "GB3212" }, { TT_PLATFORM_MICROSOFT, TT_MS_ID_BIG_5, "BIG-5" }, { TT_PLATFORM_MICROSOFT, TT_MS_ID_WANSUNG, "Wansung" }, - { TT_PLATFORM_MICROSOFT, TT_MS_ID_JOHAB, "Johap" }, + { TT_PLATFORM_MICROSOFT, TT_MS_ID_JOHAB, "Johab" }, { TT_PLATFORM_MICROSOFT, TT_MS_ID_UCS_4, "UCS4" }, { TT_PLATFORM_ISO, TT_ISO_ID_7BIT_ASCII, "ASCII" }, { TT_PLATFORM_ISO, TT_ISO_ID_10646, "UCS-2BE" },