[Pkg-jed-commit] [SCM] Debian packaging of JED branch, master, updated. 1%3A0.99.18+dfsg.1-10-315-gdad8e3e

[Jörg Sommer]

The following commit has been merged in the master branch:
commit b2e19cce3360d43bd1968e2e9186ff9d13817d23
Author: Jörg Sommer <joerg at alea.gnuu.de>
Date:   Wed Feb 3 18:09:22 2010 +0100

    prerm: call update-alternatives not on upgrade
    
    The alternative shouldn't be removed while an upgrade, because this might
    discard a manual setting of the user. If the user had manually selected
    jed as default, the removal would drop this decision and the later readd
    wouldn't reinstall this decision.

diff --git a/debian/jed.prerm b/debian/jed.prerm
index 8285743..32ca5f1 100644
--- a/debian/jed.prerm
+++ b/debian/jed.prerm
@@ -2,7 +2,10 @@
 
 set -e
 
-update-alternatives --remove editor /usr/bin/jed
-update-alternatives --remove jed-script /usr/bin/jed
+if test "$1" != upgrade
+then
+    update-alternatives --remove editor /usr/bin/jed
+    update-alternatives --remove jed-script /usr/bin/jed
+fi
 
 #DEBHELPER#
diff --git a/debian/xjed.prerm b/debian/xjed.prerm
index d0296f4..5018057 100644
--- a/debian/xjed.prerm
+++ b/debian/xjed.prerm
@@ -2,7 +2,10 @@
 
 set -e
 
-update-alternatives --remove jed-script /usr/bin/xjed
-update-alternatives --remove editor /usr/bin/xjed
+if test "$1" != upgrade
+then
+    update-alternatives --remove jed-script /usr/bin/xjed
+    update-alternatives --remove editor /usr/bin/xjed
+fi
 
 #DEBHELPER#

-- 
Debian packaging of JED