[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 jessie
in repository debian-edu-config.

commit ec706a818f41cff7e642220a227ae44b500f17da
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/.
    
    (cherry picked from commit 41330ca397a9d282162511b95adc06a06bafe040)
    
    Conflicts (resolved by Mike Gabriel):
    	Makefile
    	debian/changelog
---
 Makefile                                                             | 2 +-
 debian/changelog                                                     | 5 +++++
 .../browser}/defaults/preferences/debian-edu.js                      | 0
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2c1292a..4f46a34 100644
--- a/Makefile
+++ b/Makefile
@@ -454,7 +454,7 @@ install: install-testsuite
 		share/debian-edu-config/rsyslog-collector \
 		share/debian-edu-config/firefox-networked-prefs.js \
 		share/debian-edu-config/squid3.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 628d148..61da6dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,11 @@ debian-edu-config (1.818+deb8u2) UNRELEASED; urgency=medium
     - use '/etc/firefox-esr' as place for firefox preference files.
     - update Makefile.
 
+  [ 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>  Tue, 31 May 2016 11:23:33 +0200
 
 debian-edu-config (1.818+deb8u1) jessie; urgency=low
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