[neon/forks/ubuntu-release-upgrader/Neon/unstable_focal] /: 1:20.04.36 (patches unapplied)

Jonathan Riddell null at kde.org
Sun Aug 15 11:41:09 BST 2021 

Git commit 9cf65aec48c36af746c7d360f57d12db4a315ed1 by Jonathan Riddell, on behalf of Brian Murray.
Committed on 15/08/2021 at 10:41.
Pushed by jriddell into branch 'Neon/unstable_focal'.

1:20.04.36 (patches unapplied)

Imported using git-ubuntu import.

M  +1    -1    DistUpgrade/DistUpgradeVersion.py
M  +1    -1    DistUpgrade/EOLReleaseAnnouncement
M  +1    -1    DistUpgrade/EOLReleaseAnnouncement.html
M  +1    -1    DistUpgrade/ReleaseAnnouncement
M  +1    -1    DistUpgrade/ReleaseAnnouncement.html
M  +11   -21   data/mirrors.cfg
M  +8    -0    debian/changelog

https://invent.kde.org/neon/forks/ubuntu-release-upgrader/commit/9cf65aec48c36af746c7d360f57d12db4a315ed1

diff --git a/DistUpgrade/DistUpgradeVersion.py b/DistUpgrade/DistUpgradeVersion.py
index bbfeb0e1..6ef9cf3c 100644
--- a/DistUpgrade/DistUpgradeVersion.py
+++ b/DistUpgrade/DistUpgradeVersion.py
@@ -1 +1 @@
-VERSION = '20.04.34'
+VERSION = '20.04.36'
diff --git a/DistUpgrade/EOLReleaseAnnouncement b/DistUpgrade/EOLReleaseAnnouncement
index dc63fd58..7eb7640a 100644
--- a/DistUpgrade/EOLReleaseAnnouncement
+++ b/DistUpgrade/EOLReleaseAnnouncement
@@ -39,7 +39,7 @@ will open a bug report in Launchpad regarding the linux package.
 
 If you have a question, or if you think you may have found a bug but
 aren't sure, first try asking on the #ubuntu or #ubuntu-bugs IRC
-channels on Freenode, on the Ubuntu Users mailing list, or on the
+channels on Libera.Chat, on the Ubuntu Users mailing list, or on the
 Ubuntu forums:
 
   http://help.ubuntu.com/community/InternetRelayChat
diff --git a/DistUpgrade/EOLReleaseAnnouncement.html b/DistUpgrade/EOLReleaseAnnouncement.html
index e2668cba..eb8ed4bc 100644
--- a/DistUpgrade/EOLReleaseAnnouncement.html
+++ b/DistUpgrade/EOLReleaseAnnouncement.html
@@ -63,7 +63,7 @@ will open a bug report in Launchpad regarding the linux package.
 <p>
 If you have a question, or if you think you may have found a bug but
 aren't sure, first try asking on the #ubuntu or #ubuntu-bugs IRC
-channels on Freenode, on the Ubuntu Users mailing list, or on the
+channels on Libera.Chat, on the Ubuntu Users mailing list, or on the
 Ubuntu forums:
 </p>
 <pre>
diff --git a/DistUpgrade/ReleaseAnnouncement b/DistUpgrade/ReleaseAnnouncement
index 17d9ff1e..de901792 100644
--- a/DistUpgrade/ReleaseAnnouncement
+++ b/DistUpgrade/ReleaseAnnouncement
@@ -33,7 +33,7 @@ will open a bug report in Launchpad regarding the linux package.
 
 If you have a question, or if you think you may have found a bug but
 aren't sure, first try asking on the #ubuntu or #ubuntu-bugs IRC
-channels on Freenode, on the Ubuntu Users mailing list, or on the
+channels on Libera.Chat, on the Ubuntu Users mailing list, or on the
 Ubuntu forums:
 
   http://help.ubuntu.com/community/InternetRelayChat
diff --git a/DistUpgrade/ReleaseAnnouncement.html b/DistUpgrade/ReleaseAnnouncement.html
index e1fe401f..c9faa9b3 100644
--- a/DistUpgrade/ReleaseAnnouncement.html
+++ b/DistUpgrade/ReleaseAnnouncement.html
@@ -58,7 +58,7 @@ will open a bug report in Launchpad regarding the linux package.
 <p>
 If you have a question, or if you think you may have found a bug but
 aren't sure, first try asking on the #ubuntu or #ubuntu-bugs IRC
-channels on Freenode, on the Ubuntu Users mailing list, or on the
+channels on Libera.Chat, on the Ubuntu Users mailing list, or on the
 Ubuntu forums:
 </p>
 <pre>
diff --git a/data/mirrors.cfg b/data/mirrors.cfg
index a8d3a298..521aad92 100644
--- a/data/mirrors.cfg
+++ b/data/mirrors.cfg
@@ -197,7 +197,6 @@ http://mirrors.yun-idc.com/ubuntu/
 http://ubuntu-archive.mirror.serveriai.lt/
 http://mirror.dhakacom.com/ubuntu/
 http://mirror2.tuxinator.org/ubuntu/
