r455: * Applied a patch from Anton Zinoviev <anton@lml.bas.bg> to pass -e

     to mkfontdir. Closes: #89418

diff --git a/autoscripts/postinst-xfonts b/autoscripts/postinst-xfonts
index ae9996330dc80ac3e889cb8d3c002ec56d9fe530..af02e1248c16cae9048f498119544c1583e3a494 100644 (file)
--- a/autoscripts/postinst-xfonts
+++ b/autoscripts/postinst-xfonts
@@ -1,3 +1,12 @@
+makefontdir() {
+    ENCDIR=/usr/lib/X11/fonts/encodings
+    if [ -d $ENCDIR -a -d $ENCDIR/large ]; then
+       /usr/bin/X11/mkfontdir -e $ENCDIR -e $ENCDIR/large "$@"
+    else
+       /usr/bin/X11/mkfontdir "$@"
+    fi
+}
+
 if [ "$1" = "configure" ]; then
        fontdirs="#FONTDIRS#"
        updatecmds="#UPDATECMDS#"

diff --git a/autoscripts/postrm-xfonts b/autoscripts/postrm-xfonts
index 016a63925b1d05afc2ac3909cbdd39b3f9ba13e4..851b61f588f47baa99db676fe598411e6c59c60c 100644 (file)
--- a/autoscripts/postrm-xfonts
+++ b/autoscripts/postrm-xfonts
@@ -1,10 +1,19 @@
+makefontdir() {
+    ENCDIR=/usr/lib/X11/fonts/encodings
+    if [ -d $ENCDIR -a -d $ENCDIR/large ]; then
+       /usr/bin/X11/mkfontdir -e $ENCDIR -e $ENCDIR/large "$@"
+    else
+       /usr/bin/X11/mkfontdir "$@"
+    fi
+}
+
 fontdirs="#FONTDIRS#"
 updatecmds="#UPDATECMDS#"
 
 for currentdir in $fontdirs; do
        longdir=/usr/lib/X11/fonts/$currentdir
        if [ -d $longdir ]; then
-               for file in fonts.dir fonts.alias; do
+               for file in fonts.dir fonts.alias encodings.dir; do
                        rm -f $longdir/$file
                done
                if [ $(find $longdir| wc -l) -eq 1 ]; then

diff --git a/debian/changelog b/debian/changelog
index 062d2c59d6ff22fef58660f43bb069a50dd63e61..6faf5ef5fcf963783973e4b1e3476e064cbf9a2c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (3.0.12) unstable; urgency=low
+
+  * Applied a patch from Anton Zinoviev <anton@lml.bas.bg> to pass -e
+    to mkfontdir. Closes: #89418
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 16 Mar 2001 21:03:29 -0800
+
 debhelper (3.0.11) unstable; urgency=low
 
   * dh_makeshlibs: don't follow links to .so files. Instead, we will look

diff --git a/dh_installxfonts b/dh_installxfonts
index bf0ec0fee552ed9c720c74b4ad74b2b794ee11a1..7a50c597863a26a2997777489b54eb313dbe8e1a 100755 (executable)
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -48,7 +48,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
        if (@fontdirs) {
                # Figure out what commands the postinst will need to call.
-               my @updatecmds=('/usr/bin/X11/mkfontdir');
+               my @updatecmds=('makefontdir');
                foreach my $f (@fontdirs) {
                        push @updatecmds, '/usr/sbin/update-fonts-alias'
                                if -f "$tmp/etc/X11/fonts/$f/$package.alias";