[debian-edu-commits] debian-edu/ 01/04: postinst: keep link removal; move all other iceweasel/firefox cleanups to postinst.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch h01ger/jessie-proposed
in repository debian-edu-config.

commit b5076749c35f546b4eec3adc6516513f0ee9ac27
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Jul 17 20:43:00 2016 +0200

    postinst: keep link removal; move all other iceweasel/firefox cleanups to postinst.
    
    (cherry picked from commit 2ce3f32a5ca453ccb558a108d7d7e50343bfbac2)
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/debian-edu-config.preinst | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/debian/debian-edu-config.preinst b/debian/debian-edu-config.preinst
index d972f9a..9b22beb 100644
--- a/debian/debian-edu-config.preinst
+++ b/debian/debian-edu-config.preinst
@@ -58,31 +58,9 @@ upgrade)
         pam-auth-update --package --remove edu-krb5
     fi
 
-    if dpkg --compare-versions "$2" le "1.818+deb8u1" && [ -e /etc/firefox-esr ] ; then
-	if [ -e /etc/X11/Xsession.d/06debian-edu-iceweasel-ltsp ] ; then
-	    rm /etc/X11/Xsession.d/06debian-edu-iceweasel-ltsp
-        fi
-	if [ -e /etc/apt/apt.conf.d/99-edu-prefer-iceweasel ] ; then
-	    rm /etc/apt/apt.conf.d/99-edu-prefer-iceweasel
-        fi
-	if [ -e /etc/init.d/iceweasel-ldapconf ] ; then
-	    rm /etc/init.d/iceweasel-ldapconf
-        fi
-	if [ -e /etc/cfengine/debian-edu/cf.iceweasel ] ; then
-	    rm /etc/cfengine/debian-edu/cf.iceweasel
-        fi
-	if [ -e /usr/share/debian-edu-config/iceweacel-networked-prefs.js ] ; then
-	    rm /usr/share/debian-edu-config/iceweacel-networked-prefs.js
-        fi
-	if [ -L /etc/iceweasel/pref/debian-edu-networked.js ] ; then
-	    rm /etc/iceweasel/pref/debian-edu-networked.js
-        fi
-	if [ -e /etc/iceweasel/pref/debian-edu-homepage-ldap.js ] ; then
-	    rm /etc/iceweasel/pref/debian-edu-homepage-ldap.js
-        fi
-	if [ -L /etc/firefox-esr/debian-edu-networked.js ] ; then
-	    rm /etc/firefox-esr/debian-edu-networked.js
-        fi
+    # Just in case linking has already been done manually to now obsolete file.
+    if dpkg --compare-versions "$2" le "1.818+deb8u1" && [ -L /etc/firefox-esr/debian-edu-networked.js ] ; then
+	rm /etc/firefox-esr/debian-edu-networked.js
     fi
     ;;
 esac

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git