[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. a78cee11df5012688b5cadd5f891199aabd21c6a

[Per Olofsson]

The following commit has been merged in the master branch:
commit a78cee11df5012688b5cadd5f891199aabd21c6a
Author: Per Olofsson <pelle at dsv.su.se>
Date:   Sun Jul 19 14:39:13 2009 +0200

    unregister old defoma hints

diff --git a/debian/changelog b/debian/changelog
index 2949401..8f33f15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ lyx (1.6.3-3) UNRELEASED; urgency=low
   * Add Section: fonts to ttf-lyx.
   * Add latex-xft-fonts transitional package.
     - Delete old conffile /etc/defoma/hints/latex-xft-fonts.hints from
-      preinst.
+      preinst and unregister from defoma.
   * Add patch fix-manpage-errors which fixes errors in tex2lyx(1).
   * Simplify debian/rules even more by using the new dh override
     feature. Also use dh for quilt. Build-deps accordingly.
diff --git a/debian/latex-xft-fonts.preinst b/debian/latex-xft-fonts.preinst
index fe40095..71511ab 100644
--- a/debian/latex-xft-fonts.preinst
+++ b/debian/latex-xft-fonts.preinst
@@ -20,11 +20,16 @@ rm_conffile() {
 	fi
 }
 
+hintsfile=/etc/defoma/hints/latex-xft-fonts.hints
+
 case "$1" in
 install|upgrade)
 	if dpkg --compare-versions "$2" le "0.1-8"; then
-		rm_conffile latex-xft-fonts \
-			/etc/defoma/hints/latex-xft-fonts.hints
+		if [ -x "`which defoma-font 2>/dev/null`" ]; then
+			defoma-font purge-all $hintsfile
+		fi
+
+		rm_conffile latex-xft-fonts $hintsfile
 	fi
 esac
 

-- 
LyX packaging