[debian-edu-commits] debian-edu/ 01/01: Replace wheezy with jessie in cf/cf.apt.

[Wolfgang Schweer]

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

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

commit f721319858c1f340a41239c35b1475b4afefaf62
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Sep 14 12:49:44 2014 +0200

    Replace wheezy with jessie in cf/cf.apt.
---
 cf/cf.apt        | 20 ++++++++++----------
 debian/changelog |  4 ++++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/cf/cf.apt b/cf/cf.apt
index b975808..e114d8a 100644
--- a/cf/cf.apt
+++ b/cf/cf.apt
@@ -4,28 +4,28 @@ editfiles:
 
     { /etc/apt/sources.list
       HashCommentLinesStarting "deb cdrom:"
-      HashCommentLinesStarting "deb http://security.debian.org/ wheezy/updates main"
-      AppendIfNoSuchLine "deb http://security.debian.org/ wheezy/updates main contrib non-free"
+      HashCommentLinesStarting "deb http://security.debian.org/ jessie/updates main"
+      AppendIfNoSuchLine "deb http://security.debian.org/ jessie/updates main contrib non-free"
       AppendIfNoSuchLine "### Use (by uncommenting) either http or ftp, NOT both"
       AppendIfNoSuchLine "### http based apt source: ----------------"
-      AppendIfNoSuchLine "deb http://http.debian.net/debian wheezy main contrib non-free"
+      AppendIfNoSuchLine "deb http://http.debian.net/debian jessie main contrib non-free"
       AppendIfNoSuchLine "### ftp based apt source: -----------------"
-      AppendIfNoSuchLine "# deb ftp://ftp.debian.org/debian/ wheezy main contrib non-free"
-      AppendIfNoSuchLine "# deb ftp://ftp.skolelinux.org/skolelinux/ wheezy local"
+      AppendIfNoSuchLine "# deb ftp://ftp.debian.org/debian/ jessie main contrib non-free"
+      #AppendIfNoSuchLine "# deb ftp://ftp.skolelinux.org/skolelinux/ jessie local"
     }
 
   debian.ltspserver::
     # A copy of the above
     { /opt/ltsp/$(ltsp_arch)/etc/apt/sources.list
       HashCommentLinesStarting "deb file:"
-      HashCommentLinesStarting "deb http://security.debian.org/ wheezy/updates main"
-      AppendIfNoSuchLine "deb http://security.debian.org/ wheezy/updates main contrib non-free"
+      HashCommentLinesStarting "deb http://security.debian.org/ jessie/updates main"
+      AppendIfNoSuchLine "deb http://security.debian.org/ jessie/updates main contrib non-free"
       AppendIfNoSuchLine "### Use (by uncommenting) either http or ftp, NOT both"
       AppendIfNoSuchLine "### http based apt source: ----------------"
-      AppendIfNoSuchLine "deb http://http.debian.net/debian wheezy main contrib non-free"
+      AppendIfNoSuchLine "deb http://http.debian.net/debian jessie main contrib non-free"
       AppendIfNoSuchLine "### ftp based apt source: -----------------"
-      AppendIfNoSuchLine "#deb ftp://ftp.debian.org/debian/ wheezy main contrib non-free"
-      AppendIfNoSuchLine "#deb ftp://ftp.skolelinux.org/skolelinux/ wheezy local"
+      AppendIfNoSuchLine "#deb ftp://ftp.debian.org/debian/ jessie main contrib non-free"
+      AppendIfNoSuchLine "#deb ftp://ftp.skolelinux.org/skolelinux/ jessie local"
     }
 
 shellcommands:
diff --git a/debian/changelog b/debian/changelog
index 8691822..c68646e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 debian-edu-config (1.800) UNRELEASED; urgency=low
 
+  [ Petter Reinholdtsen ]
   * Start on 1.800 as we are targeting Debian 8.
   * Improve log messages from run-at-firstboot, to make it clearer what
     is going on.
@@ -9,6 +10,9 @@ debian-edu-config (1.800) UNRELEASED; urgency=low
     ltsp-build-client/Debian-custom/032-edu-pkgs.
   * Fix typo in debian-edu-ltsp script, breaking when --arch is used.
 
+  [ Wolfgang Schweer ]
+  * Replace wheezy with jessie in cf/cf.apt.
+
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 12 Sep 2014 09:20:57 +0200
 
 debian-edu-config (1.727) unstable; urgency=high

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