[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/1.6.4-445-gb8e4ab6

[Per Olofsson]

The following commit has been merged in the master branch:
commit b8e4ab6e5f8a851beed2b0d0c3f3aefc98e85c5e
Author: Per Olofsson <pelle at dsv.su.se>
Date:   Thu Sep 24 21:56:59 2009 +0200

    Only unregister latex-xft-fonts from defoma if we're upgrading, not on new installations. Otherwise installation might fail. Closes: #548119.

diff --git a/debian/changelog b/debian/changelog
index 015e7b1..49bc4eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ lyx (1.6.4-2) UNRELEASED; urgency=low
   * Modify build-dep on quilt so it accepts backported quilt as well.
   * Remove "obvious" Suggests (lpr, www-browser).
   * Remove conflicts and replaces, as they were only needed pre-lenny.
+  * Only unregister latex-xft-fonts from defoma if we're upgrading, not
+    on new installations. Otherwise installation might fail.
+    Closes: #548119.
 
  -- Per Olofsson <pelle at debian.org>  Sun, 30 Aug 2009 12:06:07 +0200
 
diff --git a/debian/latex-xft-fonts.preinst b/debian/latex-xft-fonts.preinst
index 5cc89b5..6605d6e 100644
--- a/debian/latex-xft-fonts.preinst
+++ b/debian/latex-xft-fonts.preinst
@@ -25,8 +25,8 @@ hintsfile=/etc/defoma/hints/latex-xft-fonts.hints
 case "$1" in
 install|upgrade)
 	if dpkg --compare-versions "$2" le "0.1-8"; then
-		if [ -x "`which defoma-font 2>/dev/null`" ] && \
-			[ -f $hintsfile ]; then
+		if [ "$1" = upgrade ] && [ -f $hintsfile ] && \
+			[ -x "`which defoma-font 2>/dev/null`" ]; then
 			defoma-font purge-all $hintsfile
 		fi
 

-- 
LyX packaging