Merged from mvo's branch

5 files changed, 736 insertions, 340 deletions

diff --git a/data/templates/Ubuntu.mirrors b/data/templates/Ubuntu.mirrors
index c6369d45..889575db 100644
--- a/data/templates/Ubuntu.mirrors
+++ b/data/templates/Ubuntu.mirrors
@@ -1,351 +1,264 @@
+#LOC:AT
+http://ubuntu.inode.at/ubuntu/
+http://gd.tuwien.ac.at/opsys/linux/ubuntu/archive/
 #LOC:AU
 http://ftp.iinet.net.au/pub/ubuntu/
-ftp://ftp.iinet.net.au/pub/ubuntu
-http://ftp.netspace.net.au/pub/ubuntu/
-ftp://ftp.netspace.net.au/pub/ubuntu/
-http://mirror.aarnet.edu.au/pub/ubuntu/archive/
-ftp://mirror.aarnet.edu.au/pub/ubuntu/archive/
-http://mirror.internode.on.net/pub/ubuntu/ubuntu/
-ftp://mirror.internode.on.net/pub/ubuntu/ubuntu/
 http://mirror.optus.net/ubuntu/
+http://mirror.internode.on.net/pub/ubuntu/ubuntu/
+http://mirror.aarnet.edu.au/pub/ubuntu/archive/
+http://mirror.3fl.net.au/ubuntu/
 http://mirror.pacific.net.au/linux/ubuntu/
-#LOC:AT
-http://esda.wu-wien.ac.at/pub/ubuntu-archive/
-ftp://esda.wu-wien.ac.at/pub/ubuntu-archive/
-http://ubuntu.inode.at/ubuntu/
-ftp://ubuntu.inode.at/ubuntu/
-http://gd.tuwien.ac.at/opsys/linux/ubuntu/archive/
-#LOC:BE
-http://ftp.belnet.be/pub/mirror/ubuntu.com/ubuntu/
-ftp://ftp.belnet.be/pub/mirror/ubuntu.com/ubuntu/
-http://ftp.belnet.be/linux/ubuntu/ubuntu/
-http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ubuntu/
+http://ftp.netspace.net.au/pub/ubuntu/
+http://public.planetmirror.com/pub/ubuntu/archive/
 #LOC:BA
 http://archive.ubuntu.com.ba/ubuntu/
-#LOC:BW
-http://bw.archive.ubuntu.com/ubuntu/
-ftp://bw.archive.ubuntu.com/ubuntu
-#LOC:BR
-http://br.archive.ubuntu.com/ubuntu/
-ftp://br.archive.ubuntu.com/ubuntu
-http://sft.if.usp.br/ubuntu/
-ftp://sft.if.usp.br/ubuntu/
-http://espelhos.edugraf.ufsc.br/ubuntu/
-http://ubuntu.c3sl.ufpr.br/ubuntu/
+#LOC:BE
+http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ubuntu/
+http://ftp.belnet.be/mirror/ubuntu.com/ubuntu/
 #LOC:BG
 http://ubuntu.linux-bg.org/ubuntu/
-ftp://ubuntu.linux-bg.org/ubuntu/
 http://ubuntu.ipacct.com/ubuntu/
-ftp://ubuntu.ipacct.com/ubuntu/
+#LOC:BR
+http://espelhos.edugraf.ufsc.br/ubuntu/
+http://www.las.ic.unicamp.br/pub/ubuntu/
+http://ubuntu.interlegis.gov.br/ubuntu/
+http://sft.if.usp.br/ubuntu/
+http://br.archive.ubuntu.com/ubuntu/
+#LOC:BW
+http://bw.archive.ubuntu.com/ubuntu/
 #LOC:CA
-http://gulus.USherbrooke.ca/ubuntu/
-ftp://gulus.USherbrooke.ca/ubuntu/
-http://gulus.usherbrooke.ca/ubuntu/
-ftp://gulus.usherbrooke.ca/ubuntu/
-http://mirror.csclub.uwaterloo.ca/ubuntu/
-ftp://mirror.csclub.uwaterloo.ca/ubuntu/
-http://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/
-ftp://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/
+http://gpl.savoirfairelinux.net/pub/mirrors/ubuntu/
 ftp://ftp.cs.mun.ca/pub/mirror/ubuntu/
+http://mirror.cpsc.ucalgary.ca/mirror/ubuntu.com/
+http://gulus.usherbrooke.ca/ubuntu/
 http://mirror.arcticnetwork.ca/pub/ubuntu/packages/
+http://mirror.csclub.uwaterloo.ca/ubuntu/
 http://ubuntu.mirror.rafal.ca/ubuntu/
+#LOC:CH
+http://mirror.zhdk.ch/ubuntu/
+http://mirror.switch.ch/ftp/mirror/ubuntu/
 #LOC:CL
-http://ftp.tecnoera.com/ubuntu/
-ftp://ftp.tecnoera.com/ubuntu/
+http://ubuntu.utalca.cl/
 http://cl.archive.ubuntu.com/ubuntu/
-ftp://cl.archive.ubuntu.com/ubuntu/
+http://ftp.tecnoera.com/ubuntu/
 #LOC:CN
-http://ubuntu.cn99.com/ubuntu/
+http://mirror.lupaworld.com/ubuntu/archive/
 http://mirrors.shlug.org/ubuntu/
-ftp://mirrors.shlug.org/ubuntu/
+http://mirror.rootguide.org/ubuntu/
+http://ubuntu.cn99.com/ubuntu/
 #LOC:CR
 http://ftp.ucr.ac.cr/ubuntu/
-#LOC:HR
-http://hr.archive.ubuntu.com/ubuntu/
-ftp://hr.archive.ubuntu.com/ubuntu/
+#LOC:CS
+http://mirror.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive/
+http://mirror2.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive/
 #LOC:CZ
-http://cz.archive.ubuntu.com/ubuntu/
-ftp://cz.archive.ubuntu.com/MIRRORS/archive.ubuntu.com/mirror/ubuntu/
 http://ubuntu.supp.name/ubuntu/
+http://cz.archive.ubuntu.com/ubuntu/
 http://ubuntu.sh.cvut.cz/
+#LOC:DE
+http://ftp.tu-chemnitz.de/pub/linux/ubuntu/
+http://ftp.hosteurope.de/mirror/archive.ubuntu.com/
+http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu/
+http://ftp-stud.fht-esslingen.de/Mirrors/ubuntu/
+http://de.archive.ubuntu.com/ubuntu/
+http://archive.ubuntu.uasw.edu/
+ftp://ftp.fu-berlin.de/linux/ubuntu/
+http://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/
+http://swtsrv.informatik.uni-mannheim.de/pub/linux/distributions/ubuntu/
+http://ubuntu.intergenia.de/ubuntu/
+http://ftp5.gwdg.de/pub/linux/debian/ubuntu/
+http://ftp.halifax.rwth-aachen.de/ubuntu/
+http://ftp.uni-kl.de/pub/linux/ubuntu/
+http://ftp.stw-bonn.de/ubuntu/
+http://ftp.cw.net/ubuntu/
+http://ftp-stud.hs-esslingen.de/ubuntu/
+http://snert.mi.hs-heilbronn.de/pub/ubuntu/ubuntu/
 #LOC:DK
 http://dk.archive.ubuntu.com/ubuntu/
