[debian-edu-commits] debian-edu/ 01/07: Rename cf.firefox to cf.firefox-esr and make sure it operated on /etc/firefox-esr.

[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 491c5a1270dadfebd2895bbd26bcc907c22e03de
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 7 12:16:22 2016 +0200

    Rename cf.firefox to cf.firefox-esr and make sure it operated on /etc/firefox-esr.
    
    (cherry picked from commit e10fade1d2f6b2f421904b9539e1e1939b89d057)
    
    Conflicts (resolved by Mike Gabriel):
    	cf/cfengine.conf
    	debian/changelog
---
 cf/{cf.firefox => cf.firefox-esr} | 2 +-
 cf/cfengine.conf                  | 2 +-
 debian/changelog                  | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cf/cf.firefox b/cf/cf.firefox-esr
similarity index 97%
rename from cf/cf.firefox
rename to cf/cf.firefox-esr
index 4ecd35c..89fd0e0 100644
--- a/cf/cf.firefox
+++ b/cf/cf.firefox-esr
@@ -10,7 +10,7 @@
 directories:
 	# Check file system is prepared for the local firefox default profile.
 	debian.installation.!standalone::
-		/etc/firefox/profile mode=755 owner=root group=root
+		/etc/firefox-esr/profile mode=755 owner=root group=root
 
 	# Check file system is prepared for inclusion in new users home directories.
 	debian.installation.server::
diff --git a/cf/cfengine.conf b/cf/cfengine.conf
index 2b96199..2b7062f 100644
--- a/cf/cfengine.conf
+++ b/cf/cfengine.conf
@@ -101,7 +101,7 @@ import:
 			cf.dhcpserver
 			cf.exim
 			cf.fstab
-			cf.firefox
+			cf.firefox-esr
 			cf.imap
 			cf.inetd
 			cf.kdm
diff --git a/debian/changelog b/debian/changelog
index 079055d..57f565d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ debian-edu-config (1.818+deb8u2) UNRELEASED; urgency=medium
   * Iceweasel -> Firefox transition: system-wide, non-configurable browser
     defaults now go into /usr/share/firefox-esr/browser/defaults/, not
     /usr/share/firefox/defaults/.
+  * Rename cf.firefox to cf.firefox-esr and make sure it operated on
+   /etc/firefox-esr.
 
  -- Holger Levsen <holger at debian.org>  Tue, 31 May 2016 11:23:33 +0200
 

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