Merge branch 'master' into archive-master

[deb/packages.git] / templates / config / mirrors.tmpl

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index ef12194b8478e3813cd81cde28687758250fe968..81dc3aeab335a5261c98a542df4e001925ca9664 100644 (file)
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -13,13 +13,13 @@ mirrors = {
        us => {
                mirror_list => 'http://www.debian.org/distrib/archive',
                north_america => [
-                       "archive.debian.org/debian-archive",
                        "ftp.egr.msu.edu/debian-archive",
                        "ftp3.nrc.ca/debian-archive",
                ],
                europa => [
-                       "ftp.de.debian.org/debian-archive",
-#                      "ftp.ch.debian.org/debian-archive",
+                       "archive.debian.org/debian",
+                       "ftp.de.debian.org/archive/debian",
+                       "ftp.ch.debian.org/debian-archive",
                        "ftp.nl.debian.org/debian-archive",
                        "debian.dynamica.it/debian-archive",
                        "debian.org.ua/debian-archive",
@@ -32,6 +32,18 @@ mirrors = {
 #                      "ftp.twaren.net/Linux/Debian/debian-archive",
                ],
        },
+       volatile => {
+               title => g('volatile packages that need major changes during the life of a stable release'),
+               europa => [
+                       "archive.debian.org/debian-volatile",
+               ],
+       },
+       backports => {
+               title => g('newer packages that have been adapted to stable releases of Debian'),
+               europa => [
+                       "archive.debian.org/backports.org",
+               ],
+       },
 }
 
 continents = {
@@ -42,6 +54,4 @@ continents = {
                europa        => g('Europe'),
                africa        => g('Africa'),
        }
-
 %]
-