X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=templates%2Fconfig%2Fmirrors.tmpl;h=c5c1d33621bb319885491b072e2af626b5871d72;hb=6cb78de63c6dfc708020db50d75bba52ada23ddc;hp=a23ec99a7170da6dc8385c1d6343bfc3a34b8f84;hpb=75074e5c050dc9dd1c141a861495fde28bea784d;p=deb%2Fpackages.git

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index a23ec99..c5c1d33 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -117,38 +117,8 @@ mirrors = {
 		],
 	},
 
-	amd64 => {
-		mirror_list => 'http://amd64.debian.net/README.mirrors.html',
-		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 => {
-		mirror_list => 'http://wiki.debian.org/Debian_GNU/kFreeBSD_Mirrors',
+	debports => {
+		mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',
 		unofficial_port => {
 			'kfreebsd-amd64' => {
 				url_name => 'kfreebsd-gnu',
@@ -158,20 +128,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",
 		],
 	},
 }
@@ -179,12 +145,12 @@ 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'),
 	}
 
 %]