From 2e41027fc301dfc73114562406380d223f68470e Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 18 Apr 2018 17:24:15 +0200 Subject: Release 1.7.0~alpha0 to experimental --- CMakeLists.txt | 2 +- debian/changelog | 12 ++++++++++++ doc/apt-get.8.xml | 2 +- doc/apt-transport-https.1.xml | 2 +- doc/apt-verbatim.ent | 2 +- doc/apt.conf.5.xml | 2 +- doc/po/apt-doc.pot | 31 +++++++++++++++++++++++++++---- doc/po/de.po | 36 ++++++++++++++++++++++++++++-------- doc/po/es.po | 29 ++++++++++++++++++++++++++--- doc/po/fr.po | 31 ++++++++++++++++++++++++++++--- doc/po/it.po | 29 ++++++++++++++++++++++++++--- doc/po/ja.po | 29 ++++++++++++++++++++++++++--- doc/po/nl.po | 29 ++++++++++++++++++++++++++--- doc/po/pl.po | 29 ++++++++++++++++++++++++++--- doc/po/pt.po | 29 ++++++++++++++++++++++++++--- doc/po/pt_BR.po | 29 ++++++++++++++++++++++++++--- po/apt-all.pot | 4 ++-- 17 files changed, 284 insertions(+), 43 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c847e22b2..ecfa5ed1d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,7 +182,7 @@ endif() # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team ") -set(PACKAGE_VERSION "1.6~rc1") +set(PACKAGE_VERSION "1.7.0~alpha0") if (NOT DEFINED DPKG_DATADIR) execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;" diff --git a/debian/changelog b/debian/changelog index e2d2efafc..08087fccd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (1.7.0~alpha0) experimental; urgency=medium + + [ David Kalnischkies ] + * mention mirror method in sources.list (Closes: 679580) + + [ Julian Andres Klode ] + * Build with cmake+ninja instead of cmake+make + * Make libzstd optional in CMakeLists.txt, to aid cross-building + * Run travis against debian:testing again, keep shippable at bionic + + -- Julian Andres Klode Wed, 18 Apr 2018 17:22:19 +0200 + apt (1.6~rc1) unstable; urgency=medium [ Julian Andres Klode ] diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 7e1440303..fd346807f 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -14,7 +14,7 @@ &apt-email; &apt-product; - 2018-04-07T00:00:00Z + 2018-04-15T00:00:00Z diff --git a/doc/apt-transport-https.1.xml b/doc/apt-transport-https.1.xml index fc9f9754a..e925dd537 100644 --- a/doc/apt-transport-https.1.xml +++ b/doc/apt-transport-https.1.xml @@ -13,7 +13,7 @@ &apt-email; &apt-product; - 2018-02-26T00:00:00Z + 2018-04-15T00:00:00Z diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index d4b669497..53e8e54d4 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -268,7 +268,7 @@ "> - + diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 6d7b273f6..e64de6b77 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -19,7 +19,7 @@ &apt-email; &apt-product; - 2018-02-26T00:00:00Z + 2018-04-15T00:00:00Z diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 3641831c4..be83ac8d4 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 1.6~rc1\n" +"Project-Id-Version: apt-doc 1.7.0~alpha0\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2018-04-15 21:57+0200\n" +"POT-Creation-Date: 2018-04-18 17:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -577,8 +577,8 @@ msgid "" "as a whole." msgstr "" -#. type: Content of: -#: apt.8.xml apt.8.xml apt-key.8.xml +#. type: Content of: +#: apt.8.xml apt.8.xml apt-key.8.xml sources.list.5.xml msgid "," msgstr "" @@ -5723,6 +5723,29 @@ msgid "" "alternative." msgstr "" +#. type: Content of: +#: sources.list.5.xml +msgid "scheme" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +msgid "(&apt-transport-mirror;)" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +msgid "" +"The mirror scheme specifies the location of a mirrorlist. By default the " +"scheme used for the location is http, but any other " +"scheme can be used via " +"mirror+scheme. The mirrorlist " +"itself can contain many different URIs for mirrors the APT client can " +"transparently pick, choose and fallback between intended to help both with " +"distributing the load over the available mirrors and ensuring that clients " +"can acquire data even if some configured mirrors are not available." +msgstr "" + #. type: Content of: #: sources.list.5.xml msgid "" diff --git a/doc/po/de.po b/doc/po/de.po index 8aae1850e..be8c42e0f 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2018-04-15 21:57+0200\n" +"POT-Creation-Date: 2018-04-18 17:22+0200\n" "PO-Revision-Date: 2018-02-03 13:12+0200\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" @@ -720,8 +720,8 @@ msgstr "" "aber auch installierte Pakete entfernen, falls dies erforderlich ist, um ein " "Upgrade des Systems als Ganzes durchzuführen." -#. type: Content of: -#: apt.8.xml apt-key.8.xml +#. type: Content of: +#: apt.8.xml apt-key.8.xml sources.list.5.xml msgid "," msgstr "," @@ -8252,6 +8252,31 @@ msgstr "" "bereitet, könnten die nachfolgend genannten TOR-basierten Methoden eine " "geeignete Alternative sein." +#. type: Content of: +#: sources.list.5.xml +msgid "scheme" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +#, fuzzy +#| msgid "(&apt-transport-http;)" +msgid "(&apt-transport-mirror;)" +msgstr "(&apt-transport-http;)" + +#. type: Content of: +#: sources.list.5.xml +msgid "" +"The mirror scheme specifies the location of a mirrorlist. By default the " +"scheme used for the location is http, but any other " +"scheme can be used via mirror+scheme. The mirrorlist itself can contain many different URIs for mirrors " +"the APT client can transparently pick, choose and fallback between intended " +"to help both with distributing the load over the available mirrors and " +"ensuring that clients can acquire data even if some configured mirrors are " +"not available." +msgstr "" + #. type: Content of: #: sources.list.5.xml msgid "" @@ -12552,8 +12577,3 @@ msgstr " # apt-get -o dir::cache::archives=\"/Platte/\" dist-upgrade\n" #: offline.dbk msgid "Which will use the already fetched archives on the disc." msgstr "Es wird die bereits auf die Platte heruntergeladenen Archive benutzen." - -#, fuzzy -#~| msgid "(&apt-transport-http;)" -#~ msgid "(&apt-transport-mirror;)" -#~ msgstr "(&apt-transport-http;)" diff --git a/doc/po/es.po b/doc/po/es.po index 8c36eaed4..b2484f4c0 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2018-04-15 21:57+0200\n" +"POT-Creation-Date: 2018-04-18 17:22+0200\n" "PO-Revision-Date: 2014-07-04 01:31+0200\n" "Last-Translator: Omar Campagne \n" "Language-Team: Debian l10n Spanish \n" @@ -780,8 +780,8 @@ msgid "" "as a whole." msgstr "" -#. type: Content of: -#: apt.8.xml apt-key.8.xml +#. type: Content of: +#: apt.8.xml apt-key.8.xml sources.list.5.xml msgid "," msgstr "" @@ -8053,6 +8053,29 @@ msgid "" "Tor-based schemes mentioned further below might be a suitable alternative." msgstr "" +#. type: Content of: +#: sources.list.5.xml +msgid "scheme" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +msgid "(&apt-transport-mirror;)" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +msgid "" +"The mirror scheme specifies the location of a mirrorlist. By default the " +"scheme used for the location is http, but any other " +"scheme can be used via mirror+scheme. The mirrorlist itself can contain many different URIs for mirrors " +"the APT client can transparently pick, choose and fallback between intended " +"to help both with distributing the load over the available mirrors and " +"ensuring that clients can acquire data even if some configured mirrors are " +"not available." +msgstr "" + #. type: Content of: #: sources.list.5.xml msgid "" diff --git a/doc/po/fr.po b/doc/po/fr.po index a5c8c2b6f..7d2805714 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2018-04-15 21:57+0200\n" +"POT-Creation-Date: 2018-04-18 17:22+0200\n" "PO-Revision-Date: 2018-03-16 00:54+0100\n" "Last-Translator: Jean-Pierre Giraud \n" "Language-Team: French \n" @@ -718,8 +718,8 @@ msgstr "" "upgrade mais supprimera des paquets actuellement installés si cela est " "nécessaire pour mettre à jour le système dans son ensemble." -#. type: Content of: -#: apt.8.xml apt-key.8.xml +#. type: Content of: +#: apt.8.xml apt-key.8.xml sources.list.5.xml msgid "," msgstr "," @@ -8233,6 +8233,31 @@ msgstr "" "préoccupation, des procédés basés sur Tor, mentionnés plus bas, pourraient " "être une alternative appropriée." +#. type: Content of: +#: sources.list.5.xml +msgid "scheme" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +#, fuzzy +#| msgid "(&apt-transport-http;)" +msgid "(&apt-transport-mirror;)" +msgstr "(&apt-transport-http;)" + +#. type: Content of: +#: sources.list.5.xml +msgid "" +"The mirror scheme specifies the location of a mirrorlist. By default the " +"scheme used for the location is http, but any other " +"scheme can be used via mirror+scheme. The mirrorlist itself can contain many different URIs for mirrors " +"the APT client can transparently pick, choose and fallback between intended " +"to help both with distributing the load over the available mirrors and " +"ensuring that clients can acquire data even if some configured mirrors are " +"not available." +msgstr "" + #. type: Content of: #: sources.list.5.xml msgid "" diff --git a/doc/po/it.po b/doc/po/it.po index 8335fa1f9..0cae50cb0 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2018-04-15 21:57+0200\n" +"POT-Creation-Date: 2018-04-18 17:22+0200\n" "PO-Revision-Date: 2017-03-27 19:05+0200\n" "Last-Translator: Beatrice Torracca \n" "Language-Team: Italian \n" @@ -768,8 +768,8 @@ msgstr "" "rimuove i pacchetti attualmente installati se ciò è necessario per " "aggiornare il sistema nel suo complesso." -#. type: Content of: -#: apt.8.xml apt-key.8.xml +#. type: Content of: +#: apt.8.xml apt-key.8.xml sources.list.5.xml msgid "," msgstr "," @@ -8203,6 +8203,29 @@ msgid "" "Tor-based schemes mentioned further below might be a suitable alternative." msgstr "" +#. type: Content of: +#: sources.list.5.xml +msgid "scheme" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +msgid "(&apt-transport-mirror;)" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +msgid "" +"The mirror scheme specifies the location of a mirrorlist. By default the " +"scheme used for the location is http, but any other " +"scheme can be used via mirror+scheme. The mirrorlist itself can contain many different URIs for mirrors " +"the APT client can transparently pick, choose and fallback between intended " +"to help both with distributing the load over the available mirrors and " +"ensuring that clients can acquire data even if some configured mirrors are " +"not available." +msgstr "" + #. type: Content of: #: sources.list.5.xml msgid "" diff --git a/doc/po/ja.po b/doc/po/ja.po index a7625c12f..e20f0a5cd 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.4\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2018-04-15 21:57+0200\n" +"POT-Creation-Date: 2018-04-18 17:22+0200\n" "PO-Revision-Date: 2017-01-06 04:50+0900\n" "Last-Translator: Takuma Yamada \n" "Language-Team: Japanese \n" @@ -764,8 +764,8 @@ msgstr "" "ム全体をアップグレードするために必要とされる場合には、現在インストール済みの" "パッケージを削除することができます。" -#. type: Content of: -#: apt.8.xml apt-key.8.xml +#. type: Content of: +#: apt.8.xml apt-key.8.xml sources.list.5.xml msgid "," msgstr "," @@ -7864,6 +7864,29 @@ msgid "" "Tor-based schemes mentioned further below might be a suitable alternative." msgstr "" +#. type: Content of: +#: sources.list.5.xml +msgid "scheme" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +msgid "(&apt-transport-mirror;)" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +msgid "" +"The mirror scheme specifies the location of a mirrorlist. By default the " +"scheme used for the location is http, but any other " +"scheme can be used via mirror+scheme. The mirrorlist itself can contain many different URIs for mirrors " +"the APT client can transparently pick, choose and fallback between intended " +"to help both with distributing the load over the available mirrors and " +"ensuring that clients can acquire data even if some configured mirrors are " +"not available." +msgstr "" + #. type: Content of: #: sources.list.5.xml msgid "" diff --git a/doc/po/nl.po b/doc/po/nl.po index 935ceecd6..b44c66a22 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.5-nl\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2018-04-15 21:57+0200\n" +"POT-Creation-Date: 2018-04-18 17:22+0200\n" "PO-Revision-Date: 2017-10-23 17:02+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -773,8 +773,8 @@ msgstr "" "momenteel geïnstalleerde pakketten verwijderen als dat nodig is om het " "systeem volledig op te waarderen." -#. type: Content of: -#: apt.8.xml apt-key.8.xml +#. type: Content of: +#: apt.8.xml apt-key.8.xml sources.list.5.xml msgid "," msgstr "," @@ -8409,6 +8409,29 @@ msgstr "" "kunnen de op Tor gebaseerde methodes die later behandeld worden, een " "adequaat alternatief vormen." +#. type: Content of: +#: sources.list.5.xml +msgid "scheme" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +msgid "(&apt-transport-mirror;)" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +msgid "" +"The mirror scheme specifies the location of a mirrorlist. By default the " +"scheme used for the location is http, but any other " +"scheme can be used via mirror+scheme. The mirrorlist itself can contain many different URIs for mirrors " +"the APT client can transparently pick, choose and fallback between intended " +"to help both with distributing the load over the available mirrors and " +"ensuring that clients can acquire data even if some configured mirrors are " +"not available." +msgstr "" + #. type: Content of: #: sources.list.5.xml msgid "" diff --git a/doc/po/pl.po b/doc/po/pl.po index 0fc304415..b6476afcc 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2018-04-15 21:57+0200\n" +"POT-Creation-Date: 2018-04-18 17:22+0200\n" "PO-Revision-Date: 2014-07-04 02:13+0200\n" "Last-Translator: Robert Luberda \n" "Language-Team: Polish \n" @@ -740,8 +740,8 @@ msgid "" "as a whole." msgstr "" -#. type: Content of: -#: apt.8.xml apt-key.8.xml +#. type: Content of: +#: apt.8.xml apt-key.8.xml sources.list.5.xml msgid "," msgstr "" @@ -7500,6 +7500,29 @@ msgid "" "Tor-based schemes mentioned further below might be a suitable alternative." msgstr "" +#. type: Content of: +#: sources.list.5.xml +msgid "scheme" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +msgid "(&apt-transport-mirror;)" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +msgid "" +"The mirror scheme specifies the location of a mirrorlist. By default the " +"scheme used for the location is http, but any other " +"scheme can be used via mirror+scheme. The mirrorlist itself can contain many different URIs for mirrors " +"the APT client can transparently pick, choose and fallback between intended " +"to help both with distributing the load over the available mirrors and " +"ensuring that clients can acquire data even if some configured mirrors are " +"not available." +msgstr "" + #. type: Content of: #: sources.list.5.xml msgid "" diff --git a/doc/po/pt.po b/doc/po/pt.po index 573364d04..c5bc99888 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.7\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2018-04-15 21:57+0200\n" +"POT-Creation-Date: 2018-04-18 17:22+0200\n" "PO-Revision-Date: 2014-08-29 00:34+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" @@ -759,8 +759,8 @@ msgstr "" "remover pacotes instalados se tal for necessário de modo a resolver um " "conflito de pacotes." -#. type: Content of: -#: apt.8.xml apt-key.8.xml +#. type: Content of: +#: apt.8.xml apt-key.8.xml sources.list.5.xml msgid "," msgstr "" @@ -7979,6 +7979,29 @@ msgid "" "Tor-based schemes mentioned further below might be a suitable alternative." msgstr "" +#. type: Content of: +#: sources.list.5.xml +msgid "scheme" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +msgid "(&apt-transport-mirror;)" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +msgid "" +"The mirror scheme specifies the location of a mirrorlist. By default the " +"scheme used for the location is http, but any other " +"scheme can be used via mirror+scheme. The mirrorlist itself can contain many different URIs for mirrors " +"the APT client can transparently pick, choose and fallback between intended " +"to help both with distributing the load over the available mirrors and " +"ensuring that clients can acquire data even if some configured mirrors are " +"not available." +msgstr "" + #. type: Content of: #: sources.list.5.xml msgid "" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 91e324931..28544f4c5 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2018-04-15 21:57+0200\n" +"POT-Creation-Date: 2018-04-18 17:22+0200\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes \n" "Language-Team: \n" @@ -561,8 +561,8 @@ msgid "" "as a whole." msgstr "" -#. type: Content of: -#: apt.8.xml apt-key.8.xml +#. type: Content of: +#: apt.8.xml apt-key.8.xml sources.list.5.xml msgid "," msgstr "" @@ -6036,6 +6036,29 @@ msgid "" "Tor-based schemes mentioned further below might be a suitable alternative." msgstr "" +#. type: Content of: +#: sources.list.5.xml +msgid "scheme" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +msgid "(&apt-transport-mirror;)" +msgstr "" + +#. type: Content of: +#: sources.list.5.xml +msgid "" +"The mirror scheme specifies the location of a mirrorlist. By default the " +"scheme used for the location is http, but any other " +"scheme can be used via mirror+scheme. The mirrorlist itself can contain many different URIs for mirrors " +"the APT client can transparently pick, choose and fallback between intended " +"to help both with distributing the load over the available mirrors and " +"ensuring that clients can acquire data even if some configured mirrors are " +"not available." +msgstr "" + #. type: Content of: #: sources.list.5.xml msgid "" diff --git a/po/apt-all.pot b/po/apt-all.pot index 3df622b0f..a699fcbb8 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 1.6~rc1\n" +"Project-Id-Version: apt 1.7.0~alpha0\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2018-04-15 21:57+0200\n" +"POT-Creation-Date: 2018-04-18 17:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit v1.2.3