X-Git-Url: https://git.deb.at/?a=blobdiff_plain;ds=sidebyside;f=templates%2Fconfig%2Fmirrors.tmpl;h=75682137be31071dd86b6add65bde342600a0738;hb=7d28d312cde87467f0d9e0ad7b21bfa9a387309c;hp=d80342d2649ec8bc1cacf8169071a7b96a1281f1;hpb=11fd4b5f87f668eeb33922c6f64823e40828d137;p=deb%2Fpackages.git

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index d80342d..7568213 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -113,10 +113,12 @@ mirrors = {
 		],
 		australia => [
 			"mirror.linux.org.au/backports.org",
+			"mirror.pacific.net.au/linux/debian-backports",
 		],
 	},
 
 	amd64 => {
+		mirror_list => 'http://amd64.debian.net/README.mirrors.html',
 		unofficial_port => {
 			amd64 => {
 				url_name => 'amd64',
@@ -126,20 +128,27 @@ mirrors = {
 		europa => [
 			"amd64.debian.net/debian",
 			"ftp.de.debian.org/debian-amd64/debian",
-			"bach.hpc2n.umu.se/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",
-			"ftp.nl.debian.org/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 => {
+		mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',
 		unofficial_port => {
 			'kfreebsd-amd64' => {
 				url_name => 'kfreebsd-gnu',
@@ -150,23 +159,19 @@ mirrors = {
 				name => 'GNU/kFreeBSD',
 			},
 			armel => {
-				url => 'http://www.debonaras.org/',
+				url => 'http://wiki.debian.org/ArmEabiPort',
 				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.sh.cvut.cz/MIRRORS/debian-non-linux",
-			"ftp.eila.jussieu.fr/pub/Debian-gnuab",
-		],
-		asia => [
-			"ftp.citkit.ru/pub/HURD/debian",
 		],
 	},
 }
@@ -174,12 +179,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'),
 	}
 
 %]