Merge branch 'master' into debian-master

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

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index b01bd335d174f0d599738bccad3aeab7ba44e920..85f478e87a5b209d5ab24ccf696eff588549464f 100644 (file)
--- 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",
@@ -171,6 +171,10 @@ mirrors = {
                                url => 'http://avr32.debian.net/',
                                name => 'AVR32',
                        },
+                       armhf => {
+                               url => 'http://wiki.debian.org/ArmHardFloatPort',
+                               name => 'ARMHF',
+                       },
                        hppa => {
                                url_name => 'hppa',
                                name => 'HPPA',