[debian-edu-commits] debian-edu/ 01/01: Cleanup sources.list.* and add sources.list.README.

[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.

commit 2c053b4c92aa51fa873e988f6b5fef6feee044d5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Oct 20 14:10:56 2014 +0200

    Cleanup sources.list.* and add sources.list.README.
    
    Update sources.list.(jessie|stable|wheezy-test) to use http.debian.net as
    mirror, add sources.list.README,
    remove sources.list.(experimental|squeeze-test|lenny|karmic).
---
 debian/changelog          | 4 +++-
 sources.list.README       | 9 +++++++++
 sources.list.experimental | 5 -----
 sources.list.jessie       | 2 +-
 sources.list.karmic       | 1 -
 sources.list.lenny        | 2 --
 sources.list.squeeze-test | 3 ---
 sources.list.stable       | 2 +-
 sources.list.wheezy-test  | 2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 812ee95..c7d65aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,9 @@ debian-edu (1.808) unstable; urgency=high
     whole KDE plasma desktop (#765624).
 
   [ Holger Levsen ]
-  * Add sources.list.jessie.
+  * Add sources.list.jessie, update sources.list.(stable|wheezy-test) to
+    use http.debian.net as mirror, add sources.list.README, remove
+    sources.list.(experimental|squeeze-test|lenny|karmic).
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 16 Oct 2014 21:34:25 +0200
 
diff --git a/sources.list.README b/sources.list.README
new file mode 100644
index 0000000..a5746d2
--- /dev/null
+++ b/sources.list.README
@@ -0,0 +1,9 @@
+README for sources.list.*
+-------------------------
+
+This sources list is used for the Debian Edu .iso builds as well as for
+generating the tasks and controlfiles when running "make dist" as part
+of the source package build.
+
+sources.list.unstable is used when the distribution field in debian/changelog
+says "unstable". And so forth.
diff --git a/sources.list.experimental b/sources.list.experimental
deleted file mode 100644
index 8662b9d..0000000
--- a/sources.list.experimental
+++ /dev/null
@@ -1,5 +0,0 @@
-# Using package list of experimental makes no sense at all because
-# it does not contain all packages we want to include.  The sense of
-# uploading meta packages to experimental is to test something, but
-# the dependencies should definitely work on the unstable distribution
-deb http://ftp.debian.org/debian/ unstable main
diff --git a/sources.list.jessie b/sources.list.jessie
index e6187fa..388bc5a 100644
--- a/sources.list.jessie
+++ b/sources.list.jessie
@@ -1,3 +1,3 @@
 # Use jessie as final target for Debian Edu meta packages
-deb http://ftp.skolelinux.org/debian/ jessie main contrib non-free
+deb http://http.debian.net/debian/ jessie main contrib non-free
 #deb http://ftp.skolelinux.org/skolelinux/ jessie-test local
diff --git a/sources.list.karmic b/sources.list.karmic
deleted file mode 100644
index 9209081..0000000
--- a/sources.list.karmic
+++ /dev/null
@@ -1 +0,0 @@
-deb http://archive.ubuntu.com/ubuntu/ karmic main universe multiverse
diff --git a/sources.list.lenny b/sources.list.lenny
deleted file mode 100644
index 2ab3ca3..0000000
--- a/sources.list.lenny
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ftp.skolelinux.org/debian/ lenny main contrib non-free
-deb http://ftp.skolelinux.org/skolelinux/ lenny local
diff --git a/sources.list.squeeze-test b/sources.list.squeeze-test
deleted file mode 100644
index 0cccf1b..0000000
--- a/sources.list.squeeze-test
+++ /dev/null
@@ -1,3 +0,0 @@
-# Use testing as final target for Debian Edu meta packages
-deb http://ftp.skolelinux.org/debian/ stable main contrib non-free
-deb http://ftp.skolelinux.org/skolelinux/ squeeze-test local
diff --git a/sources.list.stable b/sources.list.stable
index 17f5412..f0922ce 100644
--- a/sources.list.stable
+++ b/sources.list.stable
@@ -1 +1 @@
-deb http://ftp.debian.org/debian/ stable main contrib non-free
+deb http://http.debian.net/debian/ stable main contrib non-free
diff --git a/sources.list.wheezy-test b/sources.list.wheezy-test
index 66cc8c2..1a7df51 100644
--- a/sources.list.wheezy-test
+++ b/sources.list.wheezy-test
@@ -1,3 +1,3 @@
 # Use wheezy as final target for Debian Edu meta packages
-deb http://ftp.skolelinux.org/debian/ wheezy main contrib non-free
+deb http://http.debian.net/debian/ wheezy main contrib non-free
 deb http://ftp.skolelinux.org/skolelinux/ wheezy-test local

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