Replace non working volatile mirror debian.domainmail.org with mirror.csclub.uwaterloo.ca

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

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index 68ce04ffc0e3c8bfe731f396a960d08b89c5f968..934a49897545fe7d5900e2efad4c408ed4f571be 100644 (file)
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -70,6 +70,7 @@ mirrors = {
        },
 
        volatile => {
+               title => g('volatile packages that need major changes during the life of a stable release'),
                mirror_list => 'http://www.debian.org/devel/debian-volatile/volatile-mirrors',
                europa => [
                        "volatile.debian.net/debian-volatile",
@@ -77,7 +78,7 @@ mirrors = {
                        "ftp.sk.debian.org/debian-volatile",
                ],
                north_america => [
-                       "debian.domainmail.org/debian-volatile",
+                       "mirror.csclub.uwaterloo.ca/debian-volatile",
                ],
                south_america => [
                        "sft.if.usp.br/debian-volatile",
@@ -91,6 +92,7 @@ mirrors = {
        },
 
        backports => {
+               title => g('newer packages that have been adapted to stable releases of Debian'),
                mirror_list => 'http://www.backports.org/debian/README.mirrors.html',
                europa => [
                        "www.backports.org/debian",
@@ -117,36 +119,9 @@ mirrors = {
                ],
        },
 
-       amd64 => {
-               unofficial_port => {
-                       amd64 => {
-                               url_name => 'amd64',
-                               name => 'AMD64',
-                       }
-               },
-               europa => [
-                       "amd64.debian.net/debian",
-                       "ftp.de.debian.org/debian-amd64/debian",
-                       "ftp.es.debian.org/debian-amd64/debian",
-                       "ftp.nl.debian.org/debian-amd64/debian",
-                       "ftp.sk.debian.org/debian-amd64/debian",
-                       "bytekeeper.as28747.net/debian-amd64/debian",
-                       "mirror.switch.ch/debian-amd64/debian",
-               ],
-               asia => [
-                       "ftp.jp.debian.org/debian-amd64/debian/",
-                       "hanzubon.jp/debian-amd64/debian",
-               ],
-               north_america => [
-                       "mirror.espri.arizona.edu/debian-amd64/debian",
-                       "debian.csail.mit.edu/debian-amd64/debian",
-               ],
-               australia => [
-                       "public.planetmirror.com/pub/debian-amd64/debian",
-               ],
-       },
-
-       gnuab => {
+       debports => {
+               title => g('ports of packages to architectures not yet available in Debian'),
+               mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',
                unofficial_port => {
                        'kfreebsd-amd64' => {
                                url_name => 'kfreebsd-gnu',
@@ -156,20 +131,16 @@ mirrors = {
                                url_name => 'kfreebsd-gnu',
                                name => 'GNU/kFreeBSD',
                        },
-                       armel => {
-                               url => 'http://www.debonaras.org/',
-                               name => 'armel',
-                       },
                },
                north_america => [
                        "www.gtlib.gatech.edu/pub/gnuab/debian",
+                       "www.superunprivileged.org/debian",
                ],
                europa => [
-                       # master site, aka ftp.gnuab.org
-                       "kfreebsd-gnu.debian.net/debian",
+                       "ftp.debian-ports.org/debian",
+                       "ftp.de.debian.org/debian-ports",
+                       "ftp.ch.debian.org/debian-ports",
                        "ftp.easynet.be/ftp/gnuab/debian",
-                       "ftp.de.debian.org/debian-kfreebsd",
-                       "ftp.ch.debian.org/debian-kfreebsd",
                ],
        },
 }
@@ -177,13 +148,11 @@ mirrors = {
 ports_url = 'http://www.debian.org/ports/'
 
 continents = {
-               north_america => 'North America',
-               south_america => 'South America',
-               asia          => 'Asia',
-               australia     => 'Australia and New Zealand',
-               europa        => 'Europa',
-               africa        => 'Africa',
+               north_america => g('North America'),
+               south_america => g('South America'),
+               asia          => g('Asia'),
+               australia     => g('Australia and New Zealand'),
+               europa        => g('Europe'),
+               africa        => g('Africa'),
        }
-
 %]
-