[debian-edu-commits] debian-edu/ branch master updated (142bee6 -> 2f98578)

[Wolfgang Schweer]

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

schweer-guest pushed a change to branch master
in repository debian-edu-config.

      from  142bee6   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.
       new  2f98578   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.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Makefile                                           | 14 +++++++-------
 cf/{cf.iceweasel => cf.firefox}                    | 16 ++++++++--------
 cf/cf.squid                                        |  4 ++--
 cf/cfengine.conf                                   |  2 +-
 debian/changelog                                   |  6 ++++++
 ...ldapconf => debian-edu-config.firefox-ldapconf} | 10 +++++-----
 debian/dirs                                        |  2 +-
 debian/rules                                       |  2 +-
 ...du-iceweasel-ltsp => 06debian-edu-firefox-ltsp} |  0
 etc/apt/apt.conf.d/99-edu-prefer-firefox           |  7 +++++++
 etc/apt/apt.conf.d/99-edu-prefer-iceweasel         |  7 -------
 sbin/snakeoil-on-ice                               | 22 +++++++++++-----------
 ...tworked-prefs.js => firefox-networked-prefs.js} |  6 +++---
 ...easel-plugin-support => firefox-plugin-support} |  2 +-
 ...-iceweasel-homepage => update-firefox-homepage} |  6 +++---
 .../common/share/apps/kicker/default-apps          |  2 +-
 share/debian-edu/common/share/config/kickoffrc     |  2 +-
 .../defaults/preferences/debian-edu.js             |  2 +-
 .../ltsp-build-client/Debian-custom/032-edu-pkgs   |  2 +-
 testsuite/ltsp                                     |  2 +-
 testsuite/webserver                                |  2 +-
 21 files changed, 62 insertions(+), 56 deletions(-)
 rename cf/{cf.iceweasel => cf.firefox} (72%)
 rename debian/{debian-edu-config.iceweasel-ldapconf => debian-edu-config.firefox-ldapconf} (80%)
 rename etc/X11/Xsession.d/{06debian-edu-iceweasel-ltsp => 06debian-edu-firefox-ltsp} (100%)
 create mode 100644 etc/apt/apt.conf.d/99-edu-prefer-firefox
 delete mode 100644 etc/apt/apt.conf.d/99-edu-prefer-iceweasel
 rename share/debian-edu-config/{iceweacel-networked-prefs.js => firefox-networked-prefs.js} (55%)
 rename share/debian-edu-config/tools/{iceweasel-plugin-support => firefox-plugin-support} (92%)
 rename share/debian-edu-config/tools/{update-iceweasel-homepage => update-firefox-homepage} (79%)
 rename share/{iceweasel => firefox}/defaults/preferences/debian-edu.js (96%)

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