[Pkg-lyx-devel] [SCM] LyX packaging branch, master, updated. upstream/2.0.0_rc1-537-g9007781

[Sven Hoexter]

The following commit has been merged in the master branch:
commit 8a856c509651c16579cfac0b8658b4e85b025b5e
Author: Sven Hoexter <sven at timegate.de>
Date:   Tue Mar 8 17:06:08 2011 +0100

    Next try to get the ttf-lyx preinst right and not bail out because of the set -e

diff --git a/debian/ttf-lyx.preinst b/debian/ttf-lyx.preinst
index 76ba4fb..884c19c 100644
--- a/debian/ttf-lyx.preinst
+++ b/debian/ttf-lyx.preinst
@@ -7,8 +7,8 @@ CFILE='/etc/defoma/hints/ttf-lyx.hints'
 if [ -f $CFILE ]; then
     if dpkg-maintscript-helper supports rm_conffile; then
 	dpkg-maintscript-helper rm_conffile $CFILE 2.0.0~beta4-1 -- "$@"
+	rm -f $CFILE.dpkg-remove
     fi
-    test -f $CFILE.dpkg-remove && rm $CFILE.dpkg-remove
 fi
 
 #DEBHELPER#

-- 
LyX packaging