[debian-edu-commits] debian-edu/ 04/07: debian/dirs: We ship /etc/firefox-esr, not /etc/firefox.

[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 84f855ae93937f655959d8ebd77de264ede5ccac
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 7 12:29:08 2016 +0200

    debian/dirs: We ship /etc/firefox-esr, not /etc/firefox.
    
    (cherry picked from commit 8c1937a8f55f3850ba459cbe2a28a682484fa1ed)
---
 debian/changelog | 1 +
 debian/dirs      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e5a274c..3a5c77c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ debian-edu-config (1.818+deb8u2) UNRELEASED; urgency=medium
   * sbin/snake-on-ice: Rename /etc/firefox to /etc/firefox-esr. Only
     declare OVERRIDE_FILE once and then use it accordingly (instead
     of hard-coding /etc/firefox(-esr) several times. Use more quotes.
+  * debian/dirs: We ship /etc/firefox-esr, not /etc/firefox.
 
  -- Holger Levsen <holger at debian.org>  Tue, 31 May 2016 11:23:33 +0200
 
diff --git a/debian/dirs b/debian/dirs
index bd97b70..51ed88e 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -8,7 +8,7 @@ etc/cron.d
 etc/cups
 etc/debian-edu
 etc/default
-etc/firefox
+etc/firefox-esr
 etc/init.d
 etc/ldap/schema
 etc/ldap/ssl

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