[debian-edu-commits] debian-edu/ branch jessie updated (94ec61a -> 0785ce6)

[Holger Levsen]

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

holger pushed a change to branch jessie
in repository debian-edu-config.

      from  94ec61a   Adjust cf.krb5client to ensure that cfengine runs are idempotent. (Closes: #779642) - Patch taken from master branch from Wolfgang.
      adds  93df524   apply patches from Wolfgang Schweer: Add code to cleanup iceweasel and firefox-esr related conffiles in postinst and preinst scripts.
      adds  b507674   postinst: keep link removal; move all other iceweasel/firefox cleanups to postinst.
      adds  074d4dc   moved icweasel/firefox cleanup code to postinst just in case firefox-esr and d-e-c are installed concurrently.
      adds  3710c32   Adjust testsuite/ltsp and testsuite/ltspwebserver as /etc/firefox-esr/cert_override.txt is no longer useful.
      adds  28a6401   Adjust sbin/snakeoil-on-ice as only the /etc/skel location on the main server seems to be useful for the certificate override file.
      adds  242f153   Adjust cf.firefox-esr as the profile directory is no longer useful for the certificate override file.
      adds  6c7ce5d   Move debian-edu.js -> etc/firefox-esr/debian-edu.js as this is the location for syspref now.
      adds  1bff502   Add changelog entries for the last firefox-esr related commits.
      adds  0785ce6   Fix Makefile, needed to be in sync with commit 5dbb15f1 (master branch).

No new revisions were added by this update.

Summary of changes:
 Makefile                                           |   2 +-
 cf/cf.firefox-esr                                  |  10 +-
 debian/changelog                                   |   8 ++
 debian/debian-edu-config.postinst                  |  33 ++++++
 debian/debian-edu-config.preinst                   |   4 +
 .../preferences => etc/firefox-esr}/debian-edu.js  |   0
 sbin/snakeoil-on-ice                               | 119 ++++-----------------
 testsuite/ltsp                                     |   5 +-
 testsuite/webserver                                |  15 ++-
 9 files changed, 76 insertions(+), 120 deletions(-)
 rename {share/firefox-esr/browser/defaults/preferences => etc/firefox-esr}/debian-edu.js (100%)
 mode change 100644 => 100755 sbin/snakeoil-on-ice

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