[debian-edu-commits] debian-edu/ 05/07: kickoffrc: Use firefox-esr.desktop, rather than firefox.desktop.

[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 7e3c74038a9e3bd1ee420a94d8db62ab8e5e4dcd
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 7 12:31:00 2016 +0200

    kickoffrc: Use firefox-esr.desktop, rather than firefox.desktop.
    
    (cherry picked from commit 37239e2b37e7793edeafaa136732ed55d4102e8f)
---
 debian/changelog                               | 1 +
 share/debian-edu/common/share/config/kickoffrc | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3a5c77c..8862bb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ debian-edu-config (1.818+deb8u2) UNRELEASED; urgency=medium
     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.
+  * kickoffrc: Use firefox-esr.desktop, rather than firefox.desktop.
 
  -- Holger Levsen <holger at debian.org>  Tue, 31 May 2016 11:23:33 +0200
 
diff --git a/share/debian-edu/common/share/config/kickoffrc b/share/debian-edu/common/share/config/kickoffrc
index 1efa5df..6b295f3 100644
--- a/share/debian-edu/common/share/config/kickoffrc
+++ b/share/debian-edu/common/share/config/kickoffrc
@@ -1,2 +1,2 @@
 [Favorites]
-FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/lib/libreoffice/share/xdg/writer.desktop,/usr/share/applications/gcompris.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop
+FavoriteURLs=/usr/share/applications/firefox-esr.desktop,/usr/lib/libreoffice/share/xdg/writer.desktop,/usr/share/applications/gcompris.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop

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