Skip to content

Draft: Update choose-mirror to 2.111pureos1

New approach to update choose-mirror in byzantium based on the current version 2.111 in Debian stable.

As before in !1 (closed) I've created again a new branch pureos/latest which is holding the modifications. And that's again the reason why this MR is marked as Draft.

$ git diff debian/2.109pureos1
diff --git a/debian/changelog b/debian/changelog
index 3bb520c..f6e20d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,34 @@
+choose-mirror (2.111pureos1) byzantium; urgency=medium
+
+  * Merge in 2.111 from Debian stable, 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>  Sat, 04 Dec 2021 07:56:04 +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 +272,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/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

@guido.gunther @jeremiah.foster @matthias.klumpp @jonas.smedegaard Please have again a look on this MR.

Edited by Carsten Schoenert

Merge request reports