diff -Nru python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/data/templates/Debian.mirrors python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/data/templates/Debian.mirrors --- python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/data/templates/Debian.mirrors 2021-07-04 13:17:03.000000000 +0000 +++ python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/data/templates/Debian.mirrors 2021-10-22 15:55:06.000000000 +0000 @@ -13,10 +13,13 @@ http://ftp.tu-graz.ac.at/mirror/debian/ http://mirror.alwyzon.net/debian/ #LOC:AU +http://debian.mirror.digitalpacific.com.au/debian/ http://debian.mirror.serversaustralia.com.au/debian/ http://ftp.au.debian.org/debian/ http://mirror.aarnet.edu.au/debian/ +http://mirror.amaze.com.au/debian/ http://mirror.linux.org.au/debian/ +http://mirror.overthewire.com.au/debian/ http://mirror.realcompute.io/debian/ #LOC:BE http://ftp.be.debian.org/debian/ @@ -24,10 +27,10 @@ http://mirror.as35701.net/debian/ #LOC:BG http://debian.ipacct.com/debian/ -http://debian.ludost.net/debian/ http://debian.mnet.bg/debian/ http://debian.telecoms.bg/debian/ http://ftp.uni-sofia.bg/debian/ +http://mirror.telepoint.bg/debian/ http://mirrors.netix.net/debian/ #LOC:BR http://alcateia.ufscar.br/debian/ @@ -35,19 +38,21 @@ http://debian.itsbrasil.net/debian/ http://debian.pop-sc.rnp.br/debian/ http://ftp.br.debian.org/debian/ +http://mirror.uepg.br/debian/ http://mirror.unesp.br/debian/ #LOC:BY http://ftp.by.debian.org/debian/ http://ftp.byfly.by/debian/ http://mirror.datacenter.by/debian/ #LOC:CA -http://debian.ca-west.mirror.fullhost.com/debian/ http://debian.mirror.estruxture.net/debian/ +http://debian.mirror.globo.tech/debian/ http://debian.mirror.iweb.ca/debian/ http://debian.mirror.rafal.ca/debian/ http://ftp.ca.debian.org/debian/ http://mirror.csclub.uwaterloo.ca/debian/ http://mirror.estone.ca/debian/ +http://mirror.it.ubc.ca/debian/ #LOC:CH http://debian.ethz.ch/debian/ http://ftp.ch.debian.org/debian/ @@ -64,15 +69,18 @@ http://mirror.ufro.cl/debian/ #LOC:CN http://ftp.cn.debian.org/debian/ +http://mirror.bjtu.edu.cn/debian/ http://mirror.lzu.edu.cn/debian/ +http://mirror.nju.edu.cn/debian/ http://mirror.sjtu.edu.cn/debian/ +http://mirrors.163.com/debian/ http://mirrors.bfsu.edu.cn/debian/ +http://mirrors.hit.edu.cn/debian/ http://mirrors.huaweicloud.com/debian/ http://mirrors.tuna.tsinghua.edu.cn/debian/ http://mirrors.ustc.edu.cn/debian/ #LOC:CR http://debianmirror.una.ac.cr/debian/ -http://mirrors.ucr.ac.cr/debian/ #LOC:CZ http://debian.mirror.web4u.cz/ http://debian.superhosting.cz/debian/ @@ -82,7 +90,9 @@ http://ftp.sh.cvut.cz/debian/ http://ftp.zcu.cz/debian/ http://merlin.fit.vutbr.cz/debian/ +http://mirror-prg.webglobe.com/debian/ http://mirror.dkm.cz/debian/ +http://mirror.it4i.cz/debian/ #LOC:DE http://artfiles.org/debian/ http://de.mirrors.clouvider.net/debian/ @@ -91,7 +101,7 @@ http://debian.intergenia.de/debian/ http://debian.mirror.iphh.net/debian/ http://debian.mirror.lrz.de/debian/ -http://debian.tu-bs.de/debian/ +http://debian.netcologne.de/debian/ http://debian.uni-duisburg-essen.de/debian/ http://ftp-stud.hs-esslingen.de/debian/ http://ftp.de.debian.org/debian/ @@ -111,11 +121,11 @@ http://ftp.uni-stuttgart.de/debian/ http://ftp.wrz.de/debian/ http://ftp2.de.debian.org/debian/ -http://mirror.23media.de/debian/ +http://mirror.23m.com/debian/ http://mirror.de.leaseweb.net/debian/ http://mirror.dogado.de/debian/ http://mirror.eu.oneandone.net/debian/ -http://mirror.netcologne.de/debian/ +http://mirror.k-cix.de/debian/ http://mirror.netzwerge.de/debian/ http://mirror.united-gameserver.de/debian/ http://mirror.wtnet.de/debian/ @@ -166,8 +176,6 @@ http://ftp.u-strasbg.fr/debian/ http://ftp.univ-pau.fr/linux/mirrors/debian/ http://mirror.plusserver.com/debian/debian/ -http://mirrors.ircam.fr/pub/debian/ -http://murol.dc.univ-lorraine.fr/debian/ #LOC:GB http://debian.mirror.uk.sargasso.net/debian/ http://debian.mirrors.uk2.net/debian/ @@ -177,11 +185,9 @@ http://mirror.bytemark.co.uk/debian/ http://mirror.cov.ukservers.com/debian/ http://mirror.lchost.net/debian/ -http://mirror.mythic-beasts.com/debian/ http://mirror.ox.ac.uk/debian/ http://mirror.positive-internet.com/debian/ http://mirror.sov.uk.goscomb.net/debian/ -http://mirror.sucs.swan.ac.uk/pub/linux/debian/ http://mirror.vorboss.net/debian/ http://mirrors.coreix.net/debian/ http://mirrors.m247.com/debian/ @@ -191,9 +197,7 @@ #LOC:GE http://debian.grena.ge/debian/ #LOC:GR -http://debian.noc.ntua.gr/debian/ http://debian.otenet.gr/debian/ -http://ftp.gr.debian.org/debian/ #LOC:HK http://ftp.hk.debian.org/debian/ http://mirror.xtom.com.hk/debian/ @@ -206,20 +210,23 @@ http://ftp.bme.hu/debian/ http://ftp.fsn.hu/debian/ http://ftp.hu.debian.org/debian/ -http://ftp.kfki.hu/linux/debian/ http://repo.jztkft.hu/debian/ #LOC:ID http://kartolo.sby.datautama.net.id/debian/ http://kebo.pens.ac.id/debian/ +http://mirror.poliwangi.ac.id/debian/ +http://mirror.unair.ac.id/debian/ #LOC:IL http://mirror.isoc.org.il/pub/debian/ #LOC:IN +http://debianmirror.nkn.in/debian/ http://debmirror.hbcse.tifr.res.in/debian/ http://mirror.cse.iitk.ac.in/debian/ #LOC:IR http://debian.asis.ai/debian/ +http://debian.hostiran.ir/debian/ +http://debian.parspack.com/debian/ http://mirror.aminidc.com/debian/ -http://mirrors.pardisco.co/debian/ #LOC:IS http://ftp.is.debian.org/debian/ #LOC:IT @@ -236,7 +243,6 @@ http://dennou-q.gfd-dennou.org/debian/ http://ftp.jaist.ac.jp/debian/ http://ftp.jp.debian.org/debian/ -http://ftp.kddilabs.jp/pub/debian/ http://ftp.nara.wide.ad.jp/debian/ http://ftp.riken.jp/Linux/debian/debian/ http://ftp.yz.yamagata-u.ac.jp/debian/ @@ -247,7 +253,6 @@ #LOC:KH http://mirror.sabay.com.kh/debian/ #LOC:KR -http://ftp.harukasan.org/debian/ http://ftp.kaist.ac.kr/debian/ http://ftp.kr.debian.org/debian/ http://ftp.lanet.kr/debian/ @@ -257,18 +262,15 @@ http://mirror.hoster.kz/debian/ http://mirror.ps.kz/debian/ #LOC:LT +http://debian.balt.net/debian/ http://debian.mirror.vu.lt/debian/ http://ftp.lt.debian.org/debian/ -http://mirror.litnet.lt/debian/ http://mirror.vpsnet.com/debian/ #LOC:LU http://debian.mirror.root.lu/debian/ #LOC:LV http://debian.koyanet.lv/debian/ http://debian.linux.edu.lv/debian/ -#LOC:MC -http://debian.qontinuum.space/debian/ -http://ftp.nc.debian.org/debian/ #LOC:MD http://ftp.md.debian.org/debian/ http://mirror.as43289.net/debian/ @@ -276,7 +278,6 @@ #LOC:MK http://mirror.onevip.mk/debian/ #LOC:NC -http://debian.nautile.nc/debian/ http://mirror.lagoon.nc/debian/ #LOC:NL http://debian.mirror.cambrium.nl/debian/ @@ -285,10 +286,10 @@ http://ftp.nl.debian.org/debian/ http://mirror.dataone.nl/debian/ http://mirror.duocast.net/debian/ +http://mirror.erickochen.nl/debian/ http://mirror.i3d.net/debian/ http://mirror.nforce.com/debian/ http://mirror.nl.datapacket.com/debian/ -http://mirror.nl.leaseweb.net/debian/ http://mirror.novg.net/debian/ http://mirror.seedvps.com/debian/ http://mirror.serverius.net/debian/ @@ -302,7 +303,7 @@ http://ftp.nz.debian.org/debian/ http://mirror.fsmg.org.nz/debian/ #LOC:PH -http://mirror.pregi.net/debian/ +http://mirror.rise.ph/debian/ #LOC:PL http://debian.inhost.pro/debian/ http://ftp.agh.edu.pl/debian/ @@ -317,11 +318,11 @@ http://mirrors.ptisp.pt/debian/ http://mirrors.up.pt/debian/ #LOC:RE +http://debian.mithril.re/debian/ http://depot-debian.univ-reunion.fr/debian/ #LOC:RO http://mirror.linux.ro/debian/ http://mirrors.hostico.ro/debian/ -http://mirrors.layerbridge.com/debian/ http://mirrors.nav.ro/debian/ http://mirrors.nxthost.com/debian/ http://mirrors.pidginhost.com/debian/ @@ -337,6 +338,7 @@ http://mirror.mephi.ru/debian/ http://mirror.surf/debian/ http://mirror.truenetwork.ru/debian/ +http://mirrors.powernet.com.ru/debian/ #LOC:SE http://debian.lth.se/debian/ http://debian.mirror.su.se/debian/ @@ -344,7 +346,6 @@ http://ftp.se.debian.org/debian/ http://ftpmirror1.infania.net/debian/ http://mirror.linux.pizza/debian/ -http://mirror.zetup.net/debian/ http://mirrors.glesys.net/debian/ #LOC:SG http://mirror.0x.sg/debian/ @@ -367,12 +368,15 @@ http://ftp.linux.org.tr/debian/ http://ftp.tr.debian.org/debian/ #LOC:TW -http://debian.cs.nctu.edu.tw/debian/ +http://debian.csie.ncku.edu.tw/debian/ http://debian.csie.ntu.edu.tw/debian/ http://ftp.ntou.edu.tw/debian/ http://ftp.tw.debian.org/debian/ http://opensource.nchc.org.tw/debian/ +http://tw1.mirror.blendbyte.net/debian/ #LOC:UA +http://debian.astra.in.ua/debian/ +http://debian.netforce.hosting/debian/ http://debian.volia.net/debian/ http://mirror.mirohost.net/debian/ #LOC:US @@ -404,9 +408,7 @@ http://mirrors.namecheap.com/debian/ http://mirrors.syringanetworks.net/debian/ http://mirrors.wikimedia.org/debian/ -http://mirrors.xtom.com/debian/ http://nyc.mirrors.clouvider.net/debian/ -http://plug-mirror.rcac.purdue.edu/debian/ http://repo.ialab.dsu.edu/debian/ http://us.mirror.nsec.pt/debian/ #LOC:UY @@ -417,3 +419,4 @@ #LOC:ZA http://debian.saix.net/ http://ftp.is.co.za/debian/ +http://mirror.hostafrica.co.za/debian/ diff -Nru python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/data/templates/Ubuntu.mirrors python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/data/templates/Ubuntu.mirrors --- python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/data/templates/Ubuntu.mirrors 2021-07-04 13:17:03.000000000 +0000 +++ python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/data/templates/Ubuntu.mirrors 2021-10-22 15:55:06.000000000 +0000 @@ -12,23 +12,20 @@ http://ubuntu.anexia.at/ubuntu/ http://ubuntu.lagis.at/ubuntu/ http://ubuntu.uni-klu.ac.at/ubuntu/ +https://mirror.alwyzon.net/ubuntu/ https://mirror.kumi.systems/ubuntu-ports/ https://mirror.kumi.systems/ubuntu/ #LOC:AU http://ftp.iinet.net.au/pub/ubuntu/ http://mirror.aarnet.edu.au/pub/ubuntu/archive/ -http://mirror.as24220.net/pub/ubuntu-archive/ -http://mirror.as24220.net/pub/ubuntu/ http://mirror.intergrid.com.au/ubuntu/ http://mirror.internode.on.net/pub/ubuntu/ubuntu/ http://mirror.netspace.net.au/pub/ubuntu/ http://mirror.overthewire.com.au/ubuntu/ -http://mirror.realcompute.io/ubuntu/ -http://mirror.solnode.io/ubuntu/releases/ -http://ubuntu.mirror.datamossa.io/ubuntu/ http://ubuntu.mirror.serversaustralia.com.au/ubuntu/ +https://mirror.datamossa.io/ubuntu/archive/ https://mirror.internet.asn.au/pub/ubuntu/archive/ -https://mirror.launtel.net.au/ubuntu/ +https://mirror.realcompute.io/ubuntu/ https://ubuntu.mirror.digitalpacific.com.au/archive/ #LOC:AZ http://aze.archive.ubuntu.com/ubuntu/ @@ -50,12 +47,14 @@ http://ubuntu.ipacct.com/ubuntu/ http://ubuntu.uni-sofia.bg/ubuntu/ https://mirror.telepoint.bg/ubuntu/ +https://mirrors.cloudbalkan.com/archive/ #LOC:BR http://mirror.ufam.edu.br/ubuntu/ http://mirror.ufscar.br/ubuntu/ http://sft.if.usp.br/ubuntu/ http://ubuntu-archive.locaweb.com.br/ubuntu/ http://ubuntu.c3sl.ufpr.br/ubuntu/ +https://mirror.uepg.br/ubuntu/ https://ubuntu.itsbrasil.net/ubuntu/ https://ubuntu.letscloud.io/ubuntu/ #LOC:BW @@ -71,18 +70,17 @@ http://mirror.cedille.club/ubuntu/ http://mirror.clibre.uqam.ca/ubuntu/ http://mirror.csclub.uwaterloo.ca/ubuntu/ -http://mirror.it.ubc.ca/ubuntu/ http://mirror.its.dal.ca/ubuntu/ http://mirror.rcg.sfu.ca/mirror/ubuntu/ http://mirrors.layeronline.com/ubuntu/ http://muug.ca/mirror/ubuntu/ http://ubuntu.bhs.mirrors.ovh.net/ubuntu/ -http://ubuntu.ca-west.mirror.fullhost.io/ubuntu/ http://ubuntu.mirror.globo.tech/ http://ubuntu.mirror.iweb.ca/ http://ubuntu.mirror.rafal.ca/ubuntu/ https://mirror.0xem.ma/ubuntu/ https://mirror.esecuredata.com/ubuntu-archive/ +https://mirror.it.ubc.ca/ubuntu/ https://mirror.reenigne.net/ubuntu/ https://mirrors.switch.ca/ubuntu/ #LOC:CH @@ -99,9 +97,12 @@ https://mirror.ufro.cl/ubuntu/ #LOC:CN http://ftp.sjtu.edu.cn/ubuntu/ +http://mirror.dlut.edu.cn/ubuntu/ http://mirror.lzu.edu.cn/ubuntu/ http://mirrors.aliyun.com/ubuntu/ http://mirrors.cn99.com/ubuntu/ +http://mirrors.cqu.edu.cn/ubuntu/ +http://mirrors.dgut.edu.cn/ubuntu/ http://mirrors.huaweicloud.com/repository/ubuntu/ http://mirrors.njupt.edu.cn/ubuntu/ http://mirrors.skyshe.cn/ubuntu/ @@ -109,9 +110,16 @@ http://mirrors.tuna.tsinghua.edu.cn/ubuntu/ http://mirrors.ustc.edu.cn/ubuntu/ http://mirrors.yun-idc.com/ubuntu/ +http://ubuntu.cnssuestc.org/ubuntu/ +https://mirror.bjtu.edu.cn/ubuntu/ +https://mirror.nju.edu.cn/ubuntu/ https://mirrors.bfsu.edu.cn/ubuntu/ https://mirrors.bupt.edu.cn/ubuntu/ https://mirrors.cloud.tencent.com/ubuntu/ +https://mirrors.hit.edu.cn/ubuntu/ +https://repo.huaweicloud.com/ubuntu/ +#LOC:CO +http://mirror.unimagdalena.edu.co/ubuntu/ #LOC:CR http://ubuntu.ucr.ac.cr/ubuntu/ #LOC:CY @@ -121,8 +129,8 @@ http://ftp.cvut.cz/ubuntu/ http://ftp.linux.cz/pub/linux/ubuntu/ http://ftp.sh.cvut.cz/ubuntu/ -http://mirror.dkm.cz/ubuntu/ http://ucho.ignum.cz/ubuntu/ +https://mirror.dkm.cz/ubuntu/ https://mirror.it4i.cz/ubuntu/ #LOC:DE ftp://ftp.fu-berlin.de/linux/ubuntu/ @@ -148,7 +156,6 @@ http://mirror.daniel-jost.net/ubuntu/ http://mirror.eu-fr.kamatera.com/ubuntu/ http://mirror.funkfreundelandshut.de/ubuntu/ -http://mirror.ipb.de/ubuntu/ http://mirror.kamp.de/ubuntu/ http://mirror.netcologne.de/ubuntu/ http://mirror.ratiokontakt.de/mirror/ubuntu/ @@ -164,12 +171,13 @@ https://de.mirrors.clouvider.net/ubuntu/ https://files.tux-users.net/ubuntu/ https://ftp.uni-stuttgart.de/ubuntu/ +https://mirror.23m.com/ubuntu/ https://mirror.de.leaseweb.net/ubuntu/ https://mirror.de.vangus.co.il/ubuntu/ https://mirror.dogado.de/ubuntu/ +https://mirror.netzwerge.de/ubuntu/ https://mirror.scaleuptech.com/ubuntu/ https://mirrors.xtom.de/ubuntu/ -https://xd.dog/mirror/ubuntu/ #LOC:DK http://ftp.klid.dk/ftp/ubuntu/ http://mirror.netsite.dk/ubuntu/archive/ @@ -185,7 +193,6 @@ https://mirrors.xtom.ee/ubuntu/ #LOC:ES http://dafi.inf.um.es/ubuntu/ -http://es-mirrors.evowise.com/ubuntu/ http://ftp.caliu.cat/pub/distribucions/ubuntu/archive/ http://ftp.udc.es/ubuntu/ http://mirror.tedra.es/ubuntu/ @@ -195,6 +202,7 @@ http://ubuntu.uc3m.es/ubuntu/ https://ftp.csuc.cat/ubuntu/archieve/ #LOC:FI +http://mirror.hosthink.net/ubuntu/ http://mirrors.nic.funet.fi/ubuntu/ https://ubuntu.cybertips.info/ubuntu/ #LOC:FR @@ -221,6 +229,7 @@ http://mirror.freethought-internet.co.uk/ubuntu/ http://mirror.mythic-beasts.com/ubuntu/ http://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu/ +http://mirror.pulsant.com/sites/ubuntu-archive/ http://mirror.sov.uk.goscomb.net/ubuntu/ http://mirror.vorboss.net/ubuntu-archive/ http://mirrors.coreix.net/ubuntu/ @@ -228,7 +237,6 @@ http://mirrors.ukfast.co.uk/sites/archive.ubuntu.com/ http://ubuntu.mirrors.uk2.net/ubuntu/ http://ubuntu.positive-internet.com/ubuntu/ -http://uk-mirrors.evowise.com/ubuntu/ http://uk.mirror.nsec.pt/ubuntu/ http://uk.mirror.worldbus.ge/ubuntu/ http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu/ @@ -260,22 +268,22 @@ https://mirrors.sth.sze.hu/ubuntu/ https://quantum-mirror.hu/mirrors/pub/ubuntu/ #LOC:ID -http://buaya.klas.or.id/ubuntu/ -http://kambing.ui.ac.id/ubuntu/ http://kartolo.sby.datautama.net.id/ubuntu/ http://kebo.pens.ac.id/ubuntu/ http://mirror.biznetgio.com/ubuntu/ +http://mirror.cepatcloud.id/ubuntu/ http://mirror.deace.id/ubuntu/ http://mirror.labkom.id/ubuntu/ http://mirror.poliwangi.ac.id/ubuntu/ http://mirror.telkomuniversity.ac.id/ubuntu/ http://mirror.unej.ac.id/ubuntu/ http://suro.ubaya.ac.id/ubuntu/ +https://buaya.klas.or.id/ubuntu/ https://mirror.amscloud.co.id/ubuntu/ -https://mirror.dewabiz.com/ubuntu/ https://mirror.faizuladib.com/ubuntu/ https://mirror.gi.co.id/ubuntu/ https://mirror.papua.go.id/ubuntu/ +https://mirror.repository.id/ubuntu/ https://mirror.unair.ac.id/ubuntu/ #LOC:IE http://ftp.heanet.ie/pub/ubuntu/ @@ -294,6 +302,7 @@ http://ubuntu-archive.mirrors.estointernet.in/ http://ubuntu.hbcse.tifr.res.in/ubuntu/ http://ubuntu.mirror.snu.edu.in/ubuntu/ +https://repo.extreme-ix.org/ubuntu/ #LOC:IR http://archive.ubuntu.asiatech.ir/ http://ir.ubuntu.sindad.cloud/ubuntu/ @@ -305,7 +314,6 @@ http://repo.iut.ac.ir/repo/Ubuntu/ http://ubuntu.hostiran.ir/ubuntuarchive/ https://archive.ubuntu.petiak.ir/ubuntu/ -https://mirror.famaserver.com/ubuntu/archive/ https://mirror.iranserver.com/ubuntu/ https://ubuntu.shatel.ir/ubuntu/ #LOC:IS @@ -313,7 +321,6 @@ https://mirrors.opensource.is/ubuntu/ #LOC:IT http://giano.com.dist.unige.it/ubuntu/ -http://it-mirrors.evowise.com/ubuntu/ http://ubuntu.connesi.it/ubuntu/ http://ubuntu.mirror.garr.it/ubuntu/ #LOC:JP @@ -325,9 +332,8 @@ http://ubuntutym.u-toyama.ac.jp/ubuntu/ http://www.ftp.ne.jp/Linux/packages/ubuntu/archive/ https://linux.yz.yamagata-u.ac.jp/ubuntu/ -#LOC:KE -http://ubuntu.mirror.ac.ke/ubuntu/ #LOC:KH +http://mirror.telcotech.com.kh/Linux/ubuntu-releases/ https://mirror.sabay.com.kh/ubuntu/ #LOC:KR http://ftp.daum.net/ubuntu/ @@ -372,7 +378,6 @@ http://ubuntu.mirror.myduniahost.com/ubuntu/ http://ubuntu.tuxuri.com/ubuntu/ https://ubuntu.gbnetwork.com/ubuntu/ -https://ubuntu.ipserverone.com/ubuntu/ #LOC:NA http://download.nust.na/pub/ubuntu/ubuntu/ #LOC:NC @@ -402,6 +407,7 @@ http://osmirror.rug.nl/ubuntu/ http://ubuntu.mirror.cambrium.nl/ubuntu/ http://ubuntu.mirror.true.nl/ubuntu/ +https://mirror.erickochen.nl/ubuntu/ https://mirror.nl.bontekoe.technology/ubuntu/ https://mirror.nl.leaseweb.net/ubuntu/ https://mirrors.xtom.nl/ubuntu/ @@ -430,7 +436,6 @@ http://ftp.icm.edu.pl/pub/Linux/ubuntu/ http://ftp.vectranet.pl/ubuntu/ http://mirror.chmuri.net/ubuntu/ -http://piotrkosoft.net/pub/mirrors/ubuntu/ http://ubuntu.man.lodz.pl/ubuntu/ http://ubuntu.task.gda.pl/ubuntu/ #LOC:PR @@ -447,7 +452,6 @@ http://mirrors.nxthost.com/ubuntu/ http://mirrors.pidginhost.com/ubuntu/ http://mirrors.xservers.ro/ubuntu/ -http://ro-mirrors.evowise.com/ubuntu/ http://ubuntu.mirrors.linux.ro/archive/ https://mirror.efect.ro/ubuntu/archive/ https://mirrors.chroot.ro/ubuntu/ @@ -475,11 +479,15 @@ http://mirrors.c0urier.net/linux/ubuntu/ http://ubuntu.mirror.su.se/ubuntu/ https://ftpmirror1.infania.net/ubuntu/ -https://mirror.duvaliden.com/ubuntu/ #LOC:SG http://download.nus.edu.sg/mirror/ubuntu/ http://mirror.0x.sg/ubuntu/ http://mirror.aktkn.sg/ubuntu/ +http://mirror.kst.asia/ubuntu/ +http://mirror.soonkeat.sg/ubuntu/ +http://ossmirror.mycloud.services/os/linux/ubuntu/ +https://mirror.coganng.com/ubuntu-ports/ +https://mirror.coganng.com/ubuntu/ #LOC:SI http://ftp.arnes.si/pub/mirrors/ubuntu/ https://si.mirror.kumi.systems/ubuntu/ @@ -502,11 +510,11 @@ http://ubuntu.saglayici.com/ubuntu/ http://ubuntu.turhost.com/ubuntu/ http://ubuntu.vargonen.com/ubuntu/ +https://mirror.onlinehosting.com.tr/ubuntu/ https://mirror.sh.com.tr/ubuntu/ https://mirror.verinomi.com/ubuntu/ubuntu-archive/ #LOC:TW http://free.nchc.org.tw/ubuntu/ -http://ftp.mirror.tw/pub/ubuntu/ubuntu/ http://ftp.ntou.edu.tw/ubuntu/ http://ftp.tku.edu.tw/ubuntu/ http://ftp.ubuntu-tw.net/ubuntu/ @@ -514,23 +522,26 @@ http://mirror01.idc.hinet.net/ubuntu/ http://ubuntu.cs.nctu.edu.tw/ubuntu/ http://ubuntu.stu.edu.tw/ubuntu/ +https://ftp.tc.edu.tw/Linux/ubuntu/ +https://tw1.mirror.blendbyte.net/ubuntu/ https://ubuntu.ccns.ncku.edu.tw/ubuntu/ #LOC:TZ +http://deb-mirror.habari.co.tz/ubuntu/ http://mirror.aptus.co.tz/pub/ubuntuarchive/ #LOC:UA http://mirror.mirohost.net/ubuntu/ http://ubuntu.colocall.net/ubuntu/ http://ubuntu.mirrors.omnilance.com/ubuntu/ -http://ubuntu.netforce.hosting/ubuntu/ http://ubuntu.volia.net/ubuntu-archive/ +https://ubuntu.astra.in.ua/ubuntu/ https://ubuntu.ip-connect.vn.ua/ +https://ubuntu.netforce.hosting/ubuntu/ #LOC:UG http://mirror.renu.ac.ug/ubuntu/ #LOC:US http://archive.linux.duke.edu/ubuntu/ http://ftp.usf.edu/pub/ubuntu/ http://ftp.ussg.iu.edu/linux/ubuntu/ -http://la-mirrors.evowise.com/ubuntu/ http://lug.mtu.edu/ubuntu/ http://mirror.ancl.hawaii.edu/linux/ubuntu/ http://mirror.arizona.edu/ubuntu/ @@ -553,7 +564,6 @@ http://mirror.pit.teraswitch.com/ubuntu/ http://mirror.pnl.gov/ubuntu/ http://mirror.siena.edu/ubuntu/ -http://mirror.sjc02.svwh.net/ubuntu/ http://mirror.steadfastnet.com/ubuntu/ http://mirror.team-cymru.com/ubuntu/ http://mirror.team-cymru.org/ubuntu/ @@ -564,7 +574,6 @@ http://mirror.us-ny2.kamatera.com/ubuntu/ http://mirror.us-sc.kamatera.com/ubuntu/ http://mirror.us-tx.kamatera.com/ubuntu/ -http://mirror.vcu.edu/pub/gnu+linux/ubuntu/ http://mirrors.accretive-networks.net/ubuntu/ http://mirrors.advancedhosters.com/ubuntu/ http://mirrors.arpnetworks.com/Ubuntu/ @@ -586,11 +595,9 @@ http://mirrors.vcea.wsu.edu/ubuntu/ http://mirrors.wikimedia.org/ubuntu/ http://mirrors.xmission.com/ubuntu/ -http://ny-mirrors.evowise.com/ubuntu/ http://plug-mirror.rcac.purdue.edu/ubuntu/ http://pubmirrors.dal.corespace.com/ubuntu/ http://reflector.westga.edu/repos/Ubuntu/archive/ -http://repo.ialab.dsu.edu/ubuntu/ http://repo.miserver.it.umich.edu/ubuntu/ http://repos.forethought.net/ubuntu/ http://ubuntu.cs.utah.edu/ubuntu/ @@ -604,12 +611,16 @@ http://www.club.cc.cmu.edu/pub/ubuntu/ http://www.gtlib.gatech.edu/pub/ubuntu/ https://atl.mirrors.clouvider.net/ubuntu/ +https://dal.mirrors.clouvider.net/ubuntu/ https://la.mirrors.clouvider.net/ubuntu/ -https://mirror.os6.org/ubuntu/ +https://mirror.d.umn.edu/ubuntu/ +https://mirror.hostduplex.com/ubuntu/ https://mirror.us.leaseweb.net/ubuntu/ https://mirrors.bloomu.edu/ubuntu/ +https://mirrors.tscak.com/ubuntu/ https://mirrors.xtom.com/ubuntu/ https://nyc.mirrors.clouvider.net/ubuntu/ +https://repo.ialab.dsu.edu/ubuntu/ https://repos.eggycrew.com/ubuntu/ https://ubuntu.mirror.shastacoe.net/ubuntu/ #LOC:UY @@ -621,6 +632,7 @@ http://mirror.bizflycloud.vn/ubuntu/ http://mirror.clearsky.vn/ubuntu/ http://mirror.ehost.vn/ubuntu/ +http://mirror.vietnix.vn/ubuntu/ http://mirrors.nhanhoa.com/ubuntu/ http://mirrors.vhost.vn/ubuntu/ http://opensource.xtdv.net/ubuntu/ diff -Nru python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/debian/changelog python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/debian/changelog --- python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/debian/changelog 2021-07-04 13:17:03.000000000 +0000 +++ python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/debian/changelog 2021-10-22 15:55:06.000000000 +0000 @@ -1,8 +1,23 @@ -python-apt (2.2.1+git20210704.1222~ubuntu21.10.1) impish; urgency=low +python-apt (2.3.0+git20211022.1228~ubuntu21.10.1) impish; urgency=low * Auto build. - -- Peter J. Mello Sun, 04 Jul 2021 13:17:03 +0000 + -- Peter J. Mello Fri, 22 Oct 2021 15:55:06 +0000 + +python-apt (2.3.0) unstable; urgency=medium + + [ Edmund Blomley ] + * Fix pages deploy job only statement. + * Fix URL to python-apt Repository in Documentation. + + [ Julian Andres Klode ] + * Python 3.10 fixes: + - SourceRecordFiles: Set exception in __getitem__ + Fixes a regression with Python 3.10 in debug mode + - test_all: Avoid using deprecated distutils package + - test_tagfile: Avoid leaking file descriptor + + -- Julian Andres Klode Fri, 22 Oct 2021 12:21:54 +0200 python-apt (2.2.1) unstable; urgency=medium diff -Nru python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/debian/git-build-recipe.manifest python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/debian/git-build-recipe.manifest --- python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/debian/git-build-recipe.manifest 2021-07-04 13:17:03.000000000 +0000 +++ python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/debian/git-build-recipe.manifest 2021-10-22 15:55:06.000000000 +0000 @@ -1,2 +1,2 @@ -# git-build-recipe format 0.4 deb-version {debupstream}+git20210704.1222 -lp:python-apt git-commit:59458520f75683206a1d33e3779e079770f3902e +# git-build-recipe format 0.4 deb-version {debupstream}+git20211022.1228 +lp:python-apt git-commit:6145b6484d220685edfd922d364afbf065127efe diff -Nru python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/doc/source/tutorials/contributing.rst python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/doc/source/tutorials/contributing.rst --- python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/doc/source/tutorials/contributing.rst 2021-07-04 13:17:03.000000000 +0000 +++ python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/doc/source/tutorials/contributing.rst 2021-10-22 15:55:06.000000000 +0000 @@ -16,12 +16,12 @@ Repositories ^^^^^^^^^^^^ -https://anonscm.debian.org/cgit/apt/python-apt.git +https://salsa.debian.org/apt-team/python-apt.git This is the official Debian repository of python-apt. You can clone it using git by doing:: - git clone git://anonscm.debian.org/apt/python-apt.git + git clone git://salsa.debian.org/apt-team/python-apt.git All code which will be uploaded to Debian is here. diff -Nru python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/.gitlab-ci.yml python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/.gitlab-ci.yml --- python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/.gitlab-ci.yml 2021-07-04 13:17:03.000000000 +0000 +++ python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/.gitlab-ci.yml 2021-10-22 15:55:06.000000000 +0000 @@ -31,5 +31,5 @@ artifacts: paths: - public - only: - - master + rules: + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' diff -Nru python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/po/python-apt.pot python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/po/python-apt.pot --- python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/po/python-apt.pot 2021-07-04 13:17:03.000000000 +0000 +++ python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/po/python-apt.pot 2021-10-22 15:55:06.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-04-09 09:07+0200\n" +"POT-Creation-Date: 2021-10-22 12:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -28,489 +28,109 @@ msgid "Ubuntu development series" msgstr "" -#. Description -#: ../data/templates/Ubuntu.info.in:139 -msgid "Ubuntu 20.04 'Focal Fossa'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:146 -msgid "Cdrom with Ubuntu 20.04 'Focal Fossa'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:248 -msgid "Ubuntu 19.10 'Eoan Ermine'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:255 -msgid "Cdrom with Ubuntu 19.10 'Eoan Ermine'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:357 -msgid "Ubuntu 19.04 'Disco Dingo'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:364 -msgid "Cdrom with Ubuntu 19.04 'Disco Dingo'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:466 -msgid "Ubuntu 18.10 'Cosmic Cuttlefish'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:473 -msgid "Cdrom with Ubuntu 18.10 'Cosmic Cuttlefish'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:574 -msgid "Ubuntu 18.04 'Bionic Beaver'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:581 -msgid "Cdrom with Ubuntu 18.04 'Bionic Beaver'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:682 -msgid "Ubuntu 17.10 'Artful Aardvark'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:689 -msgid "Cdrom with Ubuntu 17.10 'Artful Aardvark'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:790 -msgid "Ubuntu 17.04 'Zesty Zapus'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:797 -msgid "Cdrom with Ubuntu 17.04 'Zesty Zapus'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:898 -msgid "Ubuntu 16.10 'Yakkety Yak'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:905 -msgid "Cdrom with Ubuntu 16.10 'Yakkety Yak'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1007 -msgid "Ubuntu 16.04 LTS 'Xenial Xerus'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1014 -msgid "Cdrom with Ubuntu 16.04 LTS 'Xenial Xerus'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1115 -msgid "Ubuntu 15.10 'Wily Werewolf'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1122 -msgid "Cdrom with Ubuntu 15.10 'Wily Werewolf'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1224 -msgid "Ubuntu 15.04 'Vivid Vervet'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1231 -msgid "Cdrom with Ubuntu 15.04 'Vivid Vervet'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1343 -msgid "Ubuntu 14.10 'Utopic Unicorn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1350 -msgid "Cdrom with Ubuntu 14.10 'Utopic Unicorn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1462 -msgid "Ubuntu 14.04 'Trusty Tahr'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1469 -msgid "Cdrom with Ubuntu 14.04 'Trusty Tahr'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1581 -msgid "Ubuntu 13.10 'Saucy Salamander'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1588 -msgid "Cdrom with Ubuntu 13.10 'Saucy Salamander'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1700 -msgid "Ubuntu 13.04 'Raring Ringtail'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1707 -msgid "Cdrom with Ubuntu 13.04 'Raring Ringtail'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1819 -msgid "Ubuntu 12.10 'Quantal Quetzal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1826 -msgid "Cdrom with Ubuntu 12.10 'Quantal Quetzal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1937 -msgid "Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:1944 -msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2055 -msgid "Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2062 -msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2174 -msgid "Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2181 -msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2272 -msgid "Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2292 -msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2304 -msgid "Canonical Partners" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:2306 -msgid "Software packaged by Canonical for their partners" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:2307 -msgid "This software is not part of Ubuntu." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2314 -msgid "Independent" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:2316 -msgid "Provided by third-party software developers" -msgstr "" - -#. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:2317 -msgid "Software offered by third party developers." -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2355 -msgid "Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2375 -msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2418 -msgid "Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2438 -msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2481 -msgid "Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2500 -msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2543 -msgid "Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2563 -msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2607 -msgid "Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2627 -msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2672 -msgid "Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2691 -msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2736 -msgid "Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2755 -msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2797 -msgid "Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:2802 -msgid "Community-maintained" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:2808 -msgid "Restricted software" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2816 -msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2858 -msgid "Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:2861 +#: ../data/templates/Ubuntu.info.in:122 msgid "Canonical-supported free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:2863 -msgid "Community-maintained (universe)" +#: ../data/templates/Ubuntu.info.in:124 +msgid "Community-maintained" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:2864 +#: ../data/templates/Ubuntu.info.in:125 msgid "Community-maintained free and open-source software" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:2866 +#: ../data/templates/Ubuntu.info.in:127 msgid "Non-free drivers" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:2867 +#: ../data/templates/Ubuntu.info.in:128 msgid "Proprietary drivers for devices" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:2869 -msgid "Restricted software (Multiverse)" +#: ../data/templates/Ubuntu.info.in:131 +msgid "Restricted software" msgstr "" #. CompDescriptionLong -#: ../data/templates/Ubuntu.info.in:2870 +#: ../data/templates/Ubuntu.info.in:132 msgid "Software restricted by copyright or legal issues" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:2877 -msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2893 -msgid "Important security updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2898 ../data/templates/Debian.info.in:146 -msgid "Recommended updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2903 -msgid "Pre-released updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2908 -msgid "Unsupported updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2919 -msgid "Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2934 -msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2950 -msgid "Ubuntu 5.10 Security Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2955 -msgid "Ubuntu 5.10 Updates" -msgstr "" - -#. Description -#: ../data/templates/Ubuntu.info.in:2960 -msgid "Ubuntu 5.10 Backports" +#: ../data/templates/Ubuntu.info.in:139 +msgid "Ubuntu {version} '{codename}'" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:2971 -msgid "Ubuntu 5.04 'Hoary Hedgehog'" +#: ../data/templates/Ubuntu.info.in:147 +msgid "Installation medium with Ubuntu {version} '{codename}'" msgstr "" -#. Description -#: ../data/templates/Ubuntu.info.in:2986 -msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'" +#. CompDescription +#: ../data/templates/Ubuntu.info.in:150 ../data/templates/Debian.info.in:90 +msgid "Officially supported" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:2989 ../data/templates/Debian.info.in:299 -msgid "Officially supported" +#: ../data/templates/Ubuntu.info.in:152 +msgid "Restricted copyright" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:3002 -msgid "Ubuntu 5.04 Security Updates" +#: ../data/templates/Ubuntu.info.in:159 +msgid "Canonical Partners" msgstr "" -#. Description -#: ../data/templates/Ubuntu.info.in:3007 -msgid "Ubuntu 5.04 Updates" +#. CompDescription +#: ../data/templates/Ubuntu.info.in:161 +msgid "Software packaged by Canonical for their partners" msgstr "" -#. Description -#: ../data/templates/Ubuntu.info.in:3012 -msgid "Ubuntu 5.04 Backports" +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:162 +msgid "This software is not part of Ubuntu." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:3018 -msgid "Ubuntu 4.10 'Warty Warthog'" +#: ../data/templates/Ubuntu.info.in:170 +msgid "Independent" msgstr "" #. CompDescription -#: ../data/templates/Ubuntu.info.in:3024 -msgid "Community-maintained (Universe)" +#: ../data/templates/Ubuntu.info.in:172 +msgid "Provided by third-party software developers" msgstr "" -#. CompDescription -#: ../data/templates/Ubuntu.info.in:3026 -msgid "Non-free (Multiverse)" +#. CompDescriptionLong +#: ../data/templates/Ubuntu.info.in:173 +msgid "Software offered by third party developers." msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:3033 -msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:3036 -msgid "No longer officially supported" -msgstr "" - -#. CompDescription -#: ../data/templates/Ubuntu.info.in:3038 -msgid "Restricted copyright" +#: ../data/templates/Ubuntu.info.in:192 +msgid "Important security updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:3045 -msgid "Ubuntu 4.10 Security Updates" +#: ../data/templates/Ubuntu.info.in:205 ../data/templates/Debian.info.in:36 +msgid "Recommended updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:3050 -msgid "Ubuntu 4.10 Updates" +#: ../data/templates/Ubuntu.info.in:218 +msgid "Pre-released updates" msgstr "" #. Description -#: ../data/templates/Ubuntu.info.in:3055 -msgid "Ubuntu 4.10 Backports" +#: ../data/templates/Ubuntu.info.in:231 +msgid "Unsupported updates" msgstr "" #. ChangelogURI @@ -520,82 +140,42 @@ msgstr "" #. Description -#: ../data/templates/Debian.info.in:8 -msgid "Debian 11 'bullseye'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:38 -msgid "Debian 10 'buster'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:68 -msgid "Debian 9 'stretch'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:98 -msgid "Debian 8 'jessie'" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:128 -msgid "Debian 7 'Wheezy' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:158 -msgid "Debian 6.0 'Squeeze' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:183 -msgid "Debian 5.0 'Lenny' " -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:208 -msgid "Debian 4.0 'Etch'" +#: ../data/templates/Debian.info.in:9 +msgid "Debian {version} '{codename}'" msgstr "" #. Description -#: ../data/templates/Debian.info.in:233 -msgid "Debian 3.1 'Sarge'" +#: ../data/templates/Debian.info.in:30 +msgid "Security updates" msgstr "" #. Description -#: ../data/templates/Debian.info.in:244 +#: ../data/templates/Debian.info.in:42 msgid "Proposed updates" msgstr "" #. Description -#: ../data/templates/Debian.info.in:251 -msgid "Security updates" -msgstr "" - -#. Description -#: ../data/templates/Debian.info.in:258 +#: ../data/templates/Debian.info.in:49 msgid "Debian current stable release" msgstr "" #. Description -#: ../data/templates/Debian.info.in:271 +#: ../data/templates/Debian.info.in:62 msgid "Debian testing" msgstr "" #. Description -#: ../data/templates/Debian.info.in:297 +#: ../data/templates/Debian.info.in:88 msgid "Debian 'Sid' (unstable)" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:301 +#: ../data/templates/Debian.info.in:92 msgid "DFSG-compatible Software with Non-Free Dependencies" msgstr "" #. CompDescription -#: ../data/templates/Debian.info.in:303 +#: ../data/templates/Debian.info.in:94 msgid "Non-DFSG-compatible Software" msgstr "" @@ -617,22 +197,22 @@ msgid "Custom servers" msgstr "" -#: ../apt/package.py:635 +#: ../apt/package.py:592 #, python-format msgid "Missing description for '%s'.Please report." msgstr "" -#: ../apt/package.py:643 +#: ../apt/package.py:600 #, python-format msgid "Invalid unicode in description for '%s' (%s). Please report." msgstr "" -#: ../apt/package.py:1319 ../apt/package.py:1331 ../apt/package.py:1440 -#: ../apt/package.py:1454 +#: ../apt/package.py:1276 ../apt/package.py:1288 ../apt/package.py:1397 +#: ../apt/package.py:1411 msgid "The list of changes is not available" msgstr "" -#: ../apt/package.py:1447 +#: ../apt/package.py:1404 #, python-format msgid "" "The list of changes is not available yet.\n" @@ -641,122 +221,122 @@ "until the changes become available or try again later." msgstr "" -#: ../apt/package.py:1460 +#: ../apt/package.py:1417 msgid "" "Failed to download the list of changes. \n" "Please check your Internet connection." msgstr "" -#: ../apt/debfile.py:109 +#: ../apt/debfile.py:97 #, python-format msgid "List of files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:122 +#: ../apt/debfile.py:110 #, python-format msgid "List of control files for '%s' could not be read" msgstr "" -#: ../apt/debfile.py:254 +#: ../apt/debfile.py:242 #, python-format msgid "Dependency is not satisfiable: %s\n" msgstr "" -#: ../apt/debfile.py:280 +#: ../apt/debfile.py:268 #, python-format msgid "Conflicts with the installed package '%s'" msgstr "" -#: ../apt/debfile.py:440 +#: ../apt/debfile.py:428 #, python-format msgid "" "Breaks existing package '%(pkgname)s' dependency %(depname)s " "(%(deprelation)s %(depversion)s)" msgstr "" -#: ../apt/debfile.py:467 +#: ../apt/debfile.py:455 #, python-format msgid "" "Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s " "%(targetver)s)" msgstr "" -#: ../apt/debfile.py:481 +#: ../apt/debfile.py:469 #, python-format msgid "" "Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But " "the '%(debfile)s' provides it via: '%(provides)s'" msgstr "" -#: ../apt/debfile.py:540 +#: ../apt/debfile.py:528 msgid "No Architecture field in the package" msgstr "" -#: ../apt/debfile.py:550 +#: ../apt/debfile.py:538 #, python-format msgid "" "Wrong architecture '%s' -- Run dpkg --add-architecture to add it and update " "afterwards" msgstr "" -#: ../apt/debfile.py:561 +#: ../apt/debfile.py:549 msgid "A later version is already installed" msgstr "" -#: ../apt/debfile.py:586 +#: ../apt/debfile.py:574 msgid "Failed to satisfy all dependencies (broken cache)" msgstr "" -#: ../apt/debfile.py:617 +#: ../apt/debfile.py:605 #, python-format msgid "Cannot install '%s'" msgstr "" -#: ../apt/debfile.py:699 +#: ../apt/debfile.py:687 msgid "" "Automatically decompressed:\n" "\n" msgstr "" -#: ../apt/debfile.py:705 +#: ../apt/debfile.py:693 msgid "Automatically converted to printable ascii:\n" msgstr "" -#: ../apt/debfile.py:816 +#: ../apt/debfile.py:804 #, python-format msgid "Install Build-Dependencies for source package '%s' that builds %s\n" msgstr "" -#: ../apt/debfile.py:831 +#: ../apt/debfile.py:819 msgid "An essential package would be removed" msgstr "" -#: ../apt/progress/text.py:111 +#: ../apt/progress/text.py:97 #, python-format msgid "%c%s... Done" msgstr "" -#: ../apt/progress/text.py:154 +#: ../apt/progress/text.py:140 msgid "Hit " msgstr "" -#: ../apt/progress/text.py:164 +#: ../apt/progress/text.py:150 msgid "Ign " msgstr "" -#: ../apt/progress/text.py:166 +#: ../apt/progress/text.py:152 msgid "Err " msgstr "" -#: ../apt/progress/text.py:178 +#: ../apt/progress/text.py:164 msgid "Get:" msgstr "" -#: ../apt/progress/text.py:245 +#: ../apt/progress/text.py:231 msgid " [Working]" msgstr "" -#: ../apt/progress/text.py:257 +#: ../apt/progress/text.py:243 #, python-format msgid "" "Media change: please insert the disc labeled\n" @@ -765,15 +345,15 @@ msgstr "" #. Trick for getting a translation from apt -#: ../apt/progress/text.py:267 +#: ../apt/progress/text.py:253 #, python-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "" -#: ../apt/progress/text.py:284 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +#: ../apt/progress/text.py:270 +msgid "Please provide a name for this medium, such as 'Debian 2.1r1 Disk 1'" msgstr "" -#: ../apt/progress/text.py:302 -msgid "Please insert a Disc in the drive and press enter" +#: ../apt/progress/text.py:288 +msgid "Please insert an installation medium and press enter" msgstr "" diff -Nru python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/python/pkgsrcrecords.cc python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/python/pkgsrcrecords.cc --- python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/python/pkgsrcrecords.cc 2021-07-04 13:17:03.000000000 +0000 +++ python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/python/pkgsrcrecords.cc 2021-10-22 15:55:06.000000000 +0000 @@ -40,6 +40,8 @@ case 3: return Py_BuildValue("s", f.Type.c_str()); } + + PyErr_Format(PyExc_IndexError, "index %d out of range, consider using the properties instead", i); return NULL; APT_IGNORE_DEPRECATED_POP } diff -Nru python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/tests/test_all.py python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/tests/test_all.py --- python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/tests/test_all.py 2021-07-04 13:17:03.000000000 +0000 +++ python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/tests/test_all.py 2021-10-22 15:55:06.000000000 +0000 @@ -22,8 +22,7 @@ # Find the path to the built apt_pkg and apt_inst extensions if not os.path.exists("../build"): return None - from distutils.util import get_platform - from distutils.sysconfig import get_python_version + from sysconfig import get_platform, get_python_version # Set the path to the build directory. plat_specifier = ".%s-%s" % (get_platform(), get_python_version()) library_dir = "../build/lib%s%s" % (plat_specifier, diff -Nru python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/tests/test_tagfile.py python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/tests/test_tagfile.py --- python-apt-2.2.1+git20210704.1222~ubuntu21.10.1/tests/test_tagfile.py 2021-07-04 13:17:03.000000000 +0000 +++ python-apt-2.3.0+git20211022.1228~ubuntu21.10.1/tests/test_tagfile.py 2021-10-22 15:55:06.000000000 +0000 @@ -69,7 +69,11 @@ # test once for compressed and uncompressed for testfile in glob.glob(tagfilepath): # test once using the open() method and once using the path - for f in [testfile, open(testfile)]: + tagfile = apt_pkg.TagFile(testfile) + for i, stanza in enumerate(tagfile): + pass + self.assertEqual(i, 2) + with open(testfile) as f: tagfile = apt_pkg.TagFile(f) for i, stanza in enumerate(tagfile): pass