-http://klid.dk/ftp/ubuntu/
-ftp://klid.dk/ubuntu
 http://mirror.uni-c.dk/ubuntu/
 #LOC:EE
 http://ftp.estpak.ee/ubuntu/
-ftp://ftp.estpak.ee/ubuntu/
+#LOC:ES
+http://ftp.gui.uva.es/sites/ubuntu.com/ubuntu/
+http://ftp.caliu.info/pub/distribucions/ubuntu/ubuntu/
+http://softlibre.unizar.es/ubuntu/archive/
+http://ubuntu.grn.cat/ubuntu/
+http://es.archive.ubuntu.com/ubuntu/
+http://ftp.udc.es/ubuntu/
+http://ftp.dat.etsit.upm.es/ubuntu/
 #LOC:FI
 http://www.nic.funet.fi/pub/mirrors/archive.ubuntu.com/
-ftp://ftp.funet.fi/pub/mirrors/archive.ubuntu.com/
 http://mirrors.nic.funet.fi/ubuntu/
 #LOC:FR
-ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/ubuntu/
-http://ftp.crihan.fr/ubuntu/
-ftp://ftp.crihan.fr/ubuntu/
-http://ftp.oleane.net/ubuntu/
-ftp://ftp.oleane.net/ubuntu/
 http://wwwftp.ciril.fr/pub/linux/ubuntu/archives/
-ftp://ftp.ciril.fr/pub/linux/ubuntu/archives/
+http://ubuntu.univ-nantes.fr/ubuntu/
+http://ftp.oleane.net/ubuntu/
 http://ftp.u-picardie.fr/mirror/ubuntu/ubuntu/
-ftp://ftp.u-picardie.fr/mirror/ubuntu/ubuntu/
+http://ubuntu.univ-reims.fr/ubuntu/
 http://mir1.ovh.net/ubuntu/
-ftp://mir1.ovh.net/ubuntu/
-http://ubuntu.univ-nantes.fr/ubuntu/
-ftp://ubuntu.univ-nantes.fr/ubuntu/
+ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/ubuntu/
+http://ftp.crihan.fr/ubuntu/
+#LOC:GB
+http://ubuntu-archive.datahop.it/ubuntu/
+http://ftp.ticklers.org/archive.ubuntu.org/ubuntu/
+http://ubuntu.virginmedia.com/archive/
+http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/
+http://ubuntu.positive-internet.com/ubuntu/
+http://ubuntu.retrosnub.co.uk/
+http://archive.ubuntu.com/ubuntu/
+http://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu/
 #LOC:GE
 http://ubuntu.eriders.ge/ubuntu/
-ftp://ubuntu.eriders.ge/ubuntu/
-#LOC:DE
-http://ftp-stud.hs-esslingen.de/ubuntu/
-ftp://ftp-stud.hs-esslingen.de/ubuntu/
-http://ubuntu.intergenia.de/ubuntu/
-http://de.archive.ubuntu.com/ubuntu/
-http://ftp.cw.net/ubuntu/
-ftp://ftp.cw.net/pub/linux/ftp.ubuntu.com/ubuntu/
-http://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/
-ftp://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu/
-ftp://ftp.fu-berlin.de/linux/ubuntu/
-http://ftp.halifax.rwth-aachen.de/ubuntu/
-ftp://ftp.halifax.rwth-aachen.de/ubuntu/
-ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu
-http://ftp.stw-bonn.de/ubuntu/
-ftp://ftp.stw-bonn.de/ubuntu/
-http://ftp.uni-kl.de/pub/linux/ubuntu/
-ftp://ftp.uni-kl.de/pub/linux/ubuntu/
-http://ftp5.gwdg.de/pub/linux/debian/ubuntu/
-ftp://ftp5.gwdg.de/pub/linux/debian/ubuntu/
-http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu/
-ftp://sunsite.informatik.rwth-aachen.de/pub/linux/ubuntu/ubuntu/
-http://archive.ubuntu.uasw.edu/
-ftp://ftp.uasw.edu/linux/ubuntu/archive/
-http://debian.charite.de/ubuntu/
-http://ftp.hosteurope.de/mirror/archive.ubuntu.com/
-ftp://ftp.hosteurope.de/mirror/archive.ubuntu.com/
-http://ftp-stud.fht-esslingen.de/Mirrors/ubuntu/
-http://ftp.tu-chemnitz.de/pub/linux/ubuntu/
-http://snert.mi.hs-heilbronn.de/pub/ubuntu/ubuntu/
 #LOC:GR
-http://ftp.duth.gr/pub/ubuntu/
-ftp://ftp.duth.gr/pub/ubuntu/
+http://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/
+http://gr.archive.ubuntu.com/ubuntu/
 http://ftp.ntua.gr/pub/linux/ubuntu/
-ftp://ftp.ntua.gr/pub/linux/ubuntu/
+http://ftp.duth.gr/pub/ubuntu/
 http://ubuntu.otenet.gr/
-ftp://ftp.otenet.gr/ubuntu/
 #LOC:HK
 http://ftp.hostrino.com/pub/ubuntu/archive/
-ftp://ftp.hostrino.com/pub/ubuntu/archive/
+#LOC:HR
+http://hr.archive.ubuntu.com/ubuntu/
 #LOC:HU
-http://ftp.freepark.org/ubuntu/
-ftp://ftp.freepark.org/ubuntu/
-http://packages.midian.hu//pub/linux/distributions/ubuntu/
 http://ftp.kfki.hu/linux/ubuntu/
-ftp://ftp.kfki.hu/pub/linux/ubuntu/
-#LOC:IS
-http://ubuntu.lhi.is/ubuntu/
-#LOC:IN
-http://ftp.iitm.ac.in/ubuntu/
-ftp://ftp.iitm.ac.in/ubuntu
+http://ftp.freepark.org/ubuntu/
 #LOC:ID
 http://dl2.foss-id.web.id/ubuntu/
 http://ubuntu.indika.net.id/ubuntu/
-ftp://ubuntu.indika.net.id/ubuntu/
 #LOC:IE
-http://ie.archive.ubuntu.com/ubuntu/
-ftp://ie.archive.ubuntu.com/ubuntu/
-http://ftp.esat.net/mirrors/archive.ubuntu.com/
 http://ftp.heanet.ie/pub/ubuntu/
+http://ftp.esat.net/mirrors/archive.ubuntu.com/
+http://ie.archive.ubuntu.com/ubuntu/
+#LOC:IN
+http://ftp.iitm.ac.in/ubuntu/
+#LOC:IS
+http://ubuntu.lhi.is/ubuntu/
 #LOC:IT
-http://ubuntu.fastbull.org/ubuntu/
-ftp://ubuntu.fastbull.org/ubuntu/
+http://giano.com.dist.unige.it/ubuntu/
 http://na.mirror.garr.it/mirrors/ubuntu-archive/
-ftp://na.mirror.garr.it/mirrors/ubuntu-archive/
+http://ubuntu.fastbull.org/ubuntu/
 #LOC:JP
