Draft: Update choose-mirror to 2.112pureos1-1
This a MR to update choose-mirror in landing based on 2.112 in Debian. Note that https://master.pureos.net/sync/landing is currently only seeing 2.111 from upstream, but 2.112 is in testing since 6th of November.
I marked this MR as Draft as I created on top of the existing branch pureos/byzantium the target branch pureos/latest, so finally this MR shouldn't get merged and the new branch instead pushed.
To see better the differences here is a diff against the old pureos related release 2.109pureos1.
$ git diff debian/2.109pureos1
diff --git a/Makefile b/Makefile
index e10c167..f8bf521 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,8 @@ USE_FTP_MANUAL=1
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-CFLAGS=-Wall -g -D_GNU_SOURCE -DARCH_TEXT='"$(DEB_HOST_ARCH)"'
+CFLAGS?=-g
+CFLAGS+=-Wall -D_GNU_SOURCE -DARCH_TEXT='"$(DEB_HOST_ARCH)"'
templates=debian/choose-mirror-bin.templates-in
ifeq (1,${USE_HTTP})
@@ -33,7 +34,7 @@ LIBS=-ldebconfclient -ldebian-installer
STRIP=strip
# Derivative distributions may want to change these.
-MIRRORLISTURL=https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist
+MIRRORLISTURL=https://mirror-master.debian.org/status/Mirrors.masterlist
MASTERLIST=Mirrors.masterlist
ifdef DEBUG
diff --git a/debian/changelog b/debian/changelog
index 3bb520c..4036f2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,47 @@
+choose-mirror (2.112pureos1) byzantium; urgency=medium
+
+ * Merge in 2.112 from Debian unstable, remaining change:
+ - Mirrors.masterlist: Set PureOS mirrors
+ - Replace Debian with PureOS where appropriate
+ * Add d/pureos-ci.yml for CI
+
+ -- Carsten Schoenert <carsten.schoenert@puri.sm> Sun, 28 Nov 2021 14:13:30 +0100
+
+choose-mirror (2.112) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Phil Hands ]
+ * Pull the mirror list from mirror-master.debian.org
+ * Sort deb.debian.org first, then ftp*.*.debian.org, then others.
+
+ [ Samuel Thibault ]
+ * Makefile: Inherit CFLAGS from environment.
+
+ -- Samuel Thibault <sthibault@debian.org> Sun, 31 Oct 2021 16:23:14 +0100
+
+choose-mirror (2.111) unstable; urgency=medium
+
+ * Update Mirrors.masterlist. This might be the last time it gets updated
+ from the curated list fetched from Salsa (See: #989473).
+
+ [ Updated translations ]
+ * Croatian (hr.po) by Valentin Vidic
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 04 Jun 2021 19:13:46 +0200
+
+choose-mirror (2.110) unstable; urgency=medium
+
+ * Team upload
+ * Update Mirrors.masterlist.
+
+ [ Updated translations ]
+ * Latvian (lv.po) by Tranzistors
+ * Tamil (ta.po) by Vasudevan Tirumurti
+ * Traditional Chinese (zh_TW.po) by louies0623
+
+ -- Holger Wansing <hwansing@mailbox.org> Tue, 06 Apr 2021 11:20:24 +0200
+
choose-mirror (2.109pureos1) byzantium; urgency=medium
* fork for PureOS:
@@ -241,6 +285,16 @@ choose-mirror (2.89) unstable; urgency=medium
-- Christian Perrier <bubulle@debian.org> Wed, 31 Jan 2018 07:50:45 +0100
+choose-mirror (2.88pureos1) green; urgency=medium
+
+ * Fork for PureOS:
+ + Set dev@puri.sm as maintainer, prefixing original XSBC-Original-.
+ + Set myself as uploader, dropping original.
+ * Mirrors.masterlist: Set PureOS mirrors.
+ * Replace Debian with PureOS where appropriate.
+
+ -- Jonas Smedegaard <jonas.smedegaard@puri.sm> Sat, 27 Jan 2018 10:57:54 +0100
+
choose-mirror (2.88) unstable; urgency=medium
[ Updated translations ]
diff --git a/debian/gbp.conf b/debian/gbp.conf
index f1169a2..05e3cd0 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -4,4 +4,5 @@
pristine-tar = True
sign-tags = True
filter = */.git*
-debian-branch = pureos/byzantium
+debian-branch = pureos/latest
+debian-tag = pureos/%(version)s
diff --git a/debian/po/hr.po b/debian/po/hr.po
index 9d39bc0..138bd6f 100644
--- a/debian/po/hr.po
+++ b/debian/po/hr.po
@@ -17,14 +17,16 @@
# Vlatko Kosturjak, 2001
# Tomislav Krznar <tomislav.krznar@gmail.com>, 2012, 2013, 2014, 2015.
# Valentin Vidic <Valentin.Vidic@CARNet.hr>, 2017
+# Milo Ivir <mail@milotype.de>, 2019.
+# gogogogi <trebelnik2@gmail.com>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: Debian-installer 1st-stage master file HR\n"
"Report-Msgid-Bugs-To: choose-mirror@packages.debian.org\n"
"POT-Creation-Date: 2020-10-05 20:01+0000\n"
-"PO-Revision-Date: 2019-07-04 17:02+0000\n"
-"Last-Translator: gogogogi <trebelnik2@gmail.com>\n"
+"PO-Revision-Date: 2021-04-23 16:46+0200\n"
+"Last-Translator: Valentin Vidic <vvidic@debian.org>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
"Language: hr\n"
"MIME-Version: 1.0\n"
@@ -372,8 +374,8 @@ msgid ""
"If you need to use a HTTP proxy to access the outside world, enter the proxy "
"information here. Otherwise, leave this blank."
msgstr ""
-"Ako morate koristiti HTTP proxy za pristup vanjskom svijetu, upišite proxy "
-"podatke ovdje. U suprotnome, ostavite prazno."
+"Ako morate koristiti HTTP proxy za pristup vanjskom svijetu, ovdje upišite "
+"proxy postavke. U suprotnome, ostavite prazno."
#. Type: string
#. Description
@@ -387,7 +389,7 @@ msgid ""
"The proxy information should be given in the standard form of \"http://"
"[[user][:pass]@]host[:port]/\"."
msgstr ""
-"Proxy postavke trebaju biti u standardnome obliku: \"http://[[korisnik][:"
+"Proxy postavke trebaju biti u standardnom obliku: \"http://[[korisnik][:"
"lozinka]@]poslužitelj[:ulaz]/\"."
#. Type: string
diff --git a/debian/po/lv.po b/debian/po/lv.po
index 0ed9262..82b9047 100644
--- a/debian/po/lv.po
+++ b/debian/po/lv.po
@@ -23,13 +23,14 @@
# Rihards Priedītis <rprieditis@gmail.com>, 2009, 2010.
# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2012, 2013, 2017.
# Peteris Krisjanis <pecisk@gmail.com>, 2008, 2012.
-# Tranzistors <rudolfs.mazurs@gmail.com>, 2018.
+# Tranzistors <rudolfs.mazurs@gmail.com>, 2018, 2021.
+#
msgid ""
msgstr ""
"Project-Id-Version: lv\n"
"Report-Msgid-Bugs-To: choose-mirror@packages.debian.org\n"
"POT-Creation-Date: 2020-10-05 20:01+0000\n"
-"PO-Revision-Date: 2018-10-17 19:33+0000\n"
+"PO-Revision-Date: 2021-01-29 15:32+0000\n"
"Last-Translator: Tranzistors <rudolfs.mazurs@gmail.com>\n"
"Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
"Language: lv\n"
@@ -131,8 +132,8 @@ msgid ""
"broken (for example because an invalid Release file was found); mirror does "
"not support the correct Debian version."
msgstr ""
-"Iespējamie kļūmes iemesli: nepareizi uzdots spoguļserveris; spoguļserveris "
-"nav pieejams (iespējams, nestabila Interneta savienojuma dēļ); "
+"Iespējamie kļūmes iemesli: nepareizi uzdots spoguļserveris; nav pieejams "
+"spoguļserveris (iespējams, nestabila Interneta savienojuma dēļ); "
"spoguļserveris ir bojāts (piemēram satur nepareizu Release datni) vai arī "
"spoguļserveris nesatur pareizo Debian versiju."
diff --git a/debian/po/ta.po b/debian/po/ta.po
index b4e699c..9900319 100644
--- a/debian/po/ta.po
+++ b/debian/po/ta.po
@@ -24,7 +24,7 @@ msgstr ""
"Project-Id-Version: ta\n"
"Report-Msgid-Bugs-To: choose-mirror@packages.debian.org\n"
"POT-Creation-Date: 2020-10-05 20:01+0000\n"
-"PO-Revision-Date: 2021-01-22 11:58+0000\n"
+"PO-Revision-Date: 2021-02-09 18:59+0000\n"
"Last-Translator: Vasudevan Tirumurti <agnihot3@gmail.com>\n"
"Language-Team: Tamil <<gnome-tamil-translation@googlegroups.com>>\n"
"Language: ta\n"
@@ -96,7 +96,7 @@ msgstr ""
"குறிப்பிட்ட (முன்னிருப்பு) டெபியன் பதிப்பு (${RELEASE}) தேர்ந்தெடுத்த பிரதி பலிப்பானில் "
"இல்லை. உங்கள் நிறுவலுக்கு வேறு பதிப்பை தேர்ந்தெடுத்து தொடர முடியும். ஆனால் நீங்கள் பின் "
"சென்று உங்கள் தேர்வுக்கு பொருத்தமான பதிப்பு உள்ள வேறுபிரதிபலிப்பானை தேடித் தேர்ந்தெடுக்க "
-"வேண்டும். "
+"வேண்டும்."
#. Type: error
#. Description
@@ -138,7 +138,7 @@ msgstr ""
msgid ""
"Additional details may be available in /var/log/syslog or on virtual console "
"4."
-msgstr "மேற்கொண்டு தகவல்கள் /var/log/syslog அல்லது மெய்நிகர் முனையம் 4 இல் காணலாம் "
+msgstr "மேற்கொண்டு தகவல்கள் /var/log/syslog அல்லது மெய்நிகர் முனையம் 4 இல் காணலாம்."
#. Type: error
#. Description
diff --git a/debian/po/vi.po b/debian/po/vi.po
index 9a129a3..30a485f 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -13,14 +13,15 @@
# Clytie Siddall <clytie@riverland.net.au>, 2005-2010
# Hai-Nam Nguyen <hainam@jcisio.com>, 2012
# Trần Ngọc Quân <vnwildman@gmail.com>, 2018, 2019.
+# Tran Dinh Hai <haidinhtran@pm.me>, 2021.
#
msgid ""
msgstr ""
"Project-Id-Version: debian-installer sublevel1\n"
"Report-Msgid-Bugs-To: choose-mirror@packages.debian.org\n"
"POT-Creation-Date: 2020-10-05 20:01+0000\n"
-"PO-Revision-Date: 2019-02-27 14:34+0700\n"
-"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
+"PO-Revision-Date: 2021-09-08 05:34+0000\n"
+"Last-Translator: Tran Dinh Hai <haidinhtran@pm.me>\n"
"Language-Team: Vietnamese <debian-l10n-vietnamese@lists.debian.org>\n"
"Language: vi\n"
"MIME-Version: 1.0\n"
@@ -333,7 +334,7 @@ msgstr "Hãy nhập tên máy của máy bản sao nơi mà sẽ tải Debian t
msgid ""
"An alternate port can be specified using the standard [hostname]:[port] "
"format."
-msgstr "Có thể ghi rõ một cổng xen kẽ có dạng chuẩn: [tên_máy]:[cổng]"
+msgstr "Có thể ghi rõ một cổng xen kẽ có dạng chuẩn: [tên_máy]:[cổng]."
#. Type: string
#. Description
diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po
index e2aeab5..3094154 100644
--- a/debian/po/zh_TW.po
+++ b/debian/po/zh_TW.po
@@ -5,6 +5,8 @@
#
# Traditional Chinese messages for debian-installer.
# Copyright (C) 2003 Software in the Public Interest, Inc.
+# Louies <louies0623@gmail.com>, 2019, 2021.
+# Walter Cheuk <wwycheuk@gmail.com>, 2019.
# This file is distributed under the same license as debian-installer.
#
#
@@ -25,14 +27,15 @@
# JOE MAN <trmetal@yahoo.com.hk>, 2001.
# Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005.
# Yao Wei (魏銘廷) <mwei@lxde.org>, 2012.
+# Walter Cheuk <wwycheuk@gmail.com>, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: debian-installer\n"
"Report-Msgid-Bugs-To: choose-mirror@packages.debian.org\n"
"POT-Creation-Date: 2020-10-05 20:01+0000\n"
-"PO-Revision-Date: 2019-01-13 14:06+0000\n"
-"Last-Translator: Louies <louies0623@gmail.com>\n"
+"PO-Revision-Date: 2021-02-16 09:50+0000\n"
+"Last-Translator: louies0623 <louies0623@gmail.com>\n"
"Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists."
"debian.org>\n"
"Language: zh_TW\n"
@@ -81,7 +84,7 @@ msgstr "檢驗 Debian 檔案鏡像站"
#. :sl1:
#: ../choose-mirror-bin.templates-in:6001
msgid "Downloading Release files..."
-msgstr "正在下載 Release 檔……"
+msgstr "正在下載 Release 檔…"
#. Type: boolean
#. Description
diff --git a/debian/pureos-ci.yml b/debian/pureos-ci.yml
new file mode 100644
index 0000000..9bb8c3a
--- /dev/null
+++ b/debian/pureos-ci.yml
@@ -0,0 +1,7 @@
+include:
+ - 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
+ - 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-byzantium-jobs.yml'
+
+stages:
+ - package
+ - test-package
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
new file mode 100644
index 0000000..7daaa52
--- /dev/null
+++ b/debian/salsa-ci.yml
@@ -0,0 +1,6 @@
+---
+include:
+ - https://salsa.debian.org/installer-team/branch2repo/raw/main/trigger_b2r.yml
+
+variables:
+ SALSA_CI_DISABLE_BLHC: 1
diff --git a/mirrorlist b/mirrorlist
index f3b6925..120c590 100755
--- a/mirrorlist
+++ b/mirrorlist
@@ -78,29 +78,16 @@ for (my $id = 0; $id < @data; $id++) {
}
}
-# Assign a rating to each mirror, so that push-primary come first, followed
-# by push-secondary. Normally that is followed by geodns, and then leaf.
-# However, if a country has no push-primary or secondary mirrors, its leaf
-# mirrors are put before geodns, since we do not want to default to a
-# geodns mirror that will likely not be in the country.
-my %cc_has_push_mirror;
+# Assign a rating to each mirror, so we get the ordering:
+# deb.debian.org
+# CC mirror, if any
+# others
+# any remaining mirrors tagged as geodns (as they're probably elsewhere)
foreach my $id (0..$#data) {
- my $cc = $data[$id]->{country};
- if (exists $data[$id]->{type} && $data[$id]->{type} =~ /push/i) {
- $cc_has_push_mirror{$cc}=1;
- }
-}
-foreach my $id (0..$#data) {
- my $cc = $data[$id]->{country};
- my $rating=0;
- if (exists $data[$id]->{type}) {
- $rating=1 if $data[$id]->{type} =~ /geodns/i;
- $rating=4 if $data[$id]->{type} =~ /push/i;
- $rating=5 if $data[$id]->{type} =~ /push-primary/i;
- }
- if (! $rating && ! $cc_has_push_mirror{$cc}) {
- $rating=2;
- }
+ my $rating=1;
+ $rating=0 if exists $data[$id]->{type} && $data[$id]->{type} =~ /geodns/i;
+ $rating=2 if $data[$id]->{site} =~ /^ftp.*\.debian\.org$/;
+ $rating=3 if $data[$id]->{site} eq 'deb.debian.org';
$data[$id]->{rating}=$rating;
}
@@ -143,7 +130,7 @@ if ($type =~ /(.*)list/) {
open (LIST, ">debian/${type}list-countries") or die "debian/${type}list-countries: $!";
foreach my $id (0..$#data) {
next unless exists $data[$id]->{"$archive-$type"} and
- exists $data[$id]->{country};
+ exists $data[$id]->{country};
my $cc = $data[$id]->{country};
die "Error: country code '$cc' does not occur in iso-3166 table"
unless exists $iso3166{$cc};
@@ -184,9 +171,9 @@ else {
print STDERR "warning: missing $archive-architecture for mirror ".$data[$id]->{site}."; assuming it contains all architectures.\n";
}
print OUT "\t{",
- join(", ", $q.$data[$id]->{site}.$q, $cc,
- $q.$data[$id]->{"$archive-$type"}.$q),
- "},\n";
+ join(", ", $q.$data[$id]->{site}.$q, $cc,
+ $q.$data[$id]->{"$archive-$type"}.$q),
+ "},\n";
}
print OUT "\t{NULL, NULL, NULL}\n";
print OUT "};\n";