* data/templates/Ubuntu.info.in,

  data/templates/Ubuntu.mirrors:
  - updated for Ubuntu maverick
* doc/source/conf.py:
  - do not fail on non-digits in the version number
* utils/get_debian_mirrors.py:
  - ignore mirrors without a county

2 files changed, 191 insertions, 74 deletions

diff --git a/data/templates/Ubuntu.info.in b/data/templates/Ubuntu.info.in
index 1ca76927..74095516 100644
--- a/data/templates/Ubuntu.info.in
+++ b/data/templates/Ubuntu.info.in
@@ -1,13 +1,74 @@
 _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog
 
+Suite: maverick
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu
+MatchURI-i386: archive.ubuntu.com/ubuntu
+MirrorsFile-amd64: Ubuntu.mirrors
+MirrorsFile-i386: Ubuntu.mirrors
+_Description: Ubuntu 10.10 'Maverick Meerkat'
+Component: main
+_CompDescription: Officially supported
+_CompDescriptionLong: Canonical-supported Open Source software
+Component: universe
+_CompDescription: Community-maintained
+_CompDescriptionLong: Community-maintained Open Source software
+Component: restricted
+_CompDescription: Non-free drivers
+_CompDescriptionLong: Proprietary drivers for devices
+Component: multiverse
+_CompDescription: Restricted software
+_CompDescriptionLong: Software restricted by copyright or legal issues
+
+Suite: maverick
+MatchName: .*
+BaseURI: cdrom:\[Ubuntu.*10.10
+MatchURI: cdrom:\[Ubuntu.*10.10
+_Description: Cdrom with Ubuntu 10.10 'Maverick Meerkat'
+Available: False
+Component: main
+_CompDescription: Officially supported
+Component: restricted
+_CompDescription: Restricted copyright
+
+Suite: maverick-security
+ParentSuite: maverick
+RepositoryType: deb
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
+_Description: Important security updates
+
+Suite: maverick-updates
+ParentSuite: maverick
+RepositoryType: deb
+_Description: Recommended updates
+
+Suite: maverick-proposed
+ParentSuite: maverick
+RepositoryType: deb
+_Description: Pre-released updates
+
+Suite: maverick-backports
+ParentSuite: maverick
+RepositoryType: deb
+_Description: Unsupported updates
+
 Suite: lucid
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-BaseURI-powerpc: http://ports.ubuntu.com/
-MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
-BaseURI-lpia: http://ports.ubuntu.com/
-MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu
+MatchURI-i386: archive.ubuntu.com/ubuntu
 MirrorsFile-amd64: Ubuntu.mirrors
 MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 10.04 'Lucid Lynx'
@@ -38,12 +99,12 @@ _CompDescription: Restricted copyright
 Suite: lucid-security
 ParentSuite: lucid
 RepositoryType: deb
-BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
-BaseURI-powerpc: http://ports.ubuntu.com/
-MatchURI-powerpc: ports.ubuntu.com/ubuntu
-BaseURI-lpia: http://ports.ubuntu.com/
-MatchURI-lpia: ports.ubuntu.com/ubuntu
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
 _Description: Important security updates
 
 Suite: lucid-updates
@@ -63,12 +124,12 @@ _Description: Unsupported updates
 
 Suite: karmic
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-BaseURI-powerpc: http://ports.ubuntu.com/
-MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
-BaseURI-lpia: http://ports.ubuntu.com/
-MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu
 MirrorsFile-amd64: Ubuntu.mirrors
 MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 9.10 'Karmic Koala'
@@ -99,12 +160,12 @@ _CompDescription: Restricted copyright
 Suite: karmic-security
 ParentSuite: karmic
 RepositoryType: deb
-BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
-BaseURI-powerpc: http://ports.ubuntu.com/
-MatchURI-powerpc: ports.ubuntu.com/ubuntu
-BaseURI-lpia: http://ports.ubuntu.com/
-MatchURI-lpia: ports.ubuntu.com/ubuntu
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
 _Description: Important security updates
 
 Suite: karmic-updates
@@ -124,12 +185,12 @@ _Description: Unsupported updates
 
 Suite: jaunty
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-BaseURI-powerpc: http://ports.ubuntu.com/
-MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
-BaseURI-lpia: http://ports.ubuntu.com/
-MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu
 MirrorsFile-amd64: Ubuntu.mirrors
 MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 9.04 'Jaunty Jackalope'
@@ -160,12 +221,12 @@ _CompDescription: Restricted copyright
 Suite: jaunty-security
 ParentSuite: jaunty
 RepositoryType: deb
-BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
-BaseURI-powerpc: http://ports.ubuntu.com/
-MatchURI-powerpc: ports.ubuntu.com/ubuntu
-BaseURI-lpia: http://ports.ubuntu.com/
-MatchURI-lpia: ports.ubuntu.com/ubuntu
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
 _Description: Important security updates
 
 Suite: jaunty-updates
@@ -185,12 +246,12 @@ _Description: Unsupported updates
 
 Suite: intrepid
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-BaseURI-powerpc: http://ports.ubuntu.com/
-MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
-BaseURI-lpia: http://ports.ubuntu.com/
-MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu
 MirrorsFile-amd64: Ubuntu.mirrors
 MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 8.10 'Intrepid Ibex'
@@ -221,12 +282,12 @@ _CompDescription: Restricted copyright
 Suite: intrepid-security
 ParentSuite: intrepid
 RepositoryType: deb
-BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
-BaseURI-powerpc: http://ports.ubuntu.com/
-MatchURI-powerpc: ports.ubuntu.com/ubuntu
-BaseURI-lpia: http://ports.ubuntu.com/
-MatchURI-lpia: ports.ubuntu.com/ubuntu
+BaseURI: http://ports.ubuntu.com/ubuntu-ports/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
 _Description: Important security updates
 
 Suite: intrepid-updates
@@ -247,12 +308,12 @@ _Description: Unsupported updates
 
 Suite: hardy
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
-BaseURI-powerpc: http://ports.ubuntu.com/
-MatchURI-powerpc: ports.ubuntu.com|archive.ubuntu.com
-BaseURI-lpia: http://ports.ubuntu.com/
-MatchURI-lpia: ports.ubuntu.com|archive.ubuntu.com
+BaseURI: http://ports.ubuntu.com/ubuntu-ports
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu
 MirrorsFile-amd64: Ubuntu.mirrors
 MirrorsFile-i386: Ubuntu.mirrors
 _Description: Ubuntu 8.04 'Hardy Heron'
@@ -283,10 +344,12 @@ _CompDescription: Restricted copyright
 Suite: hardy-security
 ParentSuite: hardy
 RepositoryType: deb
-BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
-BaseURI-powerpc: http://ports.ubuntu.com/
-MatchURI-powerpc: ports.ubuntu.com/ubuntu
+BaseURI: http://ports.ubuntu.com/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
 _Description: Important security updates
 
 Suite: hardy-updates
@@ -307,8 +370,14 @@ _Description: Unsupported updates
 
 Suite: gutsy
 RepositoryType: deb
-BaseURI: http://archive.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu
+BaseURI: http://ports.ubuntu.com/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://archive.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu
+BaseURI-i386: http://archive.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu
+BaseURI-sparc: http://archive.ubuntu.com/ubuntu/
+MatchURI-sparc: archive.ubuntu.com/ubuntu
 MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 7.10 'Gutsy Gibbon'
 Component: main
@@ -338,8 +407,14 @@ _CompDescription: Restricted copyright
 Suite: gutsy-security
 ParentSuite: gutsy
 RepositoryType: deb
-BaseURI: http://security.ubuntu.com/ubuntu/
-MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI: http://ports.ubuntu.com/
+MatchURI: ports.ubuntu.com/ubuntu-ports
+BaseURI-amd64: http://security.ubuntu.com/ubuntu/
+MatchURI-amd64: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-i386: http://security.ubuntu.com/ubuntu/
+MatchURI-i386: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-sparc: http://security.ubuntu.com/ubuntu/
+MatchURI-sparc: archive.ubuntu.com/ubuntu|security.ubuntu.com
 _Description: Important security updates
 
 Suite: gutsy-updates
@@ -362,6 +437,10 @@ Suite: feisty
 RepositoryType: deb
 BaseURI: http://archive.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu
+BaseURI-ia64: http://ports.ubuntu.com/
+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
+BaseURI-hppa: http://ports.ubuntu.com/
+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
 MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 7.04 'Feisty Fawn'
 Component: main
@@ -393,6 +472,10 @@ ParentSuite: feisty
 RepositoryType: deb
 BaseURI: http://security.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-ia64: http://ports.ubuntu.com/
+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
+BaseURI-hppa: http://ports.ubuntu.com/
+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
 _Description: Important security updates
 
 Suite: feisty-updates
@@ -414,6 +497,10 @@ Suite: edgy
 RepositoryType: deb
 BaseURI: http://archive.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu
+BaseURI-ia64: http://ports.ubuntu.com/
+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
+BaseURI-hppa: http://ports.ubuntu.com/
+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
 MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 6.10 'Edgy Eft'
 Component: main
@@ -445,6 +532,10 @@ ParentSuite: edgy
 RepositoryType: deb
 BaseURI: http://security.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-ia64: http://ports.ubuntu.com/
+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
+BaseURI-hppa: http://ports.ubuntu.com/
+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
 _Description: Important security updates
 
 Suite: edgy-updates
@@ -466,6 +557,10 @@ Suite: dapper
 RepositoryType: deb
 BaseURI: http://archive.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu
+BaseURI-ia64: http://ports.ubuntu.com/
+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
+BaseURI-hppa: http://ports.ubuntu.com/
+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
 MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 6.06 LTS 'Dapper Drake'
 Component: main
@@ -497,6 +592,10 @@ ParentSuite: dapper
 RepositoryType: deb
 BaseURI: http://security.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-ia64: http://ports.ubuntu.com/
+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
+BaseURI-hppa: http://ports.ubuntu.com/
+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
 _Description: Important security updates
 
 Suite: dapper-updates
@@ -519,6 +618,10 @@ RepositoryType: deb
 BaseURI: http://archive.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu
 MirrorsFile: Ubuntu.mirrors
+BaseURI-ia64: http://ports.ubuntu.com/
+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
+BaseURI-hppa: http://ports.ubuntu.com/
+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
 _Description: Ubuntu 5.10 'Breezy Badger'
 Component: main
 _CompDescription: Officially supported
@@ -545,6 +648,10 @@ ParentSuite: breezy
 RepositoryType: deb
 BaseURI: http://security.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-ia64: http://ports.ubuntu.com/
+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
+BaseURI-hppa: http://ports.ubuntu.com/
+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
 _Description: Ubuntu 5.10 Security Updates
 
 Suite: breezy-updates
@@ -561,6 +668,10 @@ Suite: hoary
 RepositoryType: deb
 BaseURI: http://archive.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu
+BaseURI-ia64: http://ports.ubuntu.com/
+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
+BaseURI-hppa: http://ports.ubuntu.com/
+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
 MirrorsFile: Ubuntu.mirrors
 _Description: Ubuntu 5.04 'Hoary Hedgehog'
 Component: main
@@ -588,6 +699,10 @@ ParentSuite: hoary
 RepositoryType: deb
 BaseURI: http://security.ubuntu.com/ubuntu/
 MatchURI: archive.ubuntu.com/ubuntu|security.ubuntu.com
+BaseURI-ia64: http://ports.ubuntu.com/
+MatchURI-ia64: ports.ubuntu.com/ubuntu-ports
+BaseURI-hppa: http://ports.ubuntu.com/
+MatchURI-hppa: ports.ubuntu.com/ubuntu-ports
 _Description: Ubuntu 5.04 Security Updates
 
 Suite: hoary-updates
diff --git a/data/templates/Ubuntu.mirrors b/data/templates/Ubuntu.mirrors
index ee88b772..068b013d 100644
--- a/data/templates/Ubuntu.mirrors
+++ b/data/templates/Ubuntu.mirrors
@@ -15,7 +15,6 @@ http://mirror.files.bigpond.com/ubuntu/
 http://mirror.internode.on.net/pub/ubuntu/ubuntu/
 http://mirror.netspace.net.au/pub/ubuntu/
 http://mirror.optus.net/ubuntu/
-http://mirror.pacific.net.au/linux/ubuntu/
 http://mirror.waia.asn.au/ubuntu/
 #LOC:BA
 http://archive.ubuntu.com.ba/ubuntu/
@@ -85,7 +84,6 @@ ftp://ftp.fu-berlin.de/linux/ubuntu/
 ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu
 http://archive.ubuntu.uasw.edu/
 http://debian.charite.de/ubuntu/
-http://ftp-stud.fht-esslingen.de/Mirrors/ubuntu/
 http://ftp-stud.hs-esslingen.de/ubuntu/
 http://ftp.hosteurope.de/mirror/archive.ubuntu.com/
 http://ftp.stw-bonn.de/ubuntu/
@@ -97,15 +95,16 @@ http://ftp.uni-kl.de/pub/linux/ubuntu/
 http://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/
 http://ftp5.gwdg.de/pub/linux/debian/ubuntu/
 http://mirror.bauhuette.fh-aachen.de/ubuntu/
+http://mirror.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/
 http://mirror.netcologne.de/ubuntu/
 http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu/
 http://suse.uni-leipzig.de/pub/releases.ubuntu.com/ubuntu/
-http://swtsrv.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/
 http://ubuntu.intergenia.de/ubuntu/
 http://ubuntu.mirror.tudos.de/ubuntu/
 http://ubuntu.unitedcolo.de/ubuntu/
 http://www.osnt.org/ubuntu/
 #LOC:DK
+http://ftp.klid.dk/ftp/ubuntu/
 http://mirrors.dotsrc.org/ubuntu/
 http://mirrors.telianet.dk/ubuntu/
 #LOC:EE
@@ -125,6 +124,7 @@ http://ubuntu.grn.cat/ubuntu/
 http://ubuntu.uc3m.es/ubuntu/
 #LOC:FI
 http://mirrors.nic.funet.fi/ubuntu/
+http://ubuntu.trumpetti.atm.tut.fi/ubuntu/
 http://www.nic.funet.fi/pub/mirrors/archive.ubuntu.com/
 #LOC:FR
 http://archive.monubuntu.fr/
@@ -147,7 +147,7 @@ http://mirror.as29550.net/archive.ubuntu.com/
 http://mirror.bytemark.co.uk/ubuntu/
 http://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu/
 http://mirror.sov.uk.goscomb.net/ubuntu/
-http://mirrors.melbourne.co.uk/sites/archive.ubuntu.com/ubuntu/
+http://mirrors.melbourne.co.uk/ubuntu/
 http://ubuntu.datahop.net/ubuntu/
 http://ubuntu.positive-internet.com/ubuntu/
 http://ubuntu.retrosnub.co.uk/ubuntu/
@@ -174,7 +174,6 @@ http://ubuntu.sth.sze.hu/ubuntu/
 http://dl2.foss-id.web.id/ubuntu/
 http://kambing.ui.ac.id/ubuntu/
 http://kebo.vlsm.org/ubuntu/
-http://mirror.unej.ac.id/ubuntu/
 http://repo.undip.ac.id/ubuntu/
 http://ubuntu.indika.net.id/ubuntu/
 http://ubuntu.pesat.net.id/archive/
@@ -189,8 +188,10 @@ http://ftp.iitm.ac.in/ubuntu/
 http://mirror.cse.iitk.ac.in/ubuntu/
 http://ubuntuarchive.hnsdc.com/
 #LOC:IS
+http://speglar.simnet.is/ubuntu/
 http://ubuntu.lhi.is/ubuntu/
 #LOC:IT
+http://giano.com.dist.unige.it/ubuntu/
 http://ubuntu.fastbull.org/ubuntu/
 http://ubuntu.ictvalleumbra.it/ubuntu/
 http://ubuntu.mirror.garr.it/mirrors/ubuntu-archive/
@@ -228,12 +229,14 @@ http://archive.ubuntu.mnosi.org/ubuntu/
 #LOC:MT
 http://mirror.linux.org.mt/ubuntu/
 #LOC:MX
-http://tezcatl.fciencias.unam.mx/ubuntu/
+http://ubuntu.ujed.mx/ubuntu/
 #LOC:MY
 http://archive.mmu.edu.my/ubuntu/
 http://mirror.oscc.org.my/ubuntu/
+http://mirror.upm.edu.my/ubuntu/
 http://ubuntu.bytecraft.com.my/ubuntu/
 http://ubuntu.mmu.edu.my/ubuntu/
+http://www.mirror.upm.edu.my/ubuntu/
 #LOC:NA
 http://ubuntu-archive.polytechnic.edu.na/ubuntu/
 #LOC:NC
@@ -259,13 +262,10 @@ http://ubuntu.uib.no/archive/
 #LOC:NP
 http://archive.mitra.net.np/ubuntu/
 #LOC:NZ
-http://ftp.citylink.co.nz/ubuntu/
 http://mirror.ihug.co.nz/ubuntu/
-http://nz2.archive.ubuntu.com/ubuntu/
+http://ucmirror.canterbury.ac.nz/ubuntu/
 #LOC:PF
 http://pf.archive.ubuntu.com/ubuntu/
-#LOC:PH
-http://mirror.web.com.ph/ubuntu/
 #LOC:PL
 ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu/
 http://ftp.vectranet.pl/ubuntu/
@@ -312,6 +312,7 @@ http://ubuntu.saudi.net.sa/
 http://ftp.acc.umu.se/ubuntu/
 http://ftp.df.lth.se/ubuntu/
 http://ftp.ds.karen.hj.se/ubuntu/
+http://ftp.port80.se/ubuntu/
 http://ftp.sunet.se/pub/os/Linux/distributions/ubuntu/ubuntu/
 http://mirrors.se.eu.kernel.org/ubuntu/
 http://ubuntu.mirror.su.se/ubuntu/
@@ -331,6 +332,7 @@ http://mirror.in.th/osarchive/ubuntu/
 http://mirror1.ku.ac.th/ubuntu/
 http://ubuntu-archive.sit.kmutt.ac.th/
 #LOC:TR
+http://ftp.ankara.edu.tr/ubuntu/
 http://ftp.linux.org.tr/ubuntu/
 http://ftp.metu.edu.tr/ubuntu/
 http://russell.cs.bilgi.edu.tr/ubuntu/
@@ -362,6 +364,7 @@ http://76.73.4.58/ubuntu/
 http://archive.linux.duke.edu/ubuntu/
 http://astromirror.uchicago.edu/ubuntu/
 http://cudlug.cudenver.edu/ubuntu/
+http://ftp.unina.it/pub/linux/distributions/ubuntu/
 http://ftp.usf.edu/pub/ubuntu/
 http://ftp.ussg.iu.edu/linux/ubuntu/
 http://ftp.utexas.edu/ubuntu/
@@ -371,10 +374,10 @@ http://mirror.anl.gov/pub/ubuntu/
 http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/
 http://mirror.clarkson.edu/ubuntu/
 http://mirror.cs.umn.edu/ubuntu/
-http://mirror.hosef.org/ubuntu/
 http://mirror.its.uidaho.edu/pub/ubuntu/
 http://mirror.math.ucdavis.edu/ubuntu/
 http://mirror.peer1.net/ubuntu/
+http://mirror.pnl.gov/ubuntu/
 http://mirror.umoss.org/ubuntu/
 http://mirror.uoregon.edu/ubuntu/
 http://mirrors.acm.jhu.edu/ubuntu/
@@ -384,7 +387,6 @@ http://mirrors.cavecreek.net/ubuntu/
 http://mirrors.ccs.neu.edu/ubuntu/
 http://mirrors.cs.wmich.edu/ubuntu/
 http://mirrors.easynews.com/linux/ubuntu/
-http://mirrors.jgi-psf.org/ubuntu/
 http://mirrors.pavlovmedia.net/ubuntu/
 http://mirrors.rit.edu/ubuntu/
 http://mirrors.us.kernel.org/ubuntu/