-http://ftp.jaist.ac.jp/pub/Linux/ubuntu/
-ftp://ftp.jaist.ac.jp/pub/Linux/ubuntu/
 http://ftp.ecc.u-tokyo.ac.jp/ubuntu/
-ftp://ftp.ecc.u-tokyo.ac.jp/ubuntu/
+http://ubuntutym.u-toyama.ac.jp/ubuntu/
+http://ubuntu-ashisuto.ubuntulinux.jp/ubuntu/
 http://ftp.yz.yamagata-u.ac.jp/pub/linux/ubuntu/archives/
-ftp://ftp.yz.yamagata-u.ac.jp/pub/linux/ubuntu/archives/
+http://ftp.jaist.ac.jp/pub/Linux/ubuntu/
 http://ubuntu.mithril-linux.org/archives/
 #LOC:KR
 http://ftp.daum.net/ubuntu/
-ftp://ftp.daum.net/ubuntu/
-http://kr.archive.ubuntu.com/ubuntu/
-ftp://kr.archive.ubuntu.com/ubuntu/
 http://mirror.letsopen.com/os/ubuntu/
+http://kr.archive.ubuntu.com/ubuntu/
 #LOC:LV
 http://ftp.linux.edu.lv/ubuntu/
+#LOC:MN
+http://archive.ubuntu.mnosi.org/ubuntu/
 #LOC:MT
 http://mt.archive.ubuntu.com/ubuntu/
-ftp://mt.archive.ubuntu.com/ubuntu/
 #LOC:MX
 http://tezcatl.fciencias.unam.mx/ubuntu/
-ftp://tezcatl.fciencias.unam.mx/ubuntu/
+#LOC:NA
+http://ubuntu-archive.polytechnic.edu.na/ubuntu/
+#LOC:NC
+http://ubuntu.mls.nc/ubuntu/
 #LOC:NL
-http://nl.archive.ubuntu.com/ubuntu/
-ftp://nl.archive.ubuntu.com/ubuntu/
 http://nl2.archive.ubuntu.com/ubuntu/
-ftp://nl2.archive.ubuntu.com/ubuntu/
+http://ubuntu.mirror.cambrium.nl/ubuntu/
+http://nl3.archive.ubuntu.com/ubuntu/
+ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com/
 http://ftp.tiscali.nl/ubuntu/
-ftp://ftp.tiscali.nl/pub/mirror/ubuntu
-ftp://ftp.tudelft.nl/pub/Linux/archive.ubuntu.com/
 http://ubuntu.tiscali.nl/
-ftp://ubuntu.tiscali.nl/
-ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com/
-#LOC:NC
-http://ubuntu.mls.nc/ubuntu/
-ftp://ubuntu.mls.nc/ubuntu/
-#LOC:NZ
-http://nz2.archive.ubuntu.com/ubuntu/
-ftp://nz2.archive.ubuntu.com/ubuntu/
-http://ftp.citylink.co.nz/ubuntu/
+ftp://ftp.tudelft.nl/pub/Linux/archive.ubuntu.com/
+http://mirrors3.kernel.org/ubuntu/
+http://nl.archive.ubuntu.com/ubuntu/
 #LOC:NO
 http://ftp.uninett.no/ubuntu/
-ftp://ftp.uninett.no/ubuntu/
+#LOC:NZ
+http://nz2.archive.ubuntu.com/ubuntu/
+http://nz.archive.ubuntu.com/ubuntu/
 #LOC:PL
+http://ftp.wcss.pl/ubuntu/
 http://ftp.vectranet.pl/ubuntu/
-ftp://ftp.vectranet.pl/ubuntu
 ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu/
 http://ubuntu.task.gda.pl/ubuntu/
+http://piotrkosoft.net/pub/mirrors/ubuntu/
 #LOC:PT
-http://ftp.dei.uc.pt/pub/linux/ubuntu/archive/
-ftp://ftp.dei.uc.pt/pub/linux/ubuntu/archive/
-http://ubuntu.dcc.fc.up.pt/
-http://ftp.gil.di.uminho.pt/ubuntu/
-ftp://ftp.gil.di.uminho.pt/ubuntu/
 http://mosel.estg.ipleiria.pt/mirror/distros/ubuntu/archive/
+http://ubuntu.dcc.fc.up.pt/
 http://neacm.fe.up.pt/ubuntu/
-ftp://neacm.fe.up.pt/pub/ubuntu/
+http://ftp.gil.di.uminho.pt/ubuntu/
+http://darkstar.ist.utl.pt/ubuntu/archive/
+#LOC:QA
+http://ubuntu.qatar.cmu.edu/ubuntu/
 #LOC:RO
 http://ftp.astral.ro/mirrors/ubuntu.com/archive/
-ftp://ftp.astral.ro/mirrors/ubuntu.com/archive/
 http://ftp.lug.ro/ubuntu/
+#LOC:RS
+http://rs.archive.ubuntu.com/ubuntu/
 #LOC:RU
-http://mirror.yandex.ru/ubuntu/
-ftp://mirror.yandex.ru/ubuntu/
 ftp://ftp.mipt.ru/mirror/ubuntu/
-http://ftp.chg.ru/pub/Linux/ubuntu/archive/
-ftp://ftp.chg.ru/pub/Linux/ubuntu/archive/
-#LOC:Serbia and Montenegro
-http://mirror.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive/
-ftp://mirror.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive/
-http://mirror2.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive/
-ftp://mirror2.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive/
-http://yu.archive.ubuntu.com/ubuntu/
-ftp://yu.archive.ubuntu.com/ubuntu
+http://mirror.yandex.ru/ubuntu/
+#LOC:SE
+http://ftp.port80.se/ubuntu/
+http://ftp.ds.karen.hj.se/pub/os/linux/ubuntu/
+http://mirrors4.kernel.org/ubuntu/
+http://ftp.df.lth.se/ubuntu/
+http://se.archive.ubuntu.com/ubuntu/
 #LOC:SG
 http://ftp.science.nus.edu.sg/ubuntu/
-ftp://ftp.science.nus.edu.sg/pub/ubuntu/
 #LOC:SK
-http://ubuntu.ynet.sk/ubuntu/
+http://ftp.energotel.sk/pub/linux/ubuntu/
 http://ftp.tuke.sk/ubuntu/
