diff options
| -rw-r--r-- | doc/guide.dbk | 1 | ||||
| -rw-r--r-- | doc/method.dbk | 1 | ||||
| -rw-r--r-- | doc/po/apt-doc.pot | 3 | ||||
| -rw-r--r-- | doc/po/de.po | 2 | ||||
| -rw-r--r-- | doc/po/es.po | 2 | ||||
| -rw-r--r-- | doc/po/fr.po | 3 | ||||
| -rw-r--r-- | doc/po/it.po | 2 | ||||
| -rw-r--r-- | doc/po/ja.po | 2 | ||||
| -rw-r--r-- | doc/po/nl.po | 2 | ||||
| -rw-r--r-- | doc/po/pl.po | 2 | ||||
| -rw-r--r-- | doc/po/pt.po | 2 | ||||
| -rw-r--r-- | doc/po/pt_BR.po | 1 | ||||
| -rw-r--r-- | dselect/desc.apt | 6 | ||||
| -rw-r--r-- | dselect/names | 2 | ||||
| -rwxr-xr-x | dselect/setup | 5 |
15 files changed, 29 insertions, 7 deletions
diff --git a/doc/guide.dbk b/doc/guide.dbk index bb314fdd5..32674ca14 100644 --- a/doc/guide.dbk +++ b/doc/guide.dbk @@ -223,6 +223,7 @@ use packages on your CD-ROM before downloading from the Internet. For example: file:/mnt/debian, + https://deb.debian.org/debian, http://deb.debian.org/debian, diff --git a/doc/method.dbk b/doc/method.dbk index 2ec1f3e3e..eb4ae407a 100644 --- a/doc/method.dbk +++ b/doc/method.dbk @@ -159,6 +159,7 @@ Some examples: <screen> file:/var/mirrors/debian/ ftp://ftp.example.org/debian +https://deb.debian.org/debian ftp://jgg:MooCow@localhost:21/debian nfs://bigred/var/mirrors/debian rsync://debian.midco.net/debian diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 5801149de..bc4fbbce0 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 3.0.1\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2025-05-06 17:57+0200\n" +"POT-Creation-Date: 2025-05-19 17:43+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -9040,6 +9040,7 @@ msgid "" "\n" " For example:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://deb.debian.org/debian,\n" "\n" "\n" diff --git a/doc/po/de.po b/doc/po/de.po index e478dd2f0..2dd6d6a1b 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -12791,6 +12791,7 @@ msgid "" "\n" " For example:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://deb.debian.org/debian,\n" "\n" "\n" @@ -12803,6 +12804,7 @@ msgstr "" "\n" " Zum Beispiel:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://deb.debian.org/debian,\n" "\n" "\n" diff --git a/doc/po/es.po b/doc/po/es.po index 4b01f2511..48d4b78e1 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -12082,6 +12082,7 @@ msgid "" "\n" " For example:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://deb.debian.org/debian,\n" "\n" "\n" @@ -12094,6 +12095,7 @@ msgstr "" "\n" " For example:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://deb.debian.org/debian,\n" "\n" "\n" diff --git a/doc/po/fr.po b/doc/po/fr.po index 0edf3c6ac..0e6b70114 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -12815,6 +12815,7 @@ msgstr "" #| "\n" #| " For example:\n" #| " file:/mnt/debian,\n" +#|" https://deb.debian.org/debian,\n" #| " ftp://ftp.debian.org/debian,\n" #| " http://ftp.de.debian.org/debian,\n" #| "\n" @@ -12828,6 +12829,7 @@ msgid "" "\n" " For example:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://deb.debian.org/debian,\n" "\n" "\n" @@ -12841,6 +12843,7 @@ msgstr "" " Exemple :\n" " file:/mnt/debian,\n" " ftp://ftp.debian.org/debian,\n" +" https://deb.debian.org/debian,\n" " http://ftp.de.debian.org/debian,\n" "\n" "\n" diff --git a/doc/po/it.po b/doc/po/it.po index 47271f4a6..3afd11924 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -12426,6 +12426,7 @@ msgid "" "\n" " For example:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://deb.debian.org/debian,\n" "\n" "\n" @@ -12438,6 +12439,7 @@ msgstr "" "\n" " For example:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://deb.debian.org/debian,\n" "\n" "\n" diff --git a/doc/po/ja.po b/doc/po/ja.po index 5845814a6..a8d861404 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -11924,6 +11924,7 @@ msgid "" "\n" " For example:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://deb.debian.org/debian,\n" "\n" "\n" @@ -11936,6 +11937,7 @@ msgstr "" "\n" " 例:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://deb.debian.org/debian,\n" "\n" "\n" diff --git a/doc/po/nl.po b/doc/po/nl.po index 67c3c32d5..0e69452ff 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -12932,6 +12932,7 @@ msgid "" "\n" " For example:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://deb.debian.org/debian,\n" "\n" "\n" @@ -12944,6 +12945,7 @@ msgstr "" "\n" " Bijvoorbeeld:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://deb.debian.org/debian,\n" "\n" "\n" diff --git a/doc/po/pl.po b/doc/po/pl.po index 6a14d5b49..48d37fb2f 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -11273,6 +11273,7 @@ msgid "" "\n" " For example:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://deb.debian.org/debian,\n" "\n" "\n" @@ -11285,6 +11286,7 @@ msgstr "" "\n" " Przykłady:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://ftp.pl.debian.org/debian,\n" "\n" "\n" diff --git a/doc/po/pt.po b/doc/po/pt.po index d77ff1a03..646366232 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -12629,6 +12629,7 @@ msgid "" "\n" " For example:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://deb.debian.org/debian,\n" "\n" "\n" @@ -12641,6 +12642,7 @@ msgstr "" "\n" " Por exemplo:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://deb.debian.org/debian,\n" "\n" "\n" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index e30868092..e7872b5c0 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9401,6 +9401,7 @@ msgid "" "\n" " For example:\n" " file:/mnt/debian,\n" +" https://deb.debian.org/debian,\n" " http://deb.debian.org/debian,\n" "\n" "\n" diff --git a/dselect/desc.apt b/dselect/desc.apt index 5601919ac..dac14253c 100644 --- a/dselect/desc.apt +++ b/dselect/desc.apt @@ -1,8 +1,8 @@ The APT installation method encompasses most other installation methods under the umbrella of the new Package Acquisition code. This method allows -installation from locations in the filesystem, ftp and http URLs, supports -full installation ordering and dependency checking as well as multiple -sources. See the man pages apt-get(8) and sources.list(5) +installation from locations in the filesystem, https, http and ftp URLs, +supports full installation ordering and dependency checking as well as +multiple sources. See the man pages apt-get(8) and sources.list(5) HTTP proxies can be used by setting http_proxy="http://proxy:port/" before running DSelect. FTP proxies require special configuration detailed in diff --git a/dselect/names b/dselect/names index 8daa53782..58294c82d 100644 --- a/dselect/names +++ b/dselect/names @@ -1 +1 @@ -70 apt APT Acquisition [file,http,ftp] +70 apt APT Acquisition [file,https,http,ftp] diff --git a/dselect/setup b/dselect/setup index 522362e68..6b816ccfe 100755 --- a/dselect/setup +++ b/dselect/setup @@ -29,7 +29,7 @@ my $boldon=`setterm -bold on`; my $boldoff=`setterm -bold off`; my @known_types = ('deb'); -my @known_access = ('http', 'ftp', 'file'); +my @known_access = ('https', 'http', 'ftp', 'file'); my @typical_distributions = ('stable', 'unstable', 'testing'); my @typical_components = ('main', 'contrib', 'non-free', 'non-free-firmware'); @@ -118,7 +118,7 @@ sub get_source { } $type = 'deb'; - $urn = "http://deb.debian.org/debian" unless $urn; + $urn = "https://deb.debian.org/debian" unless $urn; $distribution = "stable" unless $distribution; $components = "main contrib non-free non-free-firmware" unless $components; @@ -232,6 +232,7 @@ sub get_sources { print " For example:\n"; print " file:/mnt/debian,\n"; print " ftp://ftp.example.org/debian,\n"; + print " https://deb.debian.org/debian,\n"; print " http://deb.debian.org/debian,\n"; # print " and the special mirror scheme,\n"; # print " mirror:http://www.debian.org/archivemirrors \n"; |
