X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=templates%2Fconfig%2Fmirrors.tmpl;h=f68562c33dfa480ff02162b2cea5e5c8baaa3666;hb=24c23c4eebaf4fa86fd27f1c65fa3f220ce30059;hp=9547482fd7efd93b79684422489c4d688471f861;hpb=4fec9449ddf3d2a6162c05387367746f3e17e329;p=deb%2Fpackages.git

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index 9547482..f68562c 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -70,20 +70,39 @@ mirrors = {
 	},
 
 	volatile => {
-		mirror_list => 'http://www.debian.org/devel/debian-volatile/volatile-mirrors',
+		title => g('volatile packages that need major changes during the life of a stable release'),
+		mirror_list => 'http://www.debian.org/volatile/volatile-mirrors',
 		europa => [
-			"volatile.debian.net/debian-volatile",
+			"volatile.debian.org/debian-volatile",
+			"ftp.at.debian.org/debian-volatile",
+			"ftp.be.debian.org/debian-volatile",
+			"ftp.ch.debian.org/debian-volatile",
+			"ftp.de.debian.org/debian-volatile",
 			"ftp2.de.debian.org/debian-volatile",
+			"ftp.ee.debian.org/debian-volatile",
+			"ftp.fi.debian.org/debian-volatile",
+			"ftp.gr.debian.org/debian-volatile",
+			"ftp.nl.debian.org/debian-volatile",
+			"ftp.ru.debian.org/debian-volatile",
 			"ftp.sk.debian.org/debian-volatile",
+			"ftp.ua.debian.org/debian-volatile",
+			"ftp.uk.debian.org/debian-volatile",
 		],
 		north_america => [
-			"debian.domainmail.org/debian-volatile",
+			"mirror.csclub.uwaterloo.ca/debian-volatile",
+			"ftp3.nrc.ca/debian-volatile",
+			"gulus.usherbrooke.ca/debian-volatile",
 		],
 		south_america => [
+			"ftp.br.debian.org/debian-volatile",
+			"ftp.cl.debian.org/debian-volatile",
 			"sft.if.usp.br/debian-volatile",
 		],
 		asia => [
 			"ftp2.jp.debian.org/debian-volatile",
+			"ftp.tw.debian.org/debian-volatile",
+			"mirror.unej.ac.id/debian-volatile",
+			"mirrors.geekbone.org/debian-volatile",
 		],
 		australia => [
 			"ftp.nz.debian.org/debian-volatile",
@@ -91,6 +110,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,46 +137,13 @@ 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",
-		],
-	},
-
 	debports => {
+		title => g('ports of packages to architectures not yet or not anymore available in Debian'),
 		mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',
 		unofficial_port => {
-			'kfreebsd-amd64' => {
-				url_name => 'kfreebsd-gnu',
-				name => 'GNU/kFreeBSD',
-			},
-			'kfreebsd-i386' => {
-				url_name => 'kfreebsd-gnu',
-				name => 'GNU/kFreeBSD',
+			m68k => {
+				url_name => 'm68k',
+				name => 'M68K',
 			},
 		},
 		north_america => [
@@ -182,6 +169,4 @@ continents = {
 		europa        => g('Europe'),
 		africa        => g('Africa'),
 	}
-
 %]
-