-ftp://ftp.tuke.sk/ubuntu/
-#LOC:ZA
-http://ubuntu.mirror.ac.za/ubuntu-archive/
-ftp://ubuntu.mirror.ac.za/ubuntu-archive
-http://ftp.leg.uct.ac.za/pub/linux/ubuntu/
-ftp://ftp.leg.uct.ac.za/pub/linux/ubuntu/
-#LOC:ES
-http://es.archive.ubuntu.com/ubuntu/
-ftp://es.archive.ubuntu.com/ubuntu/
-http://ftp.udc.es/ubuntu/
-ftp://ftp.udc.es/ubuntu/
-http://ftp.dateleco.es/ubuntu/
-ftp://ftp.dateleco.es/ubuntu/
-http://ubuntu.grn.cat/ubuntu/
-ftp://ubuntu.grn.cat/ubuntu/
-http://ftp.caliu.info/pub/distribucions/ubuntu/ubuntu/
-http://ftp.gui.uva.es/sites/ubuntu.com/ubuntu/
-ftp://ftp.um.es/mirror/ubuntu/
-#LOC:SE
-http://se.archive.ubuntu.com/ubuntu/
-http://ftp.ds.karen.hj.se/pub/os/linux/ubuntu/
-ftp://ftp.ds.karen.hj.se/pub/os/linux/ubuntu/
-http://ftp.port80.se/ubuntu/
-#LOC:CH
-http://mirror.switch.ch/ftp/mirror/ubuntu/
-ftp://mirror.switch.ch/mirror/ubuntu/
-http://mirror.zhdk.ch/ubuntu/
-ftp://mirror.zhdk.ch/ubuntu/
-#LOC:TW
-http://free.nchc.org.tw/ubuntu/
-ftp://free.nchc.org.tw/ubuntu
-http://ftp.cse.yzu.edu.tw/pub/Linux/Ubuntu/ubuntu/
-ftp://ftp.cse.yzu.edu.tw/pub/Linux/Ubuntu/ubuntu/
-http://ftp.twaren.net/Linux/Ubuntu/ubuntu/
-ftp://ftp.twaren.net/Linux/Ubuntu/ubuntu/
-http://mirror.nttu.edu.tw/ubuntu/
-ftp://mirror.nttu.edu.tw/ubuntu/
-http://tw.archive.ubuntu.com/ubuntu/
-ftp://tw.archive.ubuntu.com/ubuntu/
-http://ftp.ncnu.edu.tw/Linux/ubuntu/ubuntu/
-ftp://ftp.ncnu.edu.tw/Linux/ubuntu/ubuntu/
-http://ubuntu.csie.nctu.edu.tw/ubuntu/
-ftp://ubuntu.csie.nctu.edu.tw/ubuntu/
+http://ubuntu.ynet.sk/ubuntu/
 #LOC:TH
 http://th.archive.ubuntu.com/ubuntu/
 #LOC:TR
 ftp://ftp.linux.org.tr/pub/ubuntu/
-http://godel.cs.bilgi.edu.tr/ubuntu/
-ftp://godel.cs.bilgi.edu.tr/ubuntu/
+http://ubuntu.gnu.gen.tr/ubuntu/
+#LOC:TW
+http://ubuntu.csie.nctu.edu.tw/ubuntu/
+http://ftp.ncnu.edu.tw/Linux/ubuntu/ubuntu/
+http://tw.archive.ubuntu.com/ubuntu/
+http://ftp.twaren.net/Linux/Ubuntu/ubuntu/
+http://debian.nctu.edu.tw/ubuntu/
+http://mirror.nttu.edu.tw/ubuntu/
+http://ftp.cse.yzu.edu.tw/pub/Linux/Ubuntu/ubuntu/
+http://free.nchc.org.tw/ubuntu/
 #LOC:UA
 http://ubuntu.org.ua/ubuntu/
-ftp://ubuntu.org.ua/ubuntu/
-#LOC:GB
-http://ubuntu-archive.datahop.it/ubuntu/
-ftp://ubuntu-archive.datahop.it/ubuntu/
-http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/
-ftp://ftp.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/
-http://archive.ubuntu.com/ubuntu/
-ftp://archive.ubuntu.com/ubuntu/
-http://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu/
-ftp://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu/
-http://ftp.ticklers.org/archive.ubuntu.org/ubuntu/
-ftp://ftp.ticklers.org/archive.ubuntu.org/ubuntu/
-http://ubuntu.positive-internet.com/ubuntu/
-http://ubuntu.virginmedia.com/archive/
-ftp://mirrors.virginmedia.com/mirrors/ubuntu/archive
 #LOC:US
-http://ftp.usf.edu/pub/ubuntu/
-ftp://ftp.usf.edu/pub/ubuntu/
-http://mirrors.cat.pdx.edu/ubuntu/
-ftp://mirrors.cat.pdx.edu/ubuntu/
-http://mirrors.easynews.com/linux/ubuntu/
-ftp://mirrors.easynews.com/linux/ubuntu
-http://mirrors.kernel.org/ubuntu/
-ftp://mirrors.kernel.org/ubuntu/
-http://mirrors.rit.edu/ubuntu/
-http://mirrors.xmission.com/ubuntu/
-ftp://mirrors.xmission.com/ubuntu/
-http://ubuntu.mirrors.tds.net/pub/ubuntu/
-ftp://ubuntu.mirrors.tds.net/pub/ubuntu/
 http://ubuntu.media.mit.edu/ubuntu/
-http://www.gtlib.gatech.edu/pub/ubuntu/
-ftp://ftp.gtlib.gatech.edu/pub/ubuntu
-http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/
-ftp://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/
+http://archive.ubuntu-rocks.org/ubuntu/
 http://mirror.imbrandon.com/ubuntu/
-http://mirrors.ccs.neu.edu/archive.ubuntu.com/
-ftp://mirrors.ccs.neu.edu/net/mirrors/archive.ubuntu.com/
-http://ubuntu.mirror.frontiernet.net/ubuntu/
-ftp://ubuntu.mirror.frontiernet.net/ubuntu/
-http://mirror.cs.umn.edu/ubuntu/
-http://mirror.lcsee.wvu.edu/ubuntu/
-http://ubuntu.cs.uaf.edu/ubuntu/
-http://cudlug.cudenver.edu/ubuntu/
-ftp://cudlug.cudenver.edu/ubuntu/
 http://ftp.unina.it/pub/linux/distributions/ubuntu/
+http://ubuntu.cs.utah.edu/ubuntu/
+http://mirrors.rit.edu/ubuntu/
+http://mirrors.cat.pdx.edu/ubuntu/
+http://ubuntu-mirror.cs.colorado.edu/ubuntu/
+http://ubuntu.mirror.frontiernet.net/ubuntu/
 http://ftp.ussg.iu.edu/linux/ubuntu/
 http://lug.mtu.edu/ubuntu/
-ftp://lug.mtu.edu/ubuntu/
-http://mirror.utdlug.org/linux/distributions/ubuntu/packages/
-ftp://mirror.utdlug.org/linux/distributions/ubuntu/packages/
+http://ftp.utexas.edu/ubuntu/
+http://www.gtlib.gatech.edu/pub/ubuntu/
+http://archive.linux.duke.edu/ubuntu/
+http://mirror.clarkson.edu/pub/ubuntu/
+http://cudlug.cudenver.edu/ubuntu/
+http://mirrors.easynews.com/linux/ubuntu/
+http://ubuntu.osuosl.org/ubuntu/
+http://mirror.fslutd.org/linux/distributions/ubuntu/packages/
+http://mirrors.us.kernel.org/ubuntu/
 http://mirrors.cs.wmich.edu/ubuntu/
-http://san.csc.calpoly.edu/ubuntu/ubuntu/
-http://ubuntu.cs.utah.edu/ubuntu/
+http://ubuntu.cs.uaf.edu/ubuntu/
+http://mirror.anl.gov/pub/ubuntu/
+http://mirrors.xmission.com/ubuntu/
+http://mirror.lcsee.wvu.edu/ubuntu/
+http://mirrors.acm.jhu.edu/ubuntu/
+http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive/
+http://ftp.usf.edu/pub/ubuntu/
+http://mirror.cs.umn.edu/ubuntu/
+http://mirrors.ccs.neu.edu/archive.ubuntu.com/
 http://ubuntu.secs.oakland.edu/
 #LOC:UZ
