summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt2
-rw-r--r--debian/changelog26
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/apt.conf.5.xml2
-rw-r--r--doc/po/apt-doc.pot17
-rw-r--r--doc/po/de.po15
-rw-r--r--doc/po/es.po15
-rw-r--r--doc/po/fr.po15
-rw-r--r--doc/po/it.po15
-rw-r--r--doc/po/ja.po15
-rw-r--r--doc/po/nl.po15
-rw-r--r--doc/po/pl.po15
-rw-r--r--doc/po/pt.po15
-rw-r--r--doc/po/pt_BR.po15
-rw-r--r--doc/sources.list.5.xml2
-rw-r--r--po/apt-all.pot4
16 files changed, 173 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d227e8eb..7b5120848 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -176,7 +176,7 @@ endif()
# Configure some variables like package, version and architecture.
set(PACKAGE ${PROJECT_NAME})
set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>")
-set(PACKAGE_VERSION "1.6~alpha6")
+set(PACKAGE_VERSION "1.6~alpha7")
if (NOT DEFINED DPKG_DATADIR)
execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
diff --git a/debian/changelog b/debian/changelog
index 80e64ace3..3c52edaa3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+apt (1.6~alpha7) unstable; urgency=medium
+
+ [ Mert Dirik ]
+ * Turkish program translation update (Closes: 886250)
+
+ [ David Kalnischkies ]
+ * dpkg status parsing: check if name is valid before use
+
+ [ Julian Andres Klode ]
+ * apt-compat.cron.daily: Correctly handle undetermined power status
+ (LP: #1742378)
+ * Introduce inrelease-path option for sources.list (Closes: #886745)
+ * Drop obsolete Suggests on python-apt (Closes: #887607)
+ * Point people to salsa.d.o instead of anonscm.d.o for git
+
+ [ Justin B Rye ]
+ * review and fix the three new apt-transport- manpages
+
+ [ Holger Wansing ]
+ * German program translation update (Closes: 886429)
+
+ [ Julien Patriarca ]
+ * French program translation update (Closes: 887017)
+
+ -- Julian Andres Klode <jak@debian.org> Thu, 18 Jan 2018 14:44:14 +0000
+
apt (1.6~alpha6) unstable; urgency=medium
[ Julian Andres Klode ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index fcc9a5fcf..83b21e6d1 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -262,7 +262,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.6~alpha6">
+<!ENTITY apt-product-version "1.6~alpha7">
<!-- (Code)names for various things used all over the place -->
<!ENTITY debian-oldstable-codename "jessie">
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index de9e15663..fdcd99425 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -19,7 +19,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2017-11-22T00:00:00Z</date>
+ <date>2018-01-03T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 0de3e909f..6248dd53f 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~alpha6\n"
+"Project-Id-Version: apt-doc 1.6~alpha7\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-01-17 19:04+0100\n"
+"POT-Creation-Date: 2018-01-18 14:46+0000\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"
@@ -5611,6 +5611,19 @@ msgid ""
"<option>Acquire::Max-ValidTime</option> which are both unset by default."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>InRelease-Path</option> (<option>inrelease-path</option>) "
+"determines the path to the InRelease file, relative to the normal position "
+"of an <filename>InRelease</filename> file. By default, this option is unset "
+"and APT will try to fetch an <filename>InRelease</filename> or, if that "
+"fails, a <filename>Release</filename> file and its associated "
+"<filename>Release.gpg</filename> file. By setting this option, the specified "
+"path will be tried instead of the InRelease file, and the fallback to "
+"<filename>Release</filename> files will be disabled."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml
msgid "URI Specification"
diff --git a/doc/po/de.po b/doc/po/de.po
index 7edbf8419..05f8ecda2 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-01-17 19:04+0100\n"
+"POT-Creation-Date: 2018-01-18 14:46+0000\n"
"PO-Revision-Date: 2016-11-15 21:51+0200\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -8089,6 +8089,19 @@ msgstr ""
"<option>Acquire::Max-ValidTime</option>, die standardmäßig jeweils nicht "
"gesetzt sind."
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>InRelease-Path</option> (<option>inrelease-path</option>) "
+"determines the path to the InRelease file, relative to the normal position "
+"of an <filename>InRelease</filename> file. By default, this option is unset "
+"and APT will try to fetch an <filename>InRelease</filename> or, if that "
+"fails, a <filename>Release</filename> file and its associated "
+"<filename>Release.gpg</filename> file. By setting this option, the specified "
+"path will be tried instead of the InRelease file, and the fallback to "
+"<filename>Release</filename> files will be disabled."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml
msgid "URI Specification"
diff --git a/doc/po/es.po b/doc/po/es.po
index 9aa26b775..f60fb38ce 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-01-17 19:04+0100\n"
+"POT-Creation-Date: 2018-01-18 14:46+0000\n"
"PO-Revision-Date: 2014-07-04 01:31+0200\n"
"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -7926,6 +7926,19 @@ msgid ""
"option> which are both unset by default."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>InRelease-Path</option> (<option>inrelease-path</option>) "
+"determines the path to the InRelease file, relative to the normal position "
+"of an <filename>InRelease</filename> file. By default, this option is unset "
+"and APT will try to fetch an <filename>InRelease</filename> or, if that "
+"fails, a <filename>Release</filename> file and its associated "
+"<filename>Release.gpg</filename> file. By setting this option, the specified "
+"path will be tried instead of the InRelease file, and the fallback to "
+"<filename>Release</filename> files will be disabled."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml
msgid "URI Specification"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 6f267a2ee..4bc4a7e9d 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.0.5\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-01-17 19:04+0100\n"
+"POT-Creation-Date: 2018-01-18 14:46+0000\n"
"PO-Revision-Date: 2017-01-24 22:43+0100\n"
"Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -8071,6 +8071,19 @@ msgstr ""
"<option>Acquire::Max-ValidTime</option> qui toutes les deux ne sont pas "
"définies par défaut."
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>InRelease-Path</option> (<option>inrelease-path</option>) "
+"determines the path to the InRelease file, relative to the normal position "
+"of an <filename>InRelease</filename> file. By default, this option is unset "
+"and APT will try to fetch an <filename>InRelease</filename> or, if that "
+"fails, a <filename>Release</filename> file and its associated "
+"<filename>Release.gpg</filename> file. By setting this option, the specified "
+"path will be tried instead of the InRelease file, and the fallback to "
+"<filename>Release</filename> files will be disabled."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml
msgid "URI Specification"
diff --git a/doc/po/it.po b/doc/po/it.po
index 5e091b3d2..e90cd7742 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-01-17 19:04+0100\n"
+"POT-Creation-Date: 2018-01-18 14:46+0000\n"
"PO-Revision-Date: 2017-03-27 19:05+0200\n"
"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -8071,6 +8071,19 @@ msgstr ""
"configurazione <option>Acquire::Min-ValidTime</option> e <option>Acquire::"
"Max-ValidTime</option> che sono entrambe non impostate in modo predefinito."
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>InRelease-Path</option> (<option>inrelease-path</option>) "
+"determines the path to the InRelease file, relative to the normal position "
+"of an <filename>InRelease</filename> file. By default, this option is unset "
+"and APT will try to fetch an <filename>InRelease</filename> or, if that "
+"fails, a <filename>Release</filename> file and its associated "
+"<filename>Release.gpg</filename> file. By setting this option, the specified "
+"path will be tried instead of the InRelease file, and the fallback to "
+"<filename>Release</filename> files will be disabled."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml
msgid "URI Specification"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 132462836..da5959344 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-01-17 19:04+0100\n"
+"POT-Creation-Date: 2018-01-18 14:46+0000\n"
"PO-Revision-Date: 2017-01-06 04:50+0900\n"
"Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -7735,6 +7735,19 @@ msgstr ""
"Max-ValidTime</option> の値がデフォルトになり、その両方のデフォルト値は "
"unset です。"
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>InRelease-Path</option> (<option>inrelease-path</option>) "
+"determines the path to the InRelease file, relative to the normal position "
+"of an <filename>InRelease</filename> file. By default, this option is unset "
+"and APT will try to fetch an <filename>InRelease</filename> or, if that "
+"fails, a <filename>Release</filename> file and its associated "
+"<filename>Release.gpg</filename> file. By setting this option, the specified "
+"path will be tried instead of the InRelease file, and the fallback to "
+"<filename>Release</filename> files will be disabled."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml
msgid "URI Specification"
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 3639ca8c3..ffca92c30 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-01-17 19:04+0100\n"
+"POT-Creation-Date: 2018-01-18 14:46+0000\n"
"PO-Revision-Date: 2017-10-23 17:02+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -8237,6 +8237,19 @@ msgstr ""
"<option>Acquire::Min-ValidTime</option> en <option>Acquire::Max-ValidTime</"
"option>, die beide standaard niet ingesteld zijn."
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>InRelease-Path</option> (<option>inrelease-path</option>) "
+"determines the path to the InRelease file, relative to the normal position "
+"of an <filename>InRelease</filename> file. By default, this option is unset "
+"and APT will try to fetch an <filename>InRelease</filename> or, if that "
+"fails, a <filename>Release</filename> file and its associated "
+"<filename>Release.gpg</filename> file. By setting this option, the specified "
+"path will be tried instead of the InRelease file, and the fallback to "
+"<filename>Release</filename> files will be disabled."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml
msgid "URI Specification"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 9ccf697c3..702dca4e5 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-01-17 19:04+0100\n"
+"POT-Creation-Date: 2018-01-18 14:46+0000\n"
"PO-Revision-Date: 2014-07-04 02:13+0200\n"
"Last-Translator: Robert Luberda <robert@debian.org>\n"
"Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -7387,6 +7387,19 @@ msgid ""
"option> which are both unset by default."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>InRelease-Path</option> (<option>inrelease-path</option>) "
+"determines the path to the InRelease file, relative to the normal position "
+"of an <filename>InRelease</filename> file. By default, this option is unset "
+"and APT will try to fetch an <filename>InRelease</filename> or, if that "
+"fails, a <filename>Release</filename> file and its associated "
+"<filename>Release.gpg</filename> file. By setting this option, the specified "
+"path will be tried instead of the InRelease file, and the fallback to "
+"<filename>Release</filename> files will be disabled."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml
#, fuzzy
diff --git a/doc/po/pt.po b/doc/po/pt.po
index f2b5003a1..579301c24 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-01-17 19:04+0100\n"
+"POT-Creation-Date: 2018-01-18 14:46+0000\n"
"PO-Revision-Date: 2014-08-29 00:34+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -7851,6 +7851,19 @@ msgid ""
"option> which are both unset by default."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>InRelease-Path</option> (<option>inrelease-path</option>) "
+"determines the path to the InRelease file, relative to the normal position "
+"of an <filename>InRelease</filename> file. By default, this option is unset "
+"and APT will try to fetch an <filename>InRelease</filename> or, if that "
+"fails, a <filename>Release</filename> file and its associated "
+"<filename>Release.gpg</filename> file. By setting this option, the specified "
+"path will be tried instead of the InRelease file, and the fallback to "
+"<filename>Release</filename> files will be disabled."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml
msgid "URI Specification"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 04cf2be0a..f1f776d97 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-01-17 19:04+0100\n"
+"POT-Creation-Date: 2018-01-18 14:46+0000\n"
"PO-Revision-Date: 2004-09-20 17:02+0000\n"
"Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
"Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -5925,6 +5925,19 @@ msgid ""
"option> which are both unset by default."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml
+msgid ""
+"<option>InRelease-Path</option> (<option>inrelease-path</option>) "
+"determines the path to the InRelease file, relative to the normal position "
+"of an <filename>InRelease</filename> file. By default, this option is unset "
+"and APT will try to fetch an <filename>InRelease</filename> or, if that "
+"fails, a <filename>Release</filename> file and its associated "
+"<filename>Release.gpg</filename> file. By setting this option, the specified "
+"path will be tried instead of the InRelease file, and the fallback to "
+"<filename>Release</filename> files will be disabled."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
#: sources.list.5.xml
msgid "URI Specification"
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index b19808636..2a047c83b 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -14,7 +14,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2017-11-22T00:00:00Z</date>
+ <date>2018-01-03T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 8ee9efc2a..ca1b88a65 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt 1.6~alpha6\n"
+"Project-Id-Version: apt 1.6~alpha7\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-01-04 00:06+0100\n"
+"POT-Creation-Date: 2018-01-18 14:46+0000\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"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 04:36:41 +0000