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

[Sven Hoexter]

The following commit has been merged in the master branch:
commit 4939633c99220187bd0254865282dee4665f6e19
Author: Sven Hoexter <sven at timegate.de>
Date:   Tue Mar 8 20:21:21 2011 +0100

    Add ttf-lyx.post(inst|rm) and use dpkg-maint-script-helper rm_conffile as designed.

diff --git a/debian/changelog b/debian/changelog
index cd070f2..b28474b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lyx (2.0.0~rc1-2) UNRELEASED; urgency=low
+
+  * Add ttf-lyx.post(inst|rm) and use dpkg-maint-script-helper rm_conffile
+    as designed.
+
+ -- Sven Hoexter <hoexter at debian.org>  Tue, 08 Mar 2011 20:20:53 +0100
+
 lyx (2.0.0~rc1-1) unstable; urgency=low
 
   [ Per Olofsson ]
diff --git a/debian/ttf-lyx.postinst b/debian/ttf-lyx.postinst
new file mode 100644
index 0000000..f891a38
--- /dev/null
+++ b/debian/ttf-lyx.postinst
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e 
+
+CFILE='/etc/defoma/hints/ttf-lyx.hints'
+dpkg-maintscript-helper rm_conffile $CFILE 2.0.0~rc1-1 -- "$@"
+
+#DEBHELPER#
diff --git a/debian/ttf-lyx.postrm b/debian/ttf-lyx.postrm
new file mode 100644
index 0000000..5ef3c69
--- /dev/null
+++ b/debian/ttf-lyx.postrm
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e 
+
+CFILE='/etc/defoma/hints/ttf-lyx.hints'
+dpkg-maintscript-helper rm_conffile $CFILE 2.0.0~beta4-1 -- "$@"
+
+#DEBHELPER#
diff --git a/debian/ttf-lyx.preinst b/debian/ttf-lyx.preinst
index 884c19c..0e97364 100644
--- a/debian/ttf-lyx.preinst
+++ b/debian/ttf-lyx.preinst
@@ -3,12 +3,8 @@
 set -e 
 
 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
+if dpkg-maintscript-helper supports rm_conffile; then
+    dpkg-maintscript-helper rm_conffile $CFILE 2.0.0~beta4-1 -- "$@"
 fi
 
 #DEBHELPER#

-- 
LyX packaging