[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
holger at layer-acht.org
Tue Aug 9 13:06:38 UTC 2016
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 93df524d223539465a503eac53f4e0537e93e69c
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.
(cherry-picked from 9d4539c)
---
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 2df91a6..d562146 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ debian-edu-config (1.818+deb8u2) UNRELEASED; urgency=medium
- replace iceweasel with firefox-esr in various files.
- use '/etc/firefox-esr' as place for firefox preference files.
- update Makefile.
+ - Add code to cleanup iceweasel and firefox-esr related conffiles in
+ postinst and preinst scripts.
[ Mike Gabriel ]
* Iceweasel -> Firefox transition: system-wide, non-configurable browser
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index 419bb36..8a805d7 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -227,6 +227,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 405667f..d972f9a 100644
--- a/debian/debian-edu-config.preinst
+++ b/debian/debian-edu-config.preinst
@@ -58,6 +58,32 @@ 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
+ fi
;;
esac
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git
More information about the debian-edu-commits
mailing list