choose-mirror: integrate udeb from debian upstream

This commit is contained in:
Luis Guzmán 2022-07-17 09:04:02 +00:00
parent 2d13b7ffdf
commit 174bcdb41d
3 changed files with 54 additions and 10 deletions

View file

@ -0,0 +1,14 @@
diff -ru choose-mirror-2.78ubuntu7+10.0trisquel3/Makefile choose-mirror-2.111/Makefile
--- choose-mirror-2.78ubuntu7+10.0trisquel3/Makefile 2021-02-26 15:22:56.000000000 -0600
+++ choose-mirror-2.111/Makefile 2021-06-04 12:09:55.000000000 -0500
@@ -33,8 +33,8 @@
STRIP=strip
# Derivative distributions may want to change these.
-#MIRRORLISTURL=https://anonscm.debian.org/git/mirror/mirror-masterlist.git/plain/Mirrors.masterlist
-MASTERLIST=Mirrors.masterlist.trisquel
+MIRRORLISTURL=https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist
+MASTERLIST=Mirrors.masterlist
ifdef DEBUG
CFLAGS:=$(CFLAGS) -DDODEBUG

View file

@ -0,0 +1,22 @@
diff -ru choose-mirror-2.78ubuntu7+10.0trisquel3/debian/choose-mirror-bin.templates-in choose-mirror-2.111/debian/choose-mirror-bin.templates-in
--- choose-mirror-2.78ubuntu7+10.0trisquel3/debian/choose-mirror-bin.templates-in 2021-02-26 15:22:56.000000000 -0600
+++ choose-mirror-2.111/debian/choose-mirror-bin.templates-in 2021-02-08 06:52:03.000000000 -0600
@@ -12,10 +12,14 @@
Type: select
Choices-C: ${CHOICES-C}
Choices: ${CHOICES}
-Default: nabia
-Description: Trisquel version to install:
- In Trisquel, this question is never asked, and is only for preseeding.
- Caveat emptor.
+# :sl2:
+_Description: Debian version to install:
+ Debian comes in several flavors. Stable is well-tested and rarely changes.
+ Unstable is untested and frequently changing. Testing is a middle ground,
+ that receives many of the new versions from unstable if they are not too
+ buggy.
+ .
+ Only flavors available on the selected mirror are listed.
Template: mirror/codename
Type: string