[debian-edu-commits] debian-edu/ 01/08: apply patches from Wolfgang Schweer: Add code to cleanup iceweasel and firefox-esr related conffiles in postinst and preinst scripts.
Wolfgang Schweer
schweer-guest at moszumanska.debian.org
Mon Aug 8 16:47:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
schweer-guest pushed a commit to branch schweer-foo
in repository debian-edu-config.
commit 4ab81d0e5402814e4ef51a4d57138cad725c1154
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 commit 9d4539ce6ace0fe6f6efec8122a78b56ed23c232)
---
debian/changelog | 141 +++++++++++++++++++++++++++++++++++++-
debian/debian-edu-config.postinst | 11 +++
debian/debian-edu-config.preinst | 26 +++++++
3 files changed, 177 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 7f9b183..4b37919 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,7 +32,146 @@ debian-edu-config (1.818+deb8u2) UNRELEASED; urgency=medium
* testsuite/webserver: Dito (check presence of cert_override.txt in /etc/firefox-esr/,
rather than /etc/firefox/).
- -- Holger Levsen <holger at debian.org> Tue, 31 May 2016 11:23:33 +0200
+ [ 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
+
+debian-edu-config (1.905) unstable; urgency=medium
+
+ [ Wolfgang Schweer ]
+ * Replace firefox with firefox-esr to set the default browser via
+ update-alternatives.
+ * Make sure ethX style network interface names are used on networked
+ systems upon upgrade from Jessie:
+ - add cf/cf.grub.
+ - adjust cf/cfengine.conf to use cf.grub.
+ - adjust Makefile.
+
+ [ Holger Levsen ]
+ * Add manpage for snakeoil-on-ice.
+
+ -- Holger Levsen <holger at debian.org> Wed, 06 Jul 2016 13:16:50 +0200
+
+debian-edu-config (1.904) unstable; urgency=medium
+
+ [ Wolfgang Schweer ]
+ * cf/cf.ldapclient: don't purge libnss-mdns cause now cups needs mdns
+ for automatic printer detection. (Closes: #825919)
+ * dhclient-exit-hooks.d/hostname: adjust for the case of a dedicated
+ LTSP server. (Closes: #783087).
+ * Adjust ldap-tools/ldap-debian-edu-install to be compliant with systemd
+ now that unit samba.service is masked (see #769714). (Closes: #826201).
+
+ [ Holger Levsen ]
+ * cf/cf.ldapclient:
+ - remove workaround for #706434 (purging winbind) which is fixed since
+ Jessie.
+ - remove workaround (which was commented out and not used even in Jessie)
+ modifying /etc/nslcd.conf.
+ * Cleanup debian/changelog which in 1.903 was accidentally polluted by
+ cherry-picking without resolving all conflicts.
+ * Add debian/debian-edu-config.lintian-overrides for ignoring harmless
+ warnings about files in etc/dhcp/dhclient-exit-hooks.d/ not being
+ executable.
+ * Override four command-with-path-in-maintainer-script warnings as the path
+ is only used to test the existence of the tools and the suggested
+ workaround in
+ https://www.debian.org/doc/manuals/developers-reference/ \
+ ch06.en.html#bpp-debian-maint-scripts is 12 times as big.
+ * Drop unused files skolelinux-test-install.8 and
+ skolelinux-restart-services.8 from git.
+ * Mark internal templates in debian-edu-config.templates as such, thanks
+ lintian.
+
+ -- Holger Levsen <holger at debian.org> Sat, 04 Jun 2016 01:11:32 +0200
+
+debian-edu-config (1.903) unstable; urgency=medium
+
+ [ Wolfgang Schweer ]
+ * Add script sbin/debian-edu-nscd-netgroup-cache (workaround for #791562).
+ * Remove no longer provided file cf/cf.ldap2zone from cf/cfengine.conf.
+
+ -- Holger Levsen <holger at debian.org> Sat, 28 May 2016 21:15:11 +0200
+
+debian-edu-config (1.902) unstable; urgency=medium
+
+ * debian/control:
+ - add Breaks and Replaces: ldap2zone (<< 0.2-8~), thanks to
+ Andreas Beckmann! (Closes: #824802)
+ - remove Breaks on packages versions older than Jessie and on non-existant
+ packages.
+ * Drop bin/debconf-set-selections-edu workaround and use debconf's
+ debconf-set-selections as both #636219 and #711693 are fixed since Jessie.
+ * Drop share/debian-edu-config/tools/workaround-udev-bug-765577 as this has
+ been fixed in udev in Jessie.
+
+ -- Holger Levsen <holger at debian.org> Fri, 20 May 2016 01:12:26 +0200
+
+debian-edu-config (1.901) unstable; urgency=medium
+
+ [ Wolfgang Schweer ]
+ * Adjust cf/cf.krb5client to avoid overwriting /etc/krb5.conf on the
+ main server during upgrades. This way cfengine should be idempotent
+ in its operation as it is expected to be. (Closes: #779642).
+ * Adjust cf.squid (squid3 has been renamed to squid).
+ * Adjust cf.homes to make sure that autofs doesn't run on the main server.
+ * Adjust cf.dhcpserver (configuration has been split into ipv4 and ipv6).
+ * cups-files-debian-edu.conf: The replacement (d-e-c 1.818) of 'lpadmin'
+ with 'printer-admins' breaks cups-daemon on profile 'standalone'. It
+ will break cups-daemon on upgraded networked systems as well if the new
+ LDAP entry for printer-admins isn't added manually. So go back to the
+ default and leave the decision about the SystemGroup to the local admin.
+ * cf.ltsp:
+ - Adjust setting for isc-dhcp-server.
+ - Make tftpd-hpa work with multiple subdirs in tftp root dir.
+ * Adjust apt-get autoremoval operation. Don't act globally to avoid
+ possible loss of configuration data, use it only package related:
+ - remove 'apt-get autoremove -y' from cf/cf.apt.
+ - add param '--auto-remove' to all apt-get purge commands
+ in cf/cf.ldapclient (Closes: #779646).
+ * Fix /var/lib/dovecot removal code in postrm purge. (Closes: #820075).
+ * squid3 to squid renaming:
+ - replace share-/d-e-c/squid3.conf with share-/d-e-c/squid.conf.
+ - adjust share-/d-e-c/tools/webcache/squid-update-cachedir.
+ - adjust Makefile.
+ * Move from Iceweasel to Firefox ESR:
+ - rename several files containing iceweasel and also the directory
+ share/iceweasel.
+ - replace iceweasel with firefox in various files.
+ - use '/etc/firefox-esr' as place for firefox preference files.
+ - update Makefile.
+ * Adjust sbin/debian-edu-pxeinstall to use NBD for LTSP clients; this
+ is now the LTSP default, usage of NFS is broken atm (see #786925).
+ * Add file Debian-custom/001-ltsp-settings. This fixes LTSP chroot
+ installation in case that ltsp-client-builder doesn't look up another
+ mirror if cdrom is still mounted.
+ * Fix ldap2zone configuration, now that upstream changed the defaults and
+ dropped the file /etc/default/ldap2zone; adjust Makefile.
+ * PHP 7.0 transition:
+ - Move php-debian-edu.ini from etc/php5/ to etc/php/.
+ - Adjust cf/cf.apache2.
+ - Adjust Makefile.
+ * Use httpredir.debian.org instead of http.debian.net as mirror redirector.
+
+ [ Holger Levsen ]
+ * debian/control:
+ - bump standards version to 3.9.8.
+ - Vcs-Browser: use /git/ URL instead of /cgit/.
+
+ -- Holger Levsen <holger at debian.org> Thu, 19 May 2016 01:01:09 +0200
+
+debian-edu-config (1.900) unstable; urgency=medium
+
+ [ Wolfgang Schweer ]
+ * Start on 1.900 as Debian 9 is targeted.
+ * Fix XML syntax error in gosa.conf. (Closes: #820551).
+ * Remove non existent packages readahead and readahead-fedora from
+ apt purge list to not break LTSP chroot installation.
+ * cf.squid: Remove squid-to-squid3 shell command, obsolete in stretch.
+>>>>>>> 9d4539c... apply patches from Wolfgang Schweer: Add code to cleanup iceweasel and firefox-esr related conffiles in postinst and preinst scripts.
debian-edu-config (1.818+deb8u1) jessie; urgency=low
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
More information about the debian-edu-commits
mailing list