summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@neko.keithp.com>2006-09-17 22:23:56 -0700
committerKeith Packard <keithp@neko.keithp.com>2006-09-17 22:23:56 -0700
commit693acf14234c486d1564415a3f28507501625850 (patch)
treeb106c2311a0062abc53f0169f40f8b72325cee8e
parent2e0ffbefff59893ac383fa4c6f994be4524626f9 (diff)
Fix fontconfig-config.config to identify both old and new conf.d contents.2.4.1-2
Was missing new-style conf.d recognition so upgrades from new-style would lose all debconf parameters.
-rw-r--r--debian/changelog15
-rw-r--r--debian/fontconfig-config.config34
2 files changed, 33 insertions, 16 deletions
diff --git a/debian/changelog b/debian/changelog
index 28520ef..8b0148c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+fontconfig (2.4.1-2) unstable; urgency=low
+
+ * Identify current debconf configuration using either
+ 2.4-style or 2.3-style link names. Link names changed in 2.4
+ with re-work of /etc/fonts/conf.d conventions. (closes: #388008)
+
+ -- Keith Packard <keithp@debian.org> Sun, 17 Sep 2006 22:10:18 -0700
+
+fontconfig (2.4.1-1) unstable; urgency=low
+
+ * Reimplement FcConfigAppFontAddDir; function was lost in 2.4.0.
+ * Move to new upstream version.
+
+ -- Keith Packard <keithp@debian.org> Fri, 15 Sep 2006 14:22:28 -0700
+
fontconfig (2.4.0-5) unstable; urgency=low
* Add signatures for m68k and mipsel
diff --git a/debian/fontconfig-config.config b/debian/fontconfig-config.config
index 54f44ed..fbe4c38 100644
--- a/debian/fontconfig-config.config
+++ b/debian/fontconfig-config.config
@@ -6,17 +6,17 @@ set -e
CONFDIR=/etc/fonts/conf.d
-
hinting_type="Native"
-hint_prio="10-debconf-"
-unhinted="unhinted.conf"
-autohint="autohint.conf"
+unhinted_2_3="10-debconf-unhinted.conf"
+unhinted_2_4="10-unhinted.conf"
+autohint_2_3="10-debconf-autohint.conf"
+autohint_2_4="10-autohint.conf"
-if [ -h $CONFDIR/$hint_prio$unhinted ]; then
+if [ -h $CONFDIR/$unhinted_2_4 -o -h $CONFDIR/$unhinted_2_3 ]; then
hinting_type="None"
fi
-if [ -h $CONFDIR/$hint_prio$autohint ]; then
+if [ -h $CONFDIR/$autohint_2_4 -o -h $CONFDIR/$autohint_2_3 ]; then
hinting_type="Autohinter"
fi
@@ -25,15 +25,16 @@ db_set fontconfig/hinting_type "$hinting_type"
subpixel_rendering="Automatic"
-subpixel_prio="20-debconf-"
-subpixel="sub-pixel.conf"
-no_subpixel="no-sub-pixel.conf"
+subpixel_2_3="20-debconf-sub-pixel.conf"
+subpixel_2_4="10-sub-pixel.conf"
+no_subpixel_2_3="20-debconf-no-sub-pixel.conf"
+no_subpixel_2_4="10-no-sub-pixel.conf"
-if [ -h $CONFDIR/$subpixel_prio$subpixel ]; then
+if [ -h $CONFDIR/$subpixel_2_4 -o -h $CONFDIR/$subpixel_2_3 ]; then
subpixel_rendering="Always"
fi
-if [ -h $CONFDIR/$subpixel_prio$no_subpixel ]; then
+if [ -h $CONFDIR/$no_subpixel_2_4 -o -h $CONFDIR/$no_subpixel_2_3 ]; then
subpixel_rendering="Never"
fi
@@ -48,15 +49,16 @@ else
enable_bitmaps="true"
fi
-bitmaps_prio="30-debconf-"
-yes_bitmaps="yes-bitmaps.conf"
-no_bitmaps="no-bitmaps.conf"
+yes_bitmaps_2_3="30-debconf-yes-bitmaps.conf"
+yes_bitmaps_2_4="70-yes-bitmaps.conf"
+no_bitmaps_2_3="30-debconf-no-bitmaps.conf"
+no_bitmaps_2_4="70-no-bitmaps.conf"
-if [ -h $CONFDIR/$bitmaps_prio$yes_bitmaps ]; then
+if [ -h $CONFDIR/$yes_bitmaps_2_4 -o -h $CONFDIR/$yes_bitmaps_2_3 ]; then
enable_bitmaps="true"
fi
-if [ -h $CONFDIR/$bitmaps_prio$no_bitmaps ]; then
+if [ -h $CONFDIR/$no_bitmaps_2_4 -o -h $CONFDIR/$no_bitmaps_2_3 ]; then
enable_bitmaps="false"
fi