[debian-edu-commits] debian-edu/ branch schweer-foo deleted (was 3810348)

[Holger Levsen]

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

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

       was  3810348   fix forgotten Makefile conflict issue.

This change permanently discards the following revisions:

  discards  3810348   fix forgotten Makefile conflict issue.
  discards  4503c9b   Adjust cf.krb5client to ensure that cfengine runs are idempotent. (Closes: #779642) - Patch taken from master branch from Wolfgang.
  discards  a55c29f   Move code to cleanup /usr/share/pam-configs/krb5 diversion from postinst to preinst to ease upgrades from old wheezy installations. (Closes: #779641)
  discards  483b3fc   Add changelog entries for the last firefox-esr related commits.
  discards  d2c3c14   Move debian-edu.js -> etc/firefox-esr/debian-edu.js as this is the location for syspref now.
  discards  ac970f8   Adjust cf.firefox-esr as the profile directory is no longer useful for the certificate override file.
  discards  0d7eec6   Adjust sbin/snakeoil-on-ice as only the /etc/skel location on the main server seems to be useful for the certificate override file.
  discards  45a0b74   Adjust testsuite/ltsp and testsuite/ltspwebserver as /etc/firefox-esr/cert_override.txt is no longer useful.
  discards  cc69366   moved icweasel/firefox cleanup code to postinst just in case firefox-esr and d-e-c are installed concurrently.
  discards  baf6e0e   postinst: keep link removal; move all other iceweasel/firefox cleanups to postinst.
  discards  4ab81d0   apply patches from Wolfgang Schweer: Add code to cleanup iceweasel and firefox-esr related conffiles in postinst and preinst scripts.

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