From: Simon Paillard <spaillard@debian.org>
Date: Sat, 27 Aug 2011 20:42:07 +0000 (+0200)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=079e6c459a82ef66fe4a25c761afaff9423b09f8;hp=49b3b99bcbd6acc64f44eb5a8ac3bf69c232ca0e;p=deb%2Fpackages.git

Merge branch 'master' into debian-master
---

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index 510eb7e..85f478e 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -44,12 +44,12 @@ mirrors = {
 			"ftp.it.debian.org/debian",
 			"ftp.lt.debian.org/debian",
 			"ftp.nl.debian.org/debian",
-#only some arches	"ftp.no.debian.org/debian",
+			"ftp.no.debian.org/debian",
 			"ftp.pl.debian.org/debian",
 			"ftp.ro.debian.org/debian",
 			"ftp.ru.debian.org/debian",
 			"ftp.se.debian.org/debian",
-#only some arches	"ftp.si.debian.org/debian",
+			"ftp.si.debian.org/debian",
 			"ftp.tr.debian.org/debian",
 			"ftp.uk.debian.org/debian",
 		],
@@ -70,10 +70,10 @@ mirrors = {
 			"mirror.optus.net/debian",
 		],
 		asia => [
+			"ftp.cn.debian.org/debian",
 			"ftp.jp.debian.org/debian",
-			"ftp2.jp.debian.org/debian",
 			"ftp.kr.debian.org/debian",
-#only some arches	"ftp.hk.debian.org/debian",
+			"ftp.hk.debian.org/debian",
 			"ftp.tw.debian.org/debian",
 			"debian.nctu.edu.tw/debian",
 			"debian.linux.org.tw/debian",