[debian-edu-commits] debian-edu/ 01/01: restore 1.905 changelog entry and start 1.906 one

[Holger Levsen]

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

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

commit af69b50649c186b25828441c0b85785609e186c9
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Jul 8 18:40:42 2016 +0200

    restore 1.905 changelog entry and start 1.906 one
---
 debian/changelog | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 003102d..7d5bdd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,4 @@
-debian-edu-config (1.905) UNRELEASED; urgency=medium
-
-  [ Wolfgang Schweer ]
-  * Replace firefox with firefox-esr to set the default browser via
-    update-alternatives.
-  * Make sure ethX style network interface names are used on networked
-    systems upon upgrade from Jessie:
-    - add cf/cf.grub.
-    - adjust cf/cfengine.conf to use cf.grub.
-    - adjust Makefile.
-
-  [ Holger Levsen ]
-  * Add manpage for snakeoil-on-ice. 
+debian-edu-config (1.906) UNRELEASED; urgency=medium
 
   [ Mike Gabriel ]
   * Iceweasel -> Firefox transition: system-wide, non-configurable browser
@@ -29,6 +17,25 @@ debian-edu-config (1.905) UNRELEASED; urgency=medium
   * testsuite/webserver: Dito (check presence of cert_override.txt in /etc/firefox-esr/,
     rather than /etc/firefox/).
 
+  [ Wolfgang Schweer ]
+  * Adopt Makefile for firefox-esr.
+
+ -- Mike Gabriel <sunweaver at debian.org>, Thu, 07 Jul 2016 12:01:08 +0200
+
+debian-edu-config (1.905) unstable; urgency=medium
+
+  [ Wolfgang Schweer ]
+  * Replace firefox with firefox-esr to set the default browser via
+    update-alternatives.
+  * Make sure ethX style network interface names are used on networked
+    systems upon upgrade from Jessie:
+    - add cf/cf.grub.
+    - adjust cf/cfengine.conf to use cf.grub.
+    - adjust Makefile.
+
+  [ Holger Levsen ]
+  * Add manpage for snakeoil-on-ice. 
+
  -- Holger Levsen <holger at debian.org>  Wed, 06 Jul 2016 13:16:50 +0200
 
 debian-edu-config (1.904) unstable; urgency=medium

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