-http://ubuntu.mirror.ac.ke/ubuntu/
 http://ubuntu.ucr.ac.cr/ubuntu/
 http://ubuntu.mirror.lrz.de/ubuntu/
 http://mirror.as43289.net/ubuntu/
@@ -215,7 +214,6 @@ http://ftp.agh.edu.pl/ubuntu/
 http://kebo.pens.ac.id/ubuntu/
 http://mirror.cc.vt.edu/pub2/ubuntu/
 http://mirror.dhakacom.com/ubuntu-archive/
-http://mirror.it.ubc.ca/ubuntu/
 http://mirror.t-home.mk/ubuntu/
 http://mirror.zetup.net/ubuntu/
 http://mirrors.namecheap.com/ubuntu/
@@ -254,23 +252,17 @@ http://mirrors.wikimedia.org/ubuntu/
 http://mirror.freethought-internet.co.uk/ubuntu/
 http://ftp.estpak.ee/ubuntu/
 http://ubuntu.mirrors.omnilance.com/ubuntu/
-http://it-mirrors.evowise.com/ubuntu/
-http://ny-mirrors.evowise.com/ubuntu/
 http://ftp.sh.cvut.cz/ubuntu/
 http://ubuntu.mirror.ftn.uns.ac.rs/archive/
-http://uk-mirrors.evowise.com/ubuntu/
 http://mirror.aminidc.com/ubuntu/
 http://ubuntu.man.lodz.pl/ubuntu/
 http://repos.forethought.net/ubuntu/
 http://ubuntu.dts.mg/ubuntu/
-http://la-mirrors.evowise.com/ubuntu/
 http://mirror.rasanegar.com/ubuntu/archive/
 http://ubuntu.mirror.true.nl/ubuntu/
-http://es-mirrors.evowise.com/ubuntu/
 http://mirror.wiru.co.za/ubuntu/
 http://mirrors.up.pt/ubuntu/
 http://mirror.dkm.cz/ubuntu/
-http://ro-mirrors.evowise.com/ubuntu/
 http://www.club.cc.cmu.edu/pub/ubuntu/
 http://mirrors.lug.mtu.edu/ubuntu/
 http://mirrors.bangmod.cloud/ubuntu/
@@ -312,7 +304,6 @@ http://mirrors.nxthost.com/ubuntu/
 http://mirror.xeonbd.com/ubuntu-archive/
 http://ubuntu.colocall.net/ubuntu/
 http://ubuntu.mirror.serverloft.de/ubuntu/
-http://ubuntu.ca-west.mirror.fullhost.io/ubuntu/
 http://ubuntu.mirrors.linux.ro/archive/
 http://mirror.intergrid.com.au/ubuntu/
 http://mirror.sjc02.svwh.net/ubuntu/
@@ -343,11 +334,9 @@ http://pubmirrors.dal.corespace.com/ubuntu/
 http://mirrors.ustc.edu.cn/ubuntu/
 http://mirror.ancl.hawaii.edu/linux/ubuntu/
 ftp://ftp.cs.mun.ca/pub/mirror/ubuntu/
-http://mirror.steadfastnet.com/ubuntu/
 http://mirror.ps.kz/ubuntu/
 http://aze.archive.ubuntu.com/ubuntu/
 http://mirror.rise.ph/ubuntu/
-http://ubuntu.mirror.datamossa.io/ubuntu/
 http://mirrors.powernet.com.ru/ubuntu/
 http://mirror.linux.pizza/ubuntu/
 http://mirror.init7.net/ubuntu/
@@ -361,7 +350,6 @@ http://mirror1.totbb.net/ubuntu/
 http://mirrors.psu.ac.th/ubuntu/
 http://ubuntu.turhost.com/ubuntu/
 http://mirror.hostnet.nl/ubuntu/archive/
-http://repos.del.extreme-ix.org/ubuntu/
 http://ftp.heanet.ie/pub/ubuntu/
 http://www.gtlib.gatech.edu/pub/ubuntu/
 http://mirror-hk.koddos.net/ubuntu/
@@ -376,7 +364,6 @@ http://mirrors.piconets.webwerks.in/ubuntu-mirror/ubuntu/
 http://ftp.energotel.sk/pub/linux/ubuntu/
 http://ubuntu.hysing.is/ubuntu/
 http://mirrors.cqu.edu.cn/ubuntu/
-http://mirror.pregi.net/ubuntu/
 http://rep-ubuntu-il.upress.io/ubuntu/
 http://mirrors.ukfast.co.uk/sites/archive.ubuntu.com/
 http://mirror.siena.edu/ubuntu/
@@ -389,7 +376,6 @@ http://mirrors.asnet.am/ubuntu/
 http://mirrors.liquidweb.com/ubuntu/
 http://mirrors.dotsrc.org/ubuntu/
 http://mirrors.melbourne.co.uk/ubuntu/
-http://mirror.solnode.io/ubuntu/releases/
 http://mirrors.vcea.wsu.edu/ubuntu/
 http://mirror.23media.com/ubuntu/
 http://ubuntu.mirror.garr.it/ubuntu/