-http://ubuntu.snet.uz/ubuntu/
-ftp://ubuntu.snet.uz/ubuntu/
+http://ubuntu.uz/ubuntu/
+#LOC:ZA
+http://ftp.leg.uct.ac.za/pub/linux/ubuntu/
+http://ubuntu.mirror.ac.za/ubuntu-archive/
diff --git a/debian/changelog b/debian/changelog
index 52ef9f5f..8b622796 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
-python-apt (0.7.8) unstable; urgency=low
+python-apt (0.7.7ubuntu1) intrepid; urgency=low
 
+  * merged from debian-sid
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 22 Jul 2008 15:58:37 +0200
+
+python-apt (0.7.7) unstable; urgency=low
+
+  [ Emanuele Rocca ]
   * data/templates/Debian.info.in:
     - s/MatchUri/MatchURI/. Thanks, Gustavo Noronha Silva (closes: #487673)
   * python/cache.cc:
@@ -8,10 +15,7 @@ python-apt (0.7.8) unstable; urgency=low
   * doc/examples/config.py:
     - Fix config.py --help (closes: #257007)
 
- -- Emanuele Rocca <ema@debian.org>  Mon, 21 Jul 2008 17:20:59 +0200
-
-python-apt (0.7.7) unstable; urgency=low
-
+  [ Michael Vogt ]
   * python/apt_pkgmodule.cc:
     - fix bug in hashsum calculation when the original string
       contains \0 charackters (thanks to Celso Providelo and 
@@ -26,8 +30,33 @@ python-apt (0.7.7) unstable; urgency=low
   * debian/rules:
     - remove the arch-build target, we have bzr-builddeb now
 
+ -- Michael Vogt <mvo@debian.org>  Tue, 22 Jul 2008 10:16:03 +0200
+
+python-apt (0.7.6ubuntu3) intrepid; urgency=low
+
+  * apt/package.py:
+    - add "isAutoRemovable()" method
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Jul 2008 15:18:03 +0100
+
+python-apt (0.7.6ubuntu2) intrepid; urgency=low
+
+  * python/apt_pkgmodule.cc:
+    - fix bug in hashsum calculation when the original string
+      contains \0 charackters (thanks to Celso Providelo and 
+      Ryan Hass for the test-case) LP: #243630
+  * tests/test_hashsums.py:
+    - add tests for the hashsum code
+
  -- Michael Vogt <mvo@debian.org>  Fri, 04 Jul 2008 19:53:28 +0200
 
+python-apt (0.7.6ubuntu1) intrepid; urgency=low
+
+  * merged with debian, remaining changes:
+    - more up-to-date mirror list
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 04 Jul 2008 11:00:33 +0200
+
 python-apt (0.7.6) unstable; urgency=low
 
   * apt/cache.py:
@@ -36,7 +65,7 @@ python-apt (0.7.6) unstable; urgency=low
       race condition in the pkgcache.bin handling)
   * data/templates/Ubuntu.info.in:
     - added ubuntu 'intrepid'
-  * debian/README.source: 
+  * debian/README.source:
     - added (basic) documentation how to build python-apt
   * aptsources/distinfo.py:
     - support arch specific BaseURI, MatchURI and MirrosFile fields
@@ -46,6 +75,21 @@ python-apt (0.7.6) unstable; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Wed, 18 Jun 2008 14:46:43 +0200
 
+python-apt (0.7.5ubuntu2) intrepid; urgency=low
+
+  * apt/cache.py:
+    - add "memonly" option to apt.Cache() to force python-apt to
+      not touch the pkgcache.bin file (this works around a possible
+      race condition in the pkgcache.bin handling)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 13 Jun 2008 12:14:34 +0200
+
+python-apt (0.7.5ubuntu1) intrepid; urgency=low
+
+  * merged from debian-sid
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 12 Jun 2008 12:32:00 +0200
+
 python-apt (0.7.5) unstable; urgency=low
 
   * use the new ListUpdate() code
@@ -54,6 +98,51 @@ python-apt (0.7.5) unstable; urgency=low
     - export the Homepage field
   * python/tar.cc:
     - fix .lzma extraction (thanks to bigjools)
+   * python/sourcelist.cc:
+     - support GetIndexes() GetAll argument to implement
+       something like --print-uris
+   * python/apt_pkgmodule.cc:
+     - add InstState{Ok,ReInstReq,Hold,HoldReInstReq} constants
+   * apt/cache.py:
+     - add reqReinstallPkgs property that lists all packages in
+       ReInstReq or HoldReInstReq
+
+ -- Michael Vogt <mvo@debian.org>  Tue, 19 Feb 2008 21:06:36 +0100
+
+python-apt (0.7.4ubuntu9) intrepid; urgency=low
+
+  * aptsources/distinfo.py:
+    - support arch specific BaseURI, MatchURI and MirrosFile fields
+      in the distinfo template (LP: #220890)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 28 May 2008 12:20:23 +0200
+
+python-apt (0.7.4ubuntu8) intrepid; urgency=low
+
+  * data/templates/Ubuntu.info.in:
+    - added ubuntu 'intrepid'
+  * debian/README.source: 
+    - added (basic) documentation how to build python-apt
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 05 May 2008 10:40:58 +0200
+
+python-apt (0.7.4ubuntu7) hardy; urgency=low
+
+  * data/templates/Ubuntu.mirrors: 
+    - updated mirrors list from launchpad (LP: #153284)
+  * util/get_ubuntu_mirrors_from_lp.py:
+    - rewritten to use +archivemirrors-rss and feedburner
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 07 Apr 2008 16:15:28 +0200
+
+python-apt (0.7.4ubuntu6) hardy; urgency=low
+
+  * rebuild due to python-central problems
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Feb 2008 17:58:29 +0100
+
+python-apt (0.7.4ubuntu5) hardy; urgency=low
+
   * python/sourcelist.cc:
     - support GetIndexes() GetAll argument to implement
       something like --print-uris
@@ -63,8 +152,37 @@ python-apt (0.7.5) unstable; urgency=low
     - add reqReinstallPkgs property that lists all packages in
       ReInstReq or HoldReInstReq
 
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Feb 2008 16:55:51 +0100
+
+python-apt (0.7.4ubuntu4) hardy; urgency=low
+
+  * python/pkgrecords.cc:
+    - export the Homepage field
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 11 Feb 2008 10:34:39 +0100
+
+python-apt (0.7.4ubuntu3) hardy; urgency=low
+
+  * python/tar.cc:
+    - fix .lzma extraction (thanks to bigjools for reporting)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Jan 2008 09:57:31 +0000
+
+python-apt (0.7.4ubuntu2) hardy; urgency=low
+
+  * use the new apt ListUpdate() code
+  * add example in doc/examples/update.py
+
  -- Michael Vogt <mvo@debian.org>  Tue, 19 Feb 2008 21:06:36 +0100
 
+python-apt (0.7.4ubuntu1) hardy; urgency=low
+
+  * merged from debian/unstable, remaining changes:
+   - rebuild against latest apt
+   - maintainer field changed
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 13 Dec 2007 15:00:22 +0100
+
 python-apt (0.7.4) unstable; urgency=low
 
   * apt/debfile.py:
@@ -103,6 +221,53 @@ python-apt (0.7.4) unstable; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Thu, 06 Dec 2007 15:35:46 +0100
 
+python-apt (0.7.3.1ubuntu6) hardy; urgency=low
+
+  * remove python-central pre-depends, this is no longer needed
+    during upgrades now that we have "PYCENTRAL_NO_DPKG_QUERY"
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 21 Nov 2007 20:33:42 +0100
+
+python-apt (0.7.3.1ubuntu5) hardy; urgency=low
+
+  * add hardy to the ubuntu sources.list template
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Sat, 27 Oct 2007 15:03:18 -0400
+
+python-apt (0.7.3.1ubuntu4) gutsy; urgency=low
+
+  * pre-depend on gutsy version pycentral, this ensures that we get a 
+    updated dpkg with triggers support before pycentral uses  
+    /usr/bin/dpkg-querry (LP: #152827)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 15 Oct 2007 11:24:12 +0200
+
+python-apt (0.7.3.1ubuntu3) gutsy; urgency=low
+
+  * data/templates/Ubuntu.mirrors:
+    - update the static mirror list from LP (LP: #126148)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 11 Oct 2007 00:13:00 +0200
+
+python-apt (0.7.3.1ubuntu2) gutsy; urgency=low
+
+  * apt/package.py:
+    - fix apt.package.Dependency.relation initialization
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 01 Oct 2007 20:08:47 +0200
+
+python-apt (0.7.3.1ubuntu1) gutsy; urgency=low
+
+  * python/metaindex.cc:
+    - added support for the metaIndex objects
+  * python/sourceslist.cc:
+    - support new "List" attribute that returns the list of
+      metaIndex source entries
+  * python/string.cc:
+    - fix overflow in SizeToStr()
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 04 Sep 2007 16:36:11 +0200
+
 python-apt (0.7.3.1) unstable; urgency=low
 
   * NMU
@@ -111,6 +276,27 @@ python-apt (0.7.3.1) unstable; urgency=low
 
  -- Otavio Salvador <otavio@debian.org>  Thu, 02 Aug 2007 18:45:25 -0300
 
+python-apt (0.7.3ubuntu2) gutsy; urgency=low
+
+  * rebuild against latest apt
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 03 Aug 2007 14:16:41 +0200
+
+python-apt (0.7.3ubuntu1) gutsy; urgency=low
+
+  * apt/debfile.py:
+    - added wrapper around apt_inst.debExtract()
+    - support dictionary like access
+  * python/apt_instmodule.cc:
+    - added arCheckMember()
+  * build with latest python-distutils-extra (thanks
+    to doko for notifiying about the problem)
+  * aptsources/distro.py:
+    - throw NoDistroTemplateException if not distribution template
+      can be found
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 31 Jul 2007 13:40:04 +0200
+
 python-apt (0.7.3) unstable; urgency=low
 
   * apt/package.py:
@@ -135,6 +321,35 @@ python-apt (0.7.3) unstable; urgency=low
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 27 Jul 2007 16:57:28 +0200
 
+python-apt (0.7.2ubuntu3) gutsy; urgency=low
+
+  * Rebuild against libapt-pkg-libc6.6-6-4.4.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 09 Jul 2007 16:36:46 +0100
+
+python-apt (0.7.2ubuntu2) gutsy; urgency=low
+
+  * python/package.py:
+    - added Record class that can be accessed like a dictionary
+      and return it in candidateRecord and installedRecord
+      (thanks to Alexander Sack for discussing this with me)
+  * doc/examples/records.py:
+    - added example how to use the new Records class
+  * python/cache.py:
+    - throw FetchCancelleException, FetchFailedException, 
+      LockFailedException exceptions when something goes wrong
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 28 Jun 2007 16:03:01 +0200
+
+python-apt (0.7.2ubuntu1) gutsy; urgency=low
+
+  * merged from debian/unstable
+  * Remaining changes:
+    - data/templates/Ubuntu.info: gutsy repository information
+    - set Maintainer field to ubuntu
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 14 Jun 2007 12:08:49 +0200
+
 python-apt (0.7.2) unstable; urgency=low
 
   * build against the new apt
@@ -168,6 +383,21 @@ python-apt (0.6.22) unstable; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Wed, 23 May 2007 09:44:03 +0200
 
+python-apt (0.6.21ubuntu1) gutsy; urgency=low
+
+  [Michael Vogt]
+  * python/apt_pkgmodule.cc:
+    - added pkgCache::State::PkgCurrentState enums
+  * data/templates/Ubuntu.info.in:
+    - updated for gusty
+  [Sebastian Heinlein]
+  * Fix the addition of of sources that are already enabled but not with
+    all components - fix LP#98795
+  * Handle changes of forced servers of child repositories in a more
+    sane way - fix LP#85060
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  2 May 2007 14:27:54 +0200
+
 python-apt (0.6.21) unstable; urgency=low
 
   * apt/cdrom.py:
@@ -184,6 +414,145 @@ python-apt (0.6.21) unstable; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Tue, 24 Apr 2007 21:24:28 +0200
 
+python-apt (0.6.20ubuntu16) feisty; urgency=low
+
+  * Fix the addition of of sources that are already enabled but not with
+    all components - fix LP#98795
+
+ -- Sebastian Heinlein <glatzor@ubuntu.com>  Wed,  4 Apr 2007 11:31:33 +0200
+
+python-apt (0.6.20ubuntu15) unstable; urgency=low
+
+  [ Sebastian Heinlein ]
+  * Update the mirror lists from Launchpad
+  * Only include http and ftp servers - LP#99060
+  [Michael Vogt]
+  * fix error in invalid unicode handler (LP#99753)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  2 Apr 2007 14:25:31 +0200
+
+python-apt (0.6.20ubuntu14) feisty; urgency=low
+
+  [Michael Vogt]
+  * aptsources/distro.py:
+    - fix typo (LP#84009)
+  * fix gettext import (LP#92764)
+  * po/*.po:
+    - make update-po
+  [ Sebastian Heinlein ]
+  * remove an oboslete function
+  * fix the url comparision with trainling slashes - LP#95031
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 26 Mar 2007 18:47:22 +0200
+
+python-apt (0.6.20ubuntu13) feisty; urgency=low
+
+  * fix in the duplicated source checking (thanks to Sebastian Heinlein)
+  * python/depache.cc:
+    - properly support isAutoInstalled flag
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 14 Mar 2007 16:38:22 +0100
+
+python-apt (0.6.20ubuntu12) feisty; urgency=low
+
+  * apt/cdrom.py:
+    - fix bug in cdrom __init__ code
+  * debian/rules:
+    - added "DH_PYCENTRAL=nomove"
+
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  7 Mar 2007 10:41:00 +0100
+
+python-apt (0.6.20ubuntu11) feisty; urgency=low
+
+  * apt/packages.py:
+    - support candidateDependencies, installedDependencies
+    - support pkg.architecture
+    - support candidateRecord, installedRecord
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Mar 2007 16:22:49 +0100
+
+python-apt (0.6.20ubuntu10) feisty; urgency=low
+
+  * debian/control:
+    - added XS-Vcs-Bzr header to make finding the repo easier
+  * apt/cache.py:
+    - fix rootdir var
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  1 Mar 2007 14:36:33 +0100
+
+python-apt (0.6.20ubuntu9) feisty; urgency=low
+
+  * Re-add debian/python-apt.install (LP: #88134)
+    - This seems to have gone missing between 0.6.20ubuntu6 and 0.6.20ubuntu8
+    - This probably happened because it wasn't added to bzr
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Mon, 26 Feb 2007 14:04:15 -0800
+
+python-apt (0.6.20ubuntu8) feisty; urgency=low
+
+  * fix FTBFS
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 26 Feb 2007 18:41:37 +0100
+
+python-apt (0.6.20ubuntu7) feisty; urgency=low
+
+  * aptsources/distro.py:
+    - fix crash in add_source (LP#85806)
+  * apt/package.py:
+    - handle invalid unicode more gracefully (LP#86215)
+  * rebuild against latest apt
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 26 Feb 2007 14:31:00 +0100
+
+python-apt (0.6.20ubuntu6) feisty; urgency=low
+
+  * Build the extension for the debug interpreter.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 17 Feb 2007 02:10:37 +0100
+
+python-apt (0.6.20ubuntu5) feisty; urgency=low
+
+  * be more robust in has_repository (LP#84897)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 13 Feb 2007 17:49:55 +0100
+
+python-apt (0.6.20ubuntu4) feisty; urgency=low
+
+  * rebuild against latest libapt
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue,  6 Feb 2007 16:40:37 +0100
+
+python-apt (0.6.20ubuntu3) feisty; urgency=low
+
+  * fixes in the new 'aptsources' module 
+    (thanks to Sebastian Heinlein)
+  * apt/cdrom.py:
+    - better cdrom handling support
+  * python/string.cc:
+    - SizeToString supports PyLong too 
+  * apt/cache.py:
+    - fix rootdir
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  5 Feb 2007 10:29:55 +0100
+
+python-apt (0.6.20ubuntu2) feisty; urgency=low
+
+  * python/depcache.cc:
+    - MarkInstall() has new FromUser argument to support marking
+      packages as automatically installed
+  * merged the 'aptsources' module for sources.list handling 
+    (thanks to Sebastian Heinlein)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  2 Feb 2007 16:26:38 +0100
+
+python-apt (0.6.20ubuntu1) feisty; urgency=low
+
+  * merged from debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 19 Dec 2006 13:41:32 +0100
+
 python-apt (0.6.20) unstable; urgency=low
 
   * python/generic.h:
@@ -212,6 +581,94 @@ python-apt (0.6.20) unstable; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Tue, 19 Dec 2006 13:32:11 +0100
 
+python-apt (0.6.19ubuntu9.1) edgy-updates; urgency=low
+
+  * protect against not-parsable strings send from dpkg (lp: 68553)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 27 Oct 2006 10:41:44 +0200
+
+python-apt (0.6.19ubuntu9) edgy; urgency=low
+
+  * Reupload to restore dependency on python-central.
+  * debian/rules: Remove dh_python call.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 12 Oct 2006 14:26:46 +0200
+
+python-apt (0.6.19ubuntu8) edgy; urgency=low
+
+  * support pkgDepCache::ActionGroup()
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  6 Oct 2006 18:03:46 +0200
+
+python-apt (0.6.19ubuntu7) edgy; urgency=low
+
+  * python/generic.h:
+    - fix incorrect use of PyMem_DEL(), use PyObject_DEL()
+      instead. This fixes a nasty segfault with python2.5
+      (lp: 63226)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  4 Oct 2006 16:45:53 +0200
+
+python-apt (0.6.19ubuntu6) edgy; urgency=low
+
+  * python/progress.cc:
+    - fix memleak (lp: #43096)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  2 Oct 2006 18:33:44 +0200
+
+python-apt (0.6.19ubuntu5) edgy; urgency=low
+
+  * python/pkgmanager.cc:
+    - fix typo (closes: #382853)
+  * debian/control:
+    - tightend dependency (closes: #383478)
+  * apt/progress.py:
+    - use os._exit() in the child (lp: #53298)
+    - use select() when checking for statusfd (lp: #53282)
+  * acknoledge NMU (closes: #378048, #373512)
+  * python/apt_pkgmodule.cc:
+    - fix missing docstring (closes: #368907), 
+      Thanks to Josh Triplett
+  * make it build against python2.5
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 18 Sep 2006 18:28:19 +0200
+
+python-apt (0.6.19ubuntu4) edgy; urgency=low
+
+  * Rebuild to add support for python2.5.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri,  8 Sep 2006 13:32:47 +0000
+  
+python-apt (0.6.19ubuntu3) edgy; urgency=low
+
+  * merged ddtp support
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Aug 2006 16:25:51 +0200
+
+python-apt (0.6.19ubuntu2) edgy; urgency=low
+
+  * tightened build-deps on latest apt
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  3 Aug 2006 17:02:30 +0200
+
+python-apt (0.6.19ubuntu1) edgy; urgency=low
+
+  [ Michael Vogt ]
+  * doc/examples/print_uris.py:
+    - added a example to show how the indexfile.ArchiveURI() can be used
+      with binary packages
+  * python/apt_pkgmodule.cc:
+    - export sha256 generation
+  * added support for the pkgDepCache.IsGarbage() flag
+
+  [ Otavio Salvador ]
+  * apt/cache.py:
+    - fix commit doc string to also cite the open related callbacks
+    - allow change of rootdir for APT database loading
+    - add dh_installexamples in package building Closes: #376014
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 27 Jul 2006 15:00:55 +0200
+
 python-apt (0.6.19) unstable; urgency=low
 
   [ Michael Vogt ]
@@ -281,6 +738,83 @@ python-apt (0.6.17) unstable; urgency=low
   
  -- Michael Vogt <mvo@debian.org>  Mon,  8 May 2006 22:34:58 +0200
 
+python-apt (0.6.16.2ubuntu9) edgy; urgency=low
+
+  * rebuild against the latest apt (with auto-mark support)
+  * the full merge needs a newer python-support 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  3 Jul 2006 21:33:40 +0200
+
+python-apt (0.6.16.2ubuntu8) dapper; urgency=low
+
+  * apt/package.py:
+    - fix return value in {candidate,installed}Downloadable
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 17 May 2006 19:28:44 +0200
+
+python-apt (0.6.16.2ubuntu7) dapper; urgency=low
+
+  * apt/package.py:
+    - check if _lookupRecord() succeeded when checking
+      maintainer or description (fixes invalid descriptions under 
+      rare circumstances in gnome-app-install)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 17 May 2006 18:12:58 +0200
+
+python-apt (0.6.16.2ubuntu6) dapper; urgency=low
+
+  * debian/control:
+    - Replaces: python-apt (<< 0.6.11), instead of Conflicts which is not
+      correct here. (closes: #308586).
+  * python/srcrecords.cc:
+    - don't run auto "Restart" before performing a Lookup (but require
+      explicit "Restart", fixes the docs/examples/sources.py example)
+    - fix the initalization (no need to pass a PkgCacheType to the records)
+  
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  8 May 2006 16:40:14 +0200
+
+python-apt (0.6.16.2ubuntu5) dapper; urgency=low
+
+  * apt/cache.py: Release locks on failure (thanks to Colin Watson)
+    (closes: #35867)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 21 Mar 2006 15:09:14 +0100
+
+python-apt (0.6.16.2ubuntu4) dapper; urgency=low
+
+  * apt/package.py: 
+     - added Package.setDelete(purge) option
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon,  6 Mar 2006 18:59:33 +0000
+
+python-apt (0.6.16.2ubuntu3) dapper; urgency=low
+
+  * apt/package.py: undo some damager from pychecker
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed,  1 Mar 2006 15:34:23 +0100
+
+python-apt (0.6.16.2ubuntu2) dapper; urgency=low
+
+  * apt/progress.py: 
+    - initialize FetchProgress.eta with the correct type
+    - strip the staus str before passing it to InstallProgress.statusChanged()
+  * apt/cache.py:
+    - return useful values on Cache.update()
+  * fix FTBFS
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Feb 2006 14:07:06 +0100
+
+python-apt (0.6.16.2ubuntu1) dapper; urgency=low
+
+  * apt/progress.py: 
+    - added InstallProgress.statusChange(pkg, percent, status) 
+    - make DumbInstallProgress a new-style class 
+      (thanks to kamion for the suggestions)
+    - fix various pychecker warnings
+  * apt/cache.py, apt/package.py: fix various pychecker warnings
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Feb 2006 12:04:37 +0100
+
 python-apt (0.6.16.2) unstable; urgency=low
   
   * Non-maintainer upload.
@@ -300,6 +834,18 @@ python-apt (0.6.16.1) unstable; urgency=low
 
  -- Michael Vogt <mvo@debian.org>  Wed, 22 Feb 2006 10:41:13 +0100
 
+python-apt (0.6.16ubuntu2) dapper; urgency=low
+
+  * Drop python2.3 package.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 14 Feb 2006 15:27:26 +0000
+
+python-apt (0.6.16ubuntu1) dapper; urgency=low
+
+  * memleak fixed when pkgCache objects are deallocated
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 12 Jan 2006 00:08:05 +0100
+
 python-apt (0.6.16) unstable; urgency=low
 
   * added GetPkgAcqFile to queue individual file downloads with the 
diff --git a/debian/control b/debian/control
index 1303dc6c..a8109c8d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,14 @@
 Source: python-apt
 Section: python
 Priority: optional
-Maintainer: APT Development Team <deity@lists.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
 Standards-Version: 3.7.2.2
 XS-Python-Version: all
 Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.10), apt-utils, python-all-dev, python-distutils-extra (>= 1.9.0), cdbs, python-central (>= 0.5), python-all-dbg
-Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid
+XS-Original-Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid
+Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/python-apt/ubuntu
 
 Package: python-apt
 Architecture: any
diff --git a/utils/get_ubuntu_mirrors.py b/utils/get_ubuntu_mirrors.py
index 62b18ba6..80586e64 100755
--- a/utils/get_ubuntu_mirrors.py
+++ b/utils/get_ubuntu_mirrors.py
@@ -35,7 +35,7 @@ mirrors = []
 # path to the local mirror list
 list_path = "../data/templates/Ubuntu.mirrors"
 
-req = urllib2.Request("https://wiki.ubuntu.com/Archive?action=raw")
+req = urllib2.Request("https://wiki.ubuntu.com/Mirrors?action=raw")
 
 try:
     print "Downloading mirrors list from the Ubuntu wiki..."
diff --git a/utils/get_ubuntu_mirrors_from_lp.py b/utils/get_ubuntu_mirrors_from_lp.py
index 7d9116f2..fc47d708 100755
--- a/utils/get_ubuntu_mirrors_from_lp.py
+++ b/utils/get_ubuntu_mirrors_from_lp.py
@@ -1,88 +1,23 @@
-#!/usr/bin/env python
-#
-#  get_ubuntu_lp_mirrors.py
-#
-#  Download the latest list with available Ubuntu mirrors from Launchpad.net
-#  and extract the hosts from the raw page
-#
-#  Copyright (c) 2006 Free Software Foundation Europe
-#
-#  Author: Sebastian Heinlein <glatzor@ubuntu.com>
-# 
-#  This program is free software; you can redistribute it and/or 
-#  modify it under the terms of the GNU General Public License as 
-#  published by the Free Software Foundation; either version 2 of the
-#  License, or (at your option) any later version.
-# 
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-# 
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-#  USA
+#!/usr/bin/python
 
-import urllib2
-import re
+import feedparser
 import sys
 
-# the list of official Ubuntu servers
-mirrors = []
-# path to the local mirror list
-list_path = "../data/templates/Ubuntu.mirrors"
-
-
-try:
-    f = open("/usr/share/iso-codes/iso_3166.tab", "r")
-    lines = f.readlines()
-    f.close()
-except:
-    print "Could not read country information"
-    sys.exit(1)
+#d = feedparser.parse("https://launchpad.net/ubuntu/+archivemirrors-rss")
+d = feedparser.parse(open("+archivemirrors-rss"))
 
 countries = {}
-for line in lines:
-    parts = line.split("\t")
-    countries[parts[1].strip()] = parts[0].lower()
-
-req = urllib2.Request("https://launchpad.net/ubuntu/+archivemirrors")
-print "Downloading mirrors list from Launchpad..."
-try:
-    uri=urllib2.urlopen(req)
-    content = uri.read()
-    uri.close()
-except:
-    print "Failed to download or extract the mirrors list!"
-    sys.exit(1)
-
-content = content.replace("\n", "")
 
-content_splits = re.split(r'<tr class="highlighted"',
-                          re.findall(r'<table class="listing" '
-                                      'id="mirrors_list">.+?</table>',
-                                     content)[0])
-lines=[]
-def find(split):
-    country = re.search(r"<strong>(.+?)</strong>", split)
-    if not country:
-        return
-    if countries.has_key(country.group(1)):
-        lines.append("#LOC:%s" % countries[country.group(1)].upper())
-    else:
-        lines.append("#LOC:%s" % country.group(1))
-    # FIXME: currently the protocols are hardcoded: ftp http
-    urls = re.findall(r'<a href="(?![a-zA-Z:/_\-]+launchpad.+?">)'
-                       '(((http)|(ftp)).+?)">',
-                      split)
-    map(lambda u: lines.append(u[0]), urls)
+for entry in d.entries:
+    countrycode = entry.mirror_countrycode
+    if not countrycode in countries:
+        countries[countrycode] = set()
+    for link in entry.links:
+        countries[countrycode].add(link.href)
 
-map(find, content_splits)
 
-print "Writing local mirrors list: %s" % list_path
-list = open(list_path, "w")
-for line in lines:
-    list.write("%s\n" % line)
-list.close()
-print "Done."
+keys = countries.keys()
+keys.sort()
+for country in keys:
+    print "#LOC:%s" % country
+    print "\n".join(countries[country])