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 9fa5ead91fca65a81e85b98e7f221f09c2dd2de6..a222eb100ee23c28209e46e06e2317509977b975 100644 (file)
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -11,15 +11,16 @@
  
 mirrors = {
        us => {
+               url => 'http://www.debian.org/',
                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,13 +33,27 @@ mirrors = {
 #                      "ftp.twaren.net/Linux/Debian/debian-archive",
                ],
        },
+       volatile => {
+               url => 'http://www.debian.org/volatile/',
+               title => g('volatile packages that need major changes during the life of a stable release'),
+               europa => [
+                       "archive.debian.org/debian-volatile",
+               ],
+       },
+       backports => {
+               url => 'http://www.backports.org/',
+               title => g('newer packages that have been adapted to stable releases of Debian'),
+               europa => [
+                       "archive.debian.org/backports.org",
+               ],
+       },
 }
 
 continents = {
                north_america => g('North America'),
                south_america => g('South America'),
                asia          => g('Asia'),
-               australia     => g('Australia and New Zealand'),
+               oceania       => g('Oceania'),
                europa        => g('Europe'),
                africa        => g('Africa'),
        }