@@ -415,7 +401,6 @@ http://ftp.ntua.gr/ubuntu/
 http://hk.mirrors.thegigabit.com/ubuntu/
 http://mirror.eu-fr.kamatera.com/ubuntu/
 http://mirror.nwlab.tk/ubuntu/
-http://mirror.realcompute.io/ubuntu/
 http://www.ftp.ne.jp/Linux/packages/ubuntu/archive/
 http://mirror.ipb.de/ubuntu/
 http://linux.darkpenguin.net/distros/ubuntu-archive/
@@ -425,7 +410,6 @@ http://mirror.vcu.edu/pub/gnu+linux/ubuntu/
 http://ftp.linux.cz/pub/linux/ubuntu/
 http://mirrors.us.kernel.org/ubuntu/
 http://mirror.eu.kamatera.com/ubuntu/
-http://kebo.vlsm.org/ubuntu/
 http://repos.interior.edu.uy/ubuntu/
 http://mirror.il-ta.kamatera.com/ubuntu/
 http://lug.mtu.edu/ubuntu/
@@ -483,7 +467,6 @@ https://mirror.asergo.com/ubuntu/
 https://mirror.misakamikoto.network/ubuntu/
 https://mirror.papua.go.id/ubuntu/
 https://ubuntu.ipserverone.com/ubuntu/
-http://ftp.mirror.tw/pub/ubuntu/ubuntu/
 https://rs.mirror.kumi.systems/ubuntu/
 https://mirror.iranserver.com/ubuntu/
 https://ubuntu.mirror.digitalpacific.com.au/archive/
@@ -518,11 +501,9 @@ http://mirror.ihost.md/ubuntu/
 http://mirror.lcsee.wvu.edu/ubuntu/
 https://mirror.os6.org/ubuntu/
 https://ftp.harukasan.org/ubuntu/
-http://ftp.caliu.cat/pub/distribucions/ubuntu/archive/
 http://us.mirror.nsec.pt/ubuntu/
 https://mirrors.switch.ca/ubuntu/
 https://mirrors.bloomu.edu/ubuntu/
-http://piotrkosoft.net/pub/mirrors/ubuntu/
 http://mirror.bizflycloud.vn/ubuntu/
 https://ubuntu.mirror.ac.za/
 https://mirrors.gethosted.online/ubuntu/
@@ -541,7 +522,6 @@ https://mirror.esecuredata.com/ubuntu-archive/
 https://mirror.kku.ac.th/ubuntu/
 http://ubuntu.grad.hr/ubuntu/
 http://ubuntu.lagoon.nc/ubuntu/
-https://mirror.internet.asn.au/pub/ubuntu/archive/
 https://mirror.dogado.de/ubuntu/
 https://de.mirrors.clouvider.net/ubuntu/
 https://quantum-mirror.hu/mirrors/pub/ubuntu/
@@ -550,7 +530,6 @@ https://nyc.mirrors.clouvider.net/ubuntu/
 https://mirror.truenetwork.ru/ubuntu/
 http://download.nust.na/pub/ubuntu/ubuntu/
 http://mirror.ng/ubuntu-archive/
-https://ubuntu.ccns.ncku.edu.tw/ubuntu/
 https://ubuntu.letscloud.io/ubuntu/
 https://ubuntu.01link.hk/ubuntu/
 https://mirror.reenigne.net/ubuntu/
@@ -618,3 +597,14 @@ https://mirror.vnet.sk/ubuntu/
 http://mirror1.cl.netactuate.com/ubuntu/
 https://al.mirror.kumi.systems/ubuntu/
 http://mirror.hostafrica.co.za/ubuntu/
+https://mirror.erickochen.nl/ubuntu/
+https://mirror.uepg.br/ubuntu/
+https://mirror.it.ubc.ca/ubuntu/
+https://mirror.bjtu.edu.cn/ubuntu/
+https://mirror.23m.com/ubuntu/
+https://mirror.realcompute.io/ubuntu/
+http://ubuntu.hostiran.ir/ubuntuarchive/
+https://mirrors.nju.edu.cn/ubuntu/
+https://mirror.datamossa.io/ubuntu/archive/
+https://repos.eggycrew.com/ubuntu/
+https://mirrors.hit.edu.cn/ubuntu/
diff --git a/debian/changelog b/debian/changelog
index 882a66a2..83e5e084 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ubuntu-release-upgrader (1:20.04.36) focal; urgency=medium
+
+  * DistUpgrade/ReleaseAnnouncement, DistUpgrade/EOLReleaseAnnouncement:
+    Update the irc channel server reference to Libera.Chat (LP: #1937852)
+  * Update mirrors, demotions, and translations.
+
+ -- Brian Murray <brian at ubuntu.com>  Tue, 03 Aug 2021 18:00:22 -0700
+
 ubuntu-release-upgrader (1:20.04.35) focal; urgency=medium
 
   * tests/test_sources_list.py: remove a port architecture test as the code

More information about the Neon-commits mailing list