[debian-edu-commits] debian-edu/ 01/01: apply patches from Wolfgang Schweer: Add code to cleanup iceweasel and firefox-esr related conffiles in postinst and preinst scripts.

[Holger Levsen]

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

holger pushed a commit to branch master
in repository debian-edu-config.

commit 9d4539ce6ace0fe6f6efec8122a78b56ed23c232
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Jul 10 11:21:17 2016 +0200

    apply patches from Wolfgang Schweer: Add code to cleanup iceweasel and firefox-esr related conffiles in postinst and preinst scripts.
---
 debian/changelog                  |  2 ++
 debian/debian-edu-config.postinst | 11 +++++++++++
 debian/debian-edu-config.preinst  | 26 ++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1c2af53..668e5c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ debian-edu-config (1.906) UNRELEASED; urgency=medium
 
   [ Wolfgang Schweer ]
   * Adopt Makefile for firefox-esr.
+  * Add code to cleanup iceweasel and firefox-esr related conffiles in
+    postinst and preinst scripts.
 
  -- Mike Gabriel <sunweaver at debian.org>  Thu, 07 Jul 2016 12:01:08 +0200
 
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index a0b192f..b4bc494 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -236,6 +236,17 @@ configure)
 	rm_conffile debian-edu-config /etc/powerdns/pdns.d/pdns-debian-edu.conf
     fi
 
+    if dpkg --compare-versions "$2" le "1.818+deb8u1" && [ -e /etc/firefox-esr ] ; then
+	# for networked profiles only.
+	if egrep Standalone /etc/debian-edu/config; then
+	    :
+        else
+	    if ! [ -e /etc/firefox-esr/debian-edu-networked.js ] ; then
+	        ln -s /usr/share/debian-edu-config/firefox-networked-prefs.js /etc/firefox-esr/debian-edu-networked.js
+	    fi
+        fi
+    fi
+
     # sssd refuses to read the file if it has any other mode
     chmod 600 /etc/sssd/sssd-debian-edu.conf
     chown root:root /etc/sssd/sssd-debian-edu.conf
diff --git a/debian/debian-edu-config.preinst b/debian/debian-edu-config.preinst
index d78ed68..2e34148 100644
--- a/debian/debian-edu-config.preinst
+++ b/debian/debian-edu-config.preinst
@@ -49,6 +49,32 @@ upgrade)
 	rm_conffile debian-edu-config /etc/init.d/open-backdoor
     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
+    fi
     ;;
 esac
 

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