[debian-edu-commits] debian-edu/ 01/01: Iceweasel -> Firefox transition: system-wide, non-configurable browser defaults now go into /usr/share/firefox-esr/browser/defaults/, not /usr/share/firefox-esr/defaults/.

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository debian-edu-config.

commit 41330ca397a9d282162511b95adc06a06bafe040
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 7 12:01:08 2016 +0200

    Iceweasel -> Firefox transition: system-wide, non-configurable browser defaults now go into /usr/share/firefox-esr/browser/defaults/, not /usr/share/firefox-esr/defaults/.
---
 Makefile                                                           | 2 +-
 debian/changelog                                                   | 7 ++++++-
 .../browser}/defaults/preferences/debian-edu.js                    | 0
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 128d920..95b0833 100644
--- a/Makefile
+++ b/Makefile
@@ -455,7 +455,7 @@ install: install-testsuite
 		share/debian-edu-config/rsyslog-collector \
 		share/debian-edu-config/firefox-networked-prefs.js \
 		share/debian-edu-config/squid.conf \
-		share/firefox/defaults/preferences/debian-edu.js \
+		share/firefox-esr/browser/defaults/preferences/debian-edu.js \
 		share/pam-configs/edu-group \
 		share/pam-configs/edu-umask \
 		share/perl5/Debian/Edu.pm \
diff --git a/debian/changelog b/debian/changelog
index 0834a45..a31c3ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debian-edu-config (1.905) unstable; urgency=medium
+debian-edu-config (1.905) UNRELEASED; urgency=medium
 
   [ Wolfgang Schweer ]
   * Replace firefox with firefox-esr to set the default browser via
@@ -12,6 +12,11 @@ debian-edu-config (1.905) unstable; urgency=medium
   [ Holger Levsen ]
   * Add manpage for snakeoil-on-ice. 
 
+  [ Mike Gabriel ]
+  * Iceweasel -> Firefox transition: system-wide, non-configurable browser
+    defaults now go into /usr/share/firefox-esr/browser/defaults/, not
+    /usr/share/firefox-esr/defaults/.
+
  -- Holger Levsen <holger at debian.org>  Wed, 06 Jul 2016 13:16:50 +0200
 
 debian-edu-config (1.904) unstable; urgency=medium
diff --git a/share/firefox/defaults/preferences/debian-edu.js b/share/firefox-esr/browser/defaults/preferences/debian-edu.js
similarity index 100%
rename from share/firefox/defaults/preferences/debian-edu.js
rename to share/firefox-esr/browser/defaults/preferences/debian-edu.js

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