Author: branden
Date: 2004-03-25 17:20:48 -0500 (Thu, 25 Mar 2004)
New Revision: 1182
Modified:
trunk/debian/changelog
trunk/debian/xfonts-scalable.postinst.in
trunk/debian/xfonts-scalable.postrm.in
Log:
If defoma-app and fontconfig's defoma script are available, invoke
"defoma-app update fontconfig" on package configuration and removal;
otherwise, use fc-cache as before. (Closes: #238797)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-03-25 21:49:16 UTC (rev 1181)
+++ trunk/debian/changelog 2004-03-25 22:20:48 UTC (rev 1182)
@@ -39,8 +39,12 @@
* Stop shipping the generated files encodings.dir, fonts.cache-1, fonts.dir,
and fonts.scale in the xfonts-scalable package. (Closes: #238555)
- -- Branden Robinson <[EMAIL PROTECTED]> Thu, 25 Mar 2004 16:43:06 -0500
+ * If defoma-app and fontconfig's defoma script are available, invoke
+ "defoma-app update fontconfig" on package configuration and removal;
+ otherwise, use fc-cache as before. (Closes: #238797)
+ -- Branden Robinson <[EMAIL PROTECTED]> Thu, 25 Mar 2004 17:19:01 -0500
+
xfree86 (4.3.0-7) unstable; urgency=medium
* Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
Modified: trunk/debian/xfonts-scalable.postinst.in
===================================================================
--- trunk/debian/xfonts-scalable.postinst.in 2004-03-25 21:49:16 UTC (rev
1181)
+++ trunk/debian/xfonts-scalable.postinst.in 2004-03-25 22:20:48 UTC (rev
1182)
@@ -1,10 +1,12 @@
#!/bin/sh
# Debian xfonts-scalable package post-installation script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998--2001, 2004 Branden Robinson.
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+# $Id$
+
set -e
THIS_PACKAGE=xfonts-scalable
@@ -15,9 +17,17 @@
#DEBHELPER#
FONTDIRS="Speedo Type1"
-UPDATECMDS="update-fonts-scale update-fonts-dir fc-cache"
+UPDATECMDS="update-fonts-scale update-fonts-dir"
+
+if which defoma-app >/dev/null 2>&1 && \
+ [ -e /usr/share/defoma/scripts/fontconfig.defoma ]; then
+ defoma-app update fontconfig
+else
+ UPDATECMDS="$UPDATECMDS fc-cache"
+fi
+
font_update
exit 0
-# vim:ai:et:sts=2:sw=2:tw=0:
+# vim:set ai et sts=2 sw=2 tw=0:
Modified: trunk/debian/xfonts-scalable.postrm.in
===================================================================
--- trunk/debian/xfonts-scalable.postrm.in 2004-03-25 21:49:16 UTC (rev
1181)
+++ trunk/debian/xfonts-scalable.postrm.in 2004-03-25 22:20:48 UTC (rev
1182)
@@ -1,10 +1,12 @@
#!/bin/sh
# Debian xfonts-scalable package post-removal script
-# Copyright 1998-2001 Branden Robinson.
+# Copyright 1998--2001, 2004 Branden Robinson.
# Licensed under the GNU General Public License, version 2. See the file
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+# $Id$
+
set -e
THIS_PACKAGE=xfonts-scalable
@@ -18,16 +20,25 @@
"$1" = "remove" -o \
"$1" = "disappear" ]; then
FONTDIRS="Speedo Type1"
- UPDATECMDS="update-fonts-scale update-fonts-dir fc-cache"
+ UPDATECMDS="update-fonts-scale update-fonts-dir"
+
+ if which defoma-app >/dev/null 2>&1 && \
+ [ -e /usr/share/defoma/scripts/fontconfig.defoma ]; then
+ defoma-app update fontconfig
+ else
+ UPDATECMDS="$UPDATECMDS fc-cache"
+ fi
+
font_update
fi
if [ "$1" = "purge" ]; then
- for DIR in /etc/X11/fonts/Speedo /etc/X11/fonts/Type1 /etc/X11/fonts
/etc/X11; do
- rmdir $DIR 2> /dev/null || true
+ for DIR in /etc/X11/fonts/Speedo /etc/X11/fonts/Type1 /etc/X11/fonts \
+ /etc/X11; do
+ rmdir $DIR 2>/dev/null || true
done
fi
exit 0
-# vim:ai:et:sts=2:sw=2:tw=0:
+# vim:set ai et sts=2 sw=2 tw=0:
