* Since 3.1 we don't have to care anymore for Debian non-us

2 files changed, 0 insertions, 570 deletions

diff --git a/data/templates/Debian-nonUS.mirrors b/data/templates/Debian-nonUS.mirrors
deleted file mode 100644
index dc9407b4..00000000
--- a/data/templates/Debian-nonUS.mirrors
+++ /dev/null
@@ -1,555 +0,0 @@
-http://debian.logiclinux.com/debian-non-US/
-ftp://ftp.ccc.uba.ar/pub/linux/debian/debian-non-US/
-http://ftp.ccc.uba.ar/pub/linux/debian/debian-non-US/
-ftp://gd.tuwien.ac.at/opsys/linux/debian-non-US/
-ftp://ftp.tuwien.ac.at/opsys/linux/debian-non-US/
-http://gd.tuwien.ac.at/opsys/linux/debian-non-US/
-http://ftp.tuwien.ac.at/opsys/linux/debian-non-US/
-ftp://debian.mur.at/debian-non-US/
-ftp://algo.mur.at/debian-non-US/
-http://debian.mur.at/debian-non-US/
-http://algo.mur.at/debian-non-US/
-ftp://ftp.tu-graz.ac.at/mirror/debian-non-US/
-ftp://ftp.tugraz.at/mirror/debian-non-US/
-http://ftp.tu-graz.ac.at/mirror/debian-non-US/
-http://ftp.tugraz.at/mirror/debian-non-US/
-ftp://ftp.univie.ac.at/systems/linux/debian/debian-non-US/
-http://ftp.univie.ac.at/systems/linux/debian/debian-non-US/
-ftp://debian.inode.at/debian-non-US/
-http://debian.inode.at/debian-non-US/
-ftp://ftp.wa.au.debian.org/debian-non-US/
-ftp://ftp.it.net.au/debian-non-US/
-ftp://poledra.it.net.au/debian-non-US/
-http://ftp.wa.au.debian.org/debian-non-US/
-http://ftp.it.net.au/debian-non-US/
-http://poledra.it.net.au/debian-non-US/
-ftp://ftp.au.debian.org/debian-non-US/
-ftp://planetmirror.com/debian-non-US/
-http://ftp.au.debian.org/debian-non-US/
-http://planetmirror.com/debian-non-US/
-ftp://mirror.aarnet.edu.au/debian-non-US/
-http://mirror.aarnet.edu.au/debian-non-US/
-ftp://ftp.monash.edu.au/pub/linux/debian-non-US/
-http://ftp.monash.edu.au/pub/linux/debian-non-US/
-ftp://ftp.progsoc.uts.edu.au/pub/Linux/debian-non-US/
-http://ftp.progsoc.uts.edu.au/pub/Linux/debian-non-US/
-ftp://ftp.uwa.edu.au/mirrors/linux/debian-non-US/
-ftp://mirror.eftel.com/debian-non-US/
-ftp://mirror.q-net.net.au/debian-non-US/
-http://mirror.eftel.com/debian-non-US/
-http://mirror.q-net.net.au/debian-non-US/
-ftp://mirror.pacific.net.au/debian-non-US/
-http://mirror.pacific.net.au/debian-non-US/
-ftp://ftp.iinet.net.au/debian/debian-non-US/
-http://ftp.iinet.net.au/debian/debian-non-US/
-http://mirror.optus.net/debian-non-US/
-http://mirror.optusnet.com.au/debian-non-US/
-ftp://ftp.kulnet.kuleuven.ac.be/debian-non-US/
-http://ftp.kulnet.kuleuven.ac.be/debian-non-US/
-ftp://ftp.easynet.be/debian-non-US/
-http://ftp.easynet.be/ftp/debian-non-US/
-ftp://ftp.belnet.be/debian-non-US/
-ftp://dalet.belnet.be/debian-non-US/
-http://ftp.belnet.be/debian-non-US/
-http://dalet.belnet.be/debian-non-US/
-ftp://ftp.debian.skynet.be/debian-non-US/
-http://ftp.debian.skynet.be/ftp/debian-non-US/
-ftp://ftp.scarlet.be/pub/debian-non-US/
-ftp://ftp.bg.debian.org/debian-non-US/
-ftp://debian.spnet.net/debian-non-US/
-http://ftp.bg.debian.org/debian-non-US/
-http://debian.spnet.net/debian-non-US/
-ftp://debian.ludost.net/debian-non-US/
-ftp://marla.ludost.net/debian-non-US/
-http://debian.ludost.net/debian-non-US/
-http://marla.ludost.net/debian-non-US/
-ftp://ftp.uni-sofia.bg/debian-non-US/
-ftp://ftp.br.debian.org/debian-non-US/
-ftp://ftp.inf.ufpr.br/debian-non-US/
-ftp://www.inf.ufpr.br/debian-non-US/
-http://ftp.br.debian.org/debian-non-US/
-http://ftp.inf.ufpr.br/debian-non-US/
-http://www.inf.ufpr.br/debian-non-US/
-http://sft.if.usp.br/debian-non-US/
-http://fma.if.usp.br/debian-non-US/
-ftp://linorg.usp.br/debian-non-US/
-http://linorg.usp.br/debian-non-US/
-http://linux.iq.usp.br/debian-non-US/
-http://torio.iq.usp.br/debian-non-US/
-ftp://ftp.pucpr.br/debian-non-US/
-ftp://linux.org.by/debian-non-US/
-http://linux.org.by/debian-non-US/
-ftp://ftp.mgts.by/debian-non-US/
-http://debian.yorku.ca/debian/non-US/
-ftp://ftp3.nrc.ca/debian-non-US/
-http://ftp3.nrc.ca/debian-non-US/
-ftp://gulus.usherbrooke.ca/debian-non-US/
-http://gulus.usherbrooke.ca/debian-non-US/
-ftp://mirror.cpsc.ucalgary.ca/debian-non-US/
-http://mirror.cpsc.ucalgary.ca/debian-non-US/
-http://mirror.peer1.net/debian-non-US/
-ftp://debian.mirror.rafal.ca/debian-non-US/
-http://debian.mirror.rafal.ca/debian-non-US/
-ftp://ftp.ch.debian.org/debian-non-US/
-ftp://debian.ethz.ch/debian-non-US/
-ftp://kaerpf.ethz.ch/debian-non-US/
-http://ftp.ch.debian.org/debian-non-US/
-http://debian.ethz.ch/debian-non-US/
-http://kaerpf.ethz.ch/debian-non-US/
-ftp://mirror.switch.ch/mirror/debian-non-US/
-http://mirror.switch.ch/ftp/mirror/debian-non-US/
-ftp://ftp.cl.debian.org/debian-non-US/
-ftp://debian.ciencias.uchile.cl/debian-non-US/
-http://ftp.cl.debian.org/debian-non-US/
-http://debian.ciencias.uchile.cl/debian-non-US/
-ftp://debian.experimentos.cl/Debian/debian-non-US/
-ftp://experimentos1.fis.utfsm.cl/Debian/debian-non-US/
-http://debian.experimentos.cl/debian-non-US/
-http://experimentos1.fis.utfsm.cl/debian-non-US/
-http://debian.ubiobio.cl/debian-non-US/
-ftp://ftp.linuxforum.net/debian-non-US/
-ftp://www2.linuxforum.net/debian-non-US/
-ftp://mirrors.geekbone.org/debian-non-US/
-http://mirrors.geekbone.org/debian-non-US/
-ftp://debian.cn99.com/debian-non-US/
-ftp://mirrors.cn99.com/debian-non-US/
-http://debian.cn99.com/debian-non-US/
-http://mirrors.cn99.com/debian-non-US/
-http://mirror.vmmatrix.net/debian-non-US/
-http://mirrors.vmmatrix.net/debian-non-US/
-http://fatboy.umng.edu.co/debian/
-ftp://ftp.cz.debian.org/debian-non-US/
-ftp://ftp.debian.cz/debian-non-US/
-ftp://www.debian.cz/debian-non-US/
-http://ftp.cz.debian.org/debian-non-US/
-http://ftp.debian.cz/debian-non-US/
-http://www.debian.cz/debian-non-US/
-ftp://debian.sh.cvut.cz/debian-non-US/
-ftp://ftp.sh.cvut.cz/debian-non-US/
-http://debian.sh.cvut.cz/debian-non-US/
-http://ftp.sh.cvut.cz/debian-non-US/
-ftp://ftp.zcu.cz/pub/linux/debian-non-US/
-http://ftp.zcu.cz/ftp/pub/linux/debian-non-US/
-ftp://ftp.de.debian.org/debian-non-US/
-ftp://ftp1.de.debian.org/debian-non-US/
-ftp://debian.inf.tu-dresden.de/debian-non-US/
-http://ftp.de.debian.org/debian-non-US/
-http://ftp1.de.debian.org/debian-non-US/
-http://debian.inf.tu-dresden.de/debian-non-US/
-ftp://ftp2.de.debian.org/debian-non-US/
-ftp://ftp.rfc822.org/debian-non-US/
-ftp://source.rfc822.org/debian-non-US/
-http://ftp2.de.debian.org/debian-non-US/
-http://ftp.rfc822.org/debian-non-US/
-http://source.rfc822.org/debian-non-US/
-ftp://ftp.tu-clausthal.de/pub/linux/debian-non-US/
-ftp://pegasus.rz.tu-clausthal.de/pub/linux/debian-non-US/
-ftp://ftp.freenet.de/pub/ftp.debian.org/debian-non-US/
-http://ftp.freenet.de/debian-non-US/
-ftp://ftp.uni-erlangen.de/pub/Linux/debian/debian-non-US/
-http://ftp.uni-erlangen.de/pub/Linux/debian/debian-non-US/
-ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/debian-non-US/
-http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/debian-non-US/
-ftp://ftp-stud.fht-esslingen.de/debian-non-US/
-http://ftp-stud.fht-esslingen.de/debian-non-US/
-ftp://ftp.fu-berlin.de/pub/unix/linux/mirrors/debian-non-US/
-ftp://Hefe.ZEDAT.FU-Berlin.DE/pub/unix/linux/mirrors/debian-non-US/
-ftp://debian.tu-bs.de/debian-non-US/
-http://debian.tu-bs.de/debian-non-US/
-ftp://ftp.uni-koeln.de/debian-non-US/
-http://ftp.uni-koeln.de/debian-non-US/
-ftp://debian.pffa.de/pub/mirrors/debian-non-US/
-ftp://debian.ipv6.fhtw-berlin.de/pub/mirrors/debian-non-US/
-http://debian.pffa.de/mirrors/debian-non-US/
-http://debian.ipv6.fhtw-berlin.de/mirrors/debian-non-US/
-ftp://ftp.mpi-sb.mpg.de/pub/linux/distributions/debian/non-us/debian-non-US/
-ftp://ftp.tiscali.de/pub/debian/debian-non-US/
-ftp://pandemonium.tiscali.de/pub/debian/debian-non-US/
-http://ftp.tiscali.de/pub/debian/debian-non-US/
-http://pandemonium.tiscali.de/pub/debian/debian-non-US/
-ftp://ftp.tu-chemnitz.de/pub/linux/debian/debian-non-US/
-ftp://ftp.uni-bayreuth.de/pub/linux/Debian/debian-non-US/
-ftp://rsync.uni-bayreuth.de/pub/linux/Debian/debian-non-US/
-ftp://btr0x2.rz.uni-bayreuth.de/pub/linux/Debian/debian-non-US/
-ftp://btr0qx.rz.uni-bayreuth.de/pub/linux/Debian/debian-non-US/
-http://ftp.uni-bayreuth.de/linux/Debian/debian-non-US/
-http://rsync.uni-bayreuth.de/linux/Debian/debian-non-US/
-http://btr0x2.rz.uni-bayreuth.de/linux/Debian/debian-non-US/
-http://btr0qx.rz.uni-bayreuth.de/linux/Debian/debian-non-US/
-ftp://ftp.informatik.hu-berlin.de/pub/Mirrors/ftp.de.debian.org/debian-non-US/
-ftp://ftp.gwdg.de/pub/linux/debian/debian-non-US/
-http://ftp.gwdg.de/pub/linux/debian/debian-non-US/
-ftp://ftp.hosteurope.de/pub/linux/debian-non-US/
-http://ftp.hosteurope.de/pub/linux/debian-non-US/
-ftp://ftp.informatik.uni-frankfurt.de/pub/linux/Mirror/ftp.debian.org/debian-non-US/
-ftp://ftp.cs.uni-frankfurt.de/pub/linux/Mirror/ftp.debian.org/debian-non-US/
-http://debian.intergenia.de/debian-non-US/
-http://debian.server4you.de/debian-non-US/
-http://debian.vserver.de/debian-non-US/
-http://debian.plusserver.de/debian-non-US/
-ftp://ftp.dk.debian.org/debian-non-US/
-ftp://mirrors.dotsrc.org/debian-non-US/
-http://ftp.dk.debian.org/debian-non-US/
-http://mirrors.dotsrc.org/debian-non-US/
-http://mirror.here.dk/debian-non-US/
-http://debian.uni-c.dk/debian-non-US/
-http://ymer.uni-c.dk/debian-non-US/
-ftp://mirrors.telianet.dk/debian-non-us/
-ftp://mirrors.dk.telia.net/debian-non-us/
-http://mirrors.telianet.dk/debian-non-us/
-http://mirrors.dk.telia.net/debian-non-us/
-ftp://ftp.ee.debian.org/debian-non-US/
-ftp://ftp.linux.ee/debian-non-US/
-ftp://linux.ee/debian-non-US/
-http://ftp.ee.debian.org/debian-non-US/
-http://ftp.linux.ee/debian-non-US/
-http://linux.ee/debian-non-US/
-ftp://ftp.es.debian.org/debian-non-US/
-ftp://ulises.adi.uam.es/debian-non-US/
-http://ftp.es.debian.org/debian-non-US/
-http://ulises.adi.uam.es/debian-non-US/
-ftp://toxo.com.uvigo.es/debian-non-US/
-http://toxo.com.uvigo.es/debian-non-US/
-ftp://ftp.rediris.es/debian-non-US/
-http://ftp.rediris.es/debian-non-US/
-http://jane.uab.es/debian-non-US/
-ftp://ftp.caliu.info/debian-non-US/
-http://ftp.caliu.info/debian-non-US/
-ftp://ftp.cica.es/debian-non-US/
-ftp://horacio.cica.es/debian-non-US/
-ftp://ftp.gva.es/pub/mirror/debian-non-US/
-ftp://frigga.gva.es/pub/mirror/debian-non-US/
-http://ftp.gva.es/mirror/debian-non-US/
-http://frigga.gva.es/mirror/debian-non-US/
-ftp://ftp.fi.debian.org/debian-non-US/
-ftp://trumpetti.atm.tut.fi/debian-non-US/
-http://ftp.fi.debian.org/debian-non-US/
-http://trumpetti.atm.tut.fi/debian-non-US/
-ftp://ftp.funet.fi/pub/linux/mirrors/debian-non-US/
-http://ftp.funet.fi/pub/linux/mirrors/debian-non-US/
-ftp://ftp.jyu.fi/debian-non-US/
-ftp://lennon.cc.jyu.fi/debian-non-US/
-http://ftp.jyu.fi/debian-non-US/
-http://lennon.cc.jyu.fi/debian-non-US/
-ftp://ftp.fr.debian.org/debian-non-US/
-ftp://debian.proxad.net/debian-non-US/
-ftp://ftpmirror.proxad.net/debian-non-US/
-http://ftp.fr.debian.org/debian-non-US/
-http://debian.proxad.net/debian-non-US/
-http://ftpmirror.proxad.net/debian-non-US/
-ftp://ftp2.fr.debian.org/debian-non-US/
-ftp://ftp.oleane.net/debian-non-US/
-http://ftp2.fr.debian.org/debian-non-US/
-http://ftp.oleane.net/debian-non-US/
-ftp://ftp.iut-bm.univ-fcomte.fr/debian-non-US/
-http://ftp.iut-bm.univ-fcomte.fr/debian-non-US/
-ftp://ftp.proxad.net/mirrors/nonus.debian.org/
-ftp://ftp.free.fr/mirrors/nonus.debian.org/
-ftp://ftp.online.fr/mirrors/nonus.debian.org/
-ftp://ftp.proxad.fr/mirrors/nonus.debian.org/
-ftp://debian.ens-cachan.fr/debian-non-US/
-ftp://ftp.ens-cachan.fr/debian-non-US/
-http://debian.ens-cachan.fr/ftp/debian-non-US/
-http://ftp.ens-cachan.fr/ftp/debian-non-US/
-ftp://ftp.u-picardie.fr/mirror/debian-non-US/
-http://ftp.u-picardie.fr/mirror/debian-non-US/
-ftp://debian.mirrors.easynet.fr/debian-non-US/
-ftp://tengu.easynet.fr/debian-non-US/
-ftp://ftp.u-strasbg.fr/debian-non-US/
-http://ftp.u-strasbg.fr/debian-non-US/
-ftp://debian.ibisc.univ-evry.fr/debian-non-US/
-http://debian.ibisc.univ-evry.fr/debian-non-US/
-ftp://mir1.ovh.net/debian-non-US/
-http://mir2.ovh.net/debian-non-US/
-http://mirror.ovh.net/debian-non-US/
-ftp://ftp.nerim.net/debian-non-US/
-ftp://ftp.crihan.fr/debian-non-US/
-http://ftp.crihan.fr/debian-non-US/
-ftp://debian.mines.inpl-nancy.fr/debian-non-US/
-ftp://ftp.mines.inpl-nancy.fr/debian-non-US/
-http://debian.mines.inpl-nancy.fr/debian-non-US/
-http://ftp.mines.inpl-nancy.fr/debian-non-US/
-ftp://ftp.debian.ikoula.com/debian-non-US/
-ftp://webb.ens-cachan.fr/debian-non-US/
-ftp://debian.ens-cachan.fr/debian-non-US/
-http://webb.ens-cachan.fr/debian-non-US/
-http://debian.ens-cachan.fr/debian-non-US/
-ftp://mirrors.ircam.fr/pub/debian-non-US/
-http://mirrors.ircam.fr/pub/debian-non-US/
-ftp://ftp.uk.debian.org/debian-non-US/
-ftp://debian.hands.com/debian-non-US/
-http://ftp.uk.debian.org/debian-non-US/
-http://debian.hands.com/debian-non-US/
-ftp://debian.hands.com/debian-non-US/
-ftp://open.hands.com/debian-non-US/
-http://debian.hands.com/debian-non-US/
-http://open.hands.com/debian-non-US/
-ftp://www.mirrorservice.org/sites/non-us.debian.org/debian-non-US/
-ftp://ftp.mirrorservice.org/sites/non-us.debian.org/debian-non-US/
-http://www.mirrorservice.org/sites/non-us.debian.org/debian-non-US/
-http://ftp.mirrorservice.org/sites/non-us.debian.org/debian-non-US/
-ftp://download.mirror.ac.uk/sites/non-us.debian.org/debian-non-US/
-ftp://ftp.mirror.ac.uk/sites/non-us.debian.org/debian-non-US/
-http://download.mirror.ac.uk/mirror/non-us.debian.org/debian-non-US/
-http://ftp.mirror.ac.uk/mirror/non-us.debian.org/debian-non-US/
-ftp://ftp.ticklers.org/debian/non-US/
-ftp://rib.ticklers.org/debian/non-US/
-http://ftp.ticklers.org/debian/non-US/
-http://rib.ticklers.org/debian/non-US/
-ftp://debian.blueyonder.co.uk/pub/debian/non-US/
-ftp://mirror2.blueyonder.co.uk/pub/debian/non-US/
-http://debian.blueyonder.co.uk/non-US/
-http://mirror2.blueyonder.co.uk/non-US/
-ftp://the.earth.li/debian-non-US/
-http://the.earth.li/debian-non-US/
-ftp://mirror.ox.ac.uk/debian-non-US/
-http://mirror.ox.ac.uk/debian-non-US/
-ftp://debian.otenet.gr/pub/linux/debian-non-US/
-http://debian.otenet.gr/debian-non-US/
-ftp://ftp.ntua.gr/pub/linux/debian-non-US/
-http://ftp.ntua.gr/pub/linux/debian-non-US/
-ftp://ftp.duth.gr/debian-non-US/
-http://ftp.duth.gr/debian-non-US/
-ftp://ftp.softnet.tuc.gr/pub/linux/debian-non-US/
-ftp://antirix.softnet.tuc.gr/pub/linux/debian-non-US/
-http://ftp.softnet.tuc.gr/ftp/linux/debian-non-US/
-http://antirix.softnet.tuc.gr/ftp/linux/debian-non-US/
-ftp://debian.internet.gr/debian-non-US/
-http://debian.internet.gr/debian-non-US/
-ftp://ftp.hk.debian.org/debian-non-US/
-ftp://ftp.debian.org.hk/debian-non-US/
-http://ftp.hk.debian.org/debian-non-US/
-http://ftp.debian.org.hk/debian-non-US/
-ftp://ftp.hr.debian.org/debian-non-US/
-ftp://debian.carnet.hr/debian-non-US/
-http://ftp.hr.debian.org/debian-non-US/
-http://debian.carnet.hr/debian-non-US/
-ftp://ftp.irb.hr/debian-non-US/
-http://ftp.irb.hr/debian-non-US/
-ftp://ftp.carnet.hr/debian-non-US/
-http://ftp.carnet.hr/debian-non-US/
-ftp://debian.iskon.hr/debian-non-US/
-http://debian.iskon.hr/debian-non-US/
-ftp://ftp.hu.debian.org/debian-non-US/
-ftp://ftp.fsn.hu/debian-non-US/
-http://ftp.hu.debian.org/debian-non-US/
-http://ftp.fsn.hu/debian-non-US/
-ftp://debian.inf.elte.hu/debian-non-US/
-http://debian.inf.elte.hu/debian-non-US/
-ftp://kebo.vlsm.org/debian-non-US/
-ftp://surabaya.vlsm.org/debian-non-US/
-ftp://katmai.its.ac.id/debian-non-US/
-http://kebo.vlsm.org/debian-non-US/
-http://surabaya.vlsm.org/debian-non-US/
-http://katmai.its.ac.id/debian-non-US/
-ftp://ftp.ie.debian.org/debian-non-US/
-ftp://debian.heanet.ie/debian-non-US/
-ftp://debian.ipv6.heanet.ie/debian-non-US/
-ftp://canyonero.heanet.ie/debian-non-US/
-http://ftp.ie.debian.org/debian-non-US/
-http://debian.heanet.ie/debian-non-US/
-http://debian.ipv6.heanet.ie/debian-non-US/
-http://canyonero.heanet.ie/debian-non-US/
-ftp://ftp.esat.net/pub/linux/debian-non-US/
-http://ftp.esat.net/pub/linux/debian-non-US/
-http://mirror.hamakor.org.il/pub/mirrors/debian-non-US/
-ftp://ftp.iitm.ac.in/debian-non-US/
-http://ftp.iitm.ac.in/debian-non-US/
-ftp://ftp.is.debian.org/debian-non-US/
-ftp://ftp.rhnet.is/debian-non-US/
-http://ftp.is.debian.org/debian-non-US/
-http://ftp.rhnet.is/debian-non-US/
-ftp://ftp.bononia.it/debian-non-US/
-http://ftp.bononia.it/debian-non-US/
-ftp://freedom.dicea.unifi.it/pub/linux/debian-non-US/
-http://freedom.dicea.unifi.it/ftp/pub/linux/debian-non-US/
-ftp://mi.mirror.garr.it/mirrors/debian/non-US/
-ftp://debian.fastweb.it/debian-non-US/
-http://debian.fastweb.it/debian-non-US/
-ftp://ftp.jp.debian.org/debian-non-US/
-ftp://ftp.nara.wide.ad.jp/debian-non-US/
-ftp://ftp.aist-nara.ac.jp/debian-non-US/
-http://ftp.jp.debian.org/debian-non-US/
-http://ftp.nara.wide.ad.jp/debian-non-US/
-http://ftp.aist-nara.ac.jp/debian-non-US/
-ftp://ftp2.jp.debian.org/debian-non-US/
-ftp://ftp.debian.or.jp/debian-non-US/
-ftp://http.debian.or.jp/debian-non-US/
-http://ftp2.jp.debian.org/debian-non-US/
-http://ftp.debian.or.jp/debian-non-US/
-http://http.debian.or.jp/debian-non-US/
-ftp://ring.asahi-net.or.jp/pub/linux/debian/debian-non-US/
-http://ring.asahi-net.or.jp/archives/linux/debian/debian-non-US/
-ftp://ftp.dti.ad.jp/pub/Linux/debian-non-US/
-ftp://dennou-k.gfd-dennou.org/library/Linux/debian-non-US/
-ftp://dennou-k.gaia.h.kyoto-u.ac.jp/library/Linux/debian-non-US/
-http://dennou-k.gfd-dennou.org/library/Linux/debian-non-US/
-http://dennou-k.gaia.h.kyoto-u.ac.jp/library/Linux/debian-non-US/
-ftp://dennou-q.gfd-dennou.org/library/Linux/debian-non-US/
-ftp://dennou-q.geo.kyushu-u.ac.jp/library/Linux/debian-non-US/
-http://dennou-q.gfd-dennou.org/library/Linux/debian-non-US/
-http://dennou-q.geo.kyushu-u.ac.jp/library/Linux/debian-non-US/
-ftp://ftp.yz.yamagata-u.ac.jp/debian-non-US/
-ftp://linux.yz.yamagata-u.ac.jp/debian-non-US/
-http://ftp.yz.yamagata-u.ac.jp/debian-non-US/
-http://linux.yz.yamagata-u.ac.jp/debian-non-US/
-ftp://sb.itc.u-tokyo.ac.jp/DEBIAN/debian-non-US/
-ftp://ftp.ecc.u-tokyo.ac.jp/DEBIAN/debian-non-US/
-http://debian.shimpinomori.net/debian-non-US/
-ftp://www.ring.gr.jp/pub/linux/debian/debian-non-US/
-ftp://ftp.ring.gr.jp/pub/linux/debian/debian-non-US/
-http://www.ring.gr.jp/archives/linux/debian/debian-non-US/
-http://ftp.ring.gr.jp/archives/linux/debian/debian-non-US/
-ftp://ftp.kr.debian.org/debian-non-US/
-ftp://ftp.kaist.ac.kr/debian-non-US/
-http://ftp.kr.debian.org/debian-non-US/
-http://ftp.kaist.ac.kr/debian-non-US/
-ftp://debian.hanyang.ac.kr/debian-non-US/
-ftp://ameba.sc-uni.ktu.lt/debian-non-US/
-http://ameba.sc-uni.ktu.lt/debian-non-US/
-ftp://debian.balt.net/debian-non-US/
-http://debian.balt.net/debian-non-US/
-ftp://ftp.latnet.lv/linux/debian-non-US/
-ftp://milzis.latnet.lv/linux/debian-non-US/
-http://ftp.latnet.lv/linux/debian-non-US/
-http://milzis.latnet.lv/linux/debian-non-US/
-ftp://nisamox.fciencias.unam.mx/debian-non-US/
-http://nisamox.fciencias.unam.mx/debian-non-US/
-http://debian.uni.edu.ni/debian/
-ftp://ftp.nl.debian.org/debian-non-US/
-ftp://slagroom.snt.utwente.nl/debian-non-US/
-http://ftp.nl.debian.org/debian-non-US/
-http://slagroom.snt.utwente.nl/debian-non-US/
-ftp://non-us.debian.org/debian-non-US/
-ftp://nonus.debian.org/debian-non-US/
-http://non-us.debian.org/debian-non-US/
-http://nonus.debian.org/debian-non-US/
-ftp://ftp.debian.nl/debian-non-US/
-ftp://morpheus.hoho.nl/debian-non-US/
-http://ftp.debian.nl/debian-non-US/
-http://morpheus.hoho.nl/debian-non-US/
-ftp://ftp.tiscali.nl/pub/mirrors/debian-non-US/
-http://ftp.tiscali.nl/debian-non-US/
-ftp://debian.essentkabel.com/debian-non-US/
-http://debian.essentkabel.com/debian-non-US/
-ftp://ftp.no.debian.org/debian-non-US/
-ftp://ftp.uninett.no/debian-non-US/
-http://ftp.no.debian.org/debian-non-US/
-http://ftp.uninett.no/debian-non-US/
-ftp://ftp.nz.debian.org/debian-non-US/
-ftp://ftp.citylink.co.nz/debian-non-US/
-http://ftp.nz.debian.org/debian-non-US/
-http://ftp.citylink.co.nz/debian-non-US/
-ftp://debian.ihug.co.nz/debian-non-US/
-ftp://ftp.pl.debian.org/debian-non-US/
-ftp://ftp.task.gda.pl/debian-non-US/
-http://ftp.pl.debian.org/debian-non-US/
-http://ftp.task.gda.pl/debian-non-US/
-ftp://ftp.icm.edu.pl/pub/Linux/distributions/debian-non-US/
-ftp://sunsite.icm.edu.pl/pub/Linux/distributions/debian-non-US/
-http://ftp.icm.edu.pl/pub/Linux/distributions/debian-non-US/
-http://sunsite.icm.edu.pl/pub/Linux/distributions/debian-non-US/
-ftp://ftp.man.szczecin.pl/pub/Linux/debian-non-US/
-ftp://rubycon.man.szczecin.pl/pub/Linux/debian-non-US/
-ftp://ftp.uevora.pt/debian-non-US/
-ftp://khaverna.sc.uevora.pt/debian-non-US/
-http://ftp.uevora.pt/debian-non-US/
-http://khaverna.sc.uevora.pt/debian-non-US/
-ftp://ftp.eq.uc.pt/pub/software/Linux/debian-non-US/
-http://ftp.eq.uc.pt/software/Linux/debian-non-US/
-ftp://ftp.linux.pt/pub/mirrors/debian/non-US/
-http://ftp.linux.pt/pub/mirrors/debian/non-US/
-ftp://ftp.ro.debian.org/debian-non-US/
-ftp://ftp.iasi.roedu.net/debian-non-US/
-http://ftp.ro.debian.org/debian-non-US/
-http://ftp.iasi.roedu.net/debian-non-US/
-ftp://ftp.lug.ro/debian-non-US/
-http://ftp.lug.ro/debian-non-US/
-ftp://ftp.ru.debian.org/debian-non-US/
-ftp://ftp.chg.ru/debian-non-US/
-http://ftp.ru.debian.org/debian-non-US/
-http://ftp.chg.ru/debian-non-US/
-ftp://debian.nsu.ru/debian-non-US/
-http://debian.nsu.ru/debian-non-US/
-ftp://debian.udsu.ru/debian-non-US/
-ftp://ftp.udsu.ru/debian-non-US/
-http://debian.udsu.ru/debian-non-US/
-http://ftp.udsu.ru/debian-non-US/
-ftp://ftp.psn.ru/debian-non-US/
-ftp://server.psn.ru/debian-non-US/
-http://ftp.psn.ru/debian-non-US/
-http://server.psn.ru/debian-non-US/
-ftp://ftp.se.debian.org/debian-non-US/
-ftp://ftp.acc.umu.se/debian-non-US/
-http://ftp.se.debian.org/debian-non-US/
-http://ftp.acc.umu.se/debian-non-US/
-ftp://ftp.sunet.se/pub/os/Linux/distributions/debian-non-US/
-http://ftp.sunet.se/pub/os/Linux/distributions/debian-non-US/
-ftp://ftp.du.se/debian-non-US/
-http://ftp.du.se/debian-non-US/
-ftp://ftp.port80.se/debian-non-US/
-http://ftp.port80.se/debian-non-US/
-ftp://mirror.averse.net/debian-non-US/
-http://mirror.averse.net/debian-non-US/
-ftp://mirror.nus.edu.sg/pub/Debian-non-US/
-ftp://mirror.comp.nus.edu.sg/pub/Debian-non-US/
-http://mirror.nus.edu.sg/Debian-non-US/
-http://mirror.comp.nus.edu.sg/Debian-non-US/
-ftp://debian.wow-vision.com.sg/debian-non-US/
-http://debian.wow-vision.com.sg/debian-non-US/
-ftp://ftp.si.debian.org/debian-non-US/
-ftp://ftp.camtp.uni-mb.si/debian-non-US/
-ftp://debian.camtp.uni-mb.si/debian-non-US/
-http://ftp.si.debian.org/debian-non-US/
-http://ftp.camtp.uni-mb.si/debian-non-US/
-http://debian.camtp.uni-mb.si/debian-non-US/
-ftp://ftp.arnes.si/packages/debian-non-US/
-ftp://ftp.sk.debian.org/debian-non-US/
-ftp://ftp.tuke.sk/debian-non-US/
-ftp://ccfrog.ke.sanet.sk/debian-non-US/
-http://ftp.sk.debian.org/debian-non-US/
-http://ftp.tuke.sk/debian-non-US/
-http://ccfrog.ke.sanet.sk/debian-non-US/
-ftp://ftp.nectec.or.th/pub/linux-distributions/Debian-non-US/
-ftp://download.nectec.or.th/pub/linux-distributions/Debian-non-US/
-ftp://ftp.coe.psu.ac.th/debian-non-US/
-ftp://debian.coe.psu.ac.th/debian-non-US/
-http://ftp.coe.psu.ac.th/debian-non-US/
-http://debian.coe.psu.ac.th/debian-non-US/
-ftp://ftp.tr.debian.org/debian-non-US/
-ftp://debian.ankara.edu.tr/debian-non-US/
-ftp://ftp.ankara.edu.tr/debian-non-US/
-http://ftp.tr.debian.org/debian-non-US/
-http://debian.ankara.edu.tr/debian-non-US/
-http://ftp.ankara.edu.tr/debian-non-US/
-ftp://debian.csie.ntu.edu.tw/pub/debian-non-US/
-http://debian.csie.ntu.edu.tw/debian-non-US/
-ftp://linux.cdpa.nsysu.edu.tw/debian-non-US/
-http://linux.cdpa.nsysu.edu.tw/debian-non-US/
-ftp://opensource.nchc.org.tw/debian-non-US/
-ftp://os.nchc.org.tw/debian-non-US/
-http://opensource.nchc.org.tw/debian-non-US/
-http://os.nchc.org.tw/debian-non-US/
-http://debian.nctu.edu.tw/debian-non-US/
-http://debian.ntcu.net/debian-non-US/
-ftp://debian.osdn.org.ua/pub/Debian/debian-non-US/
-http://debian.osdn.org.ua/debian-non-US/
-ftp://debian.org.ua/debian-non-US/
-ftp://mirror.3logic.net/debian-non-US/
-ftp://mirror.debian.org.ua/debian-non-US/
-http://debian.org.ua/debian-non-US/
-http://mirror.3logic.net/debian-non-US/
-http://mirror.debian.org.ua/debian-non-US/
-ftp://ftp.3logic.net/debian-non-US/
-ftp://debian.teleglobe.net/debian/non-US/
-ftp://cont1.njy.teleglobe.net/debian/non-US/
-ftp://cont1.lhx.teleglobe.net/debian/non-US/
-http://debian.teleglobe.net/non-US/
-http://cont1.njy.teleglobe.net/non-US/
-http://cont1.lhx.teleglobe.net/non-US/
-ftp://ftp.is.co.za/mirrors/non-us.debian.org/
-http://ftp.is.co.za/debian-non-US/
-ftp://ftp.sun.ac.za/debian/non-US/
-ftp://archive.sun.ac.za/debian/non-US/
-http://ftp.sun.ac.za/ftp/debian/non-US/
-http://archive.sun.ac.za/ftp/debian/non-US/
diff --git a/utils/get_debian_mirrors.py b/utils/get_debian_mirrors.py
index 1f6c031c..5964de72 100755
--- a/utils/get_debian_mirrors.py
+++ b/utils/get_debian_mirrors.py
@@ -32,10 +32,8 @@ import sys
 
 # the list of official Ubuntu servers
 mirrors = []
-mirrors_nonUS = []
 # path to the local mirror list
 list_path = "../data/templates/Debian.mirrors"
-list_path_non_US = "../data/templates/Debian-nonUS.mirrors"
 
 req = urllib2.Request("http://www.debian.org/mirror/mirrors_full")
 match = re.compile("^.*>([A-Za-z0-9-.\/_]+)<\/a>.*\n$")
@@ -55,10 +53,6 @@ try:
             add_sites(line, "http", sites, mirrors)
         elif line.startswith('Packages over FTP'):
             add_sites(line, "ftp", sites, mirrors)
-        elif line.startswith('Non-US packages over HTTP'):
-            add_sites(line, "http", sites, mirrors_nonUS)
-        elif line.startswith('Non-US packages over FTP'):
-            add_sites(line, "ftp", sites, mirrors_nonUS)
     uri.close()
 except:
     print "Failed to download or to extract the mirrors list!"
@@ -70,12 +64,3 @@ for mirror in mirrors:
     list.write("%s\n" % mirror)
 list.close()
 print "Done."
-
-print "Writing local non-US mirrors list: %s" % list_path
-list = open(list_path_non_US, "w")
-for mirror in mirrors_nonUS:
-    list.write("%s\n" % mirror)
-list.close()
-print "Done."
-
-