summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt2
-rw-r--r--debian/changelog20
-rw-r--r--doc/apt-cache.8.xml2
-rw-r--r--doc/apt-ftparchive.1.xml2
-rw-r--r--doc/apt-get.8.xml2
-rw-r--r--doc/apt-key.8.xml2
-rw-r--r--doc/apt-secure.8.xml2
-rw-r--r--doc/apt-transport-http.1.xml2
-rw-r--r--doc/apt-transport-https.1.xml2
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/apt.conf.5.xml2
-rw-r--r--doc/apt_auth.conf.5.xml2
-rw-r--r--doc/po/apt-doc.pot6
-rw-r--r--doc/po/de.po4
-rw-r--r--doc/po/es.po4
-rw-r--r--doc/po/fr.po4
-rw-r--r--doc/po/it.po8
-rw-r--r--doc/po/ja.po8
-rw-r--r--doc/po/nl.po4
-rw-r--r--doc/po/pl.po4
-rw-r--r--doc/po/pt.po4
-rw-r--r--doc/po/pt_BR.po4
-rw-r--r--po/apt-all.pot4
23 files changed, 58 insertions, 38 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a5647cec..d3bf9c892 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,7 +183,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.7.0~rc2")
+set(PACKAGE_VERSION "1.7.0")
if (NOT DEFINED DPKG_DATADIR)
execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
diff --git a/debian/changelog b/debian/changelog
index bba04f7bf..741abcbd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+apt (1.7.0) unstable; urgency=medium
+
+ [ Julian Andres Klode ]
+ * Fix calculation of elapsed usec in downloads
+ * pkgCacheFile: Only unlock in destructor if locked before (LP: #1794053)
+ * Set DPKG_FRONTEND_LOCKED when running {pre,post}-invoke scripts.
+ Some post-invoke scripts install packages, which fails because
+ the environment variable is not set. This sets the variable for
+ all three kinds of scripts {pre,post-}invoke and pre-install-pkgs,
+ but we will only allow post-invoke at a later time.
+ * prepare-release: Fix last-modification detection for manpages
+
+ [ David Kalnischkies ]
+ * Show APT::Compressor example in apt.conf(5) (Closes: #909712)
+
+ [ Muhamed Huseinbašić ]
+ * apt-mark: showhold: typo-fix (package -> packages)
+
+ -- Julian Andres Klode <jak@debian.org> Sun, 07 Oct 2018 07:56:02 +0200
+
apt (1.7.0~rc2) unstable; urgency=medium
[ David Kalnischkies ]
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 5726e00f2..b8c6aa989 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -14,7 +14,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2016-11-25T00:00:00Z</date>
+ <date>2016-08-16T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml
index 0a9305132..246cc03d3 100644
--- a/doc/apt-ftparchive.1.xml
+++ b/doc/apt-ftparchive.1.xml
@@ -14,7 +14,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2016-11-25T00:00:00Z</date>
+ <date>2016-11-11T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 26dd31e87..b9b2c4441 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -14,7 +14,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2018-09-18T00:00:00Z</date>
+ <date>2017-07-27T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/apt-key.8.xml b/doc/apt-key.8.xml
index 279c417c7..a1c677d65 100644
--- a/doc/apt-key.8.xml
+++ b/doc/apt-key.8.xml
@@ -13,7 +13,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2016-11-25T00:00:00Z</date>
+ <date>2016-11-22T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index 50f99d3c3..e334df9ca 100644
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -13,7 +13,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2017-04-12T00:00:00Z</date>
+ <date>2016-08-06T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/apt-transport-http.1.xml b/doc/apt-transport-http.1.xml
index c8b776c23..f239da554 100644
--- a/doc/apt-transport-http.1.xml
+++ b/doc/apt-transport-http.1.xml
@@ -13,7 +13,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2018-09-18T00:00:00Z</date>
+ <date>2018-05-11T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/apt-transport-https.1.xml b/doc/apt-transport-https.1.xml
index 40a815d5e..e00dd7c62 100644
--- a/doc/apt-transport-https.1.xml
+++ b/doc/apt-transport-https.1.xml
@@ -13,7 +13,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2018-09-18T00:00:00Z</date>
+ <date>2018-05-11T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index b5faa00c9..c323cf5a8 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -268,7 +268,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.7.0~rc2">
+<!ENTITY apt-product-version "1.7.0">
<!-- (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 cc25e73e2..55bc9d20d 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>2018-09-18T00:00:00Z</date>
+ <date>2018-09-27T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/apt_auth.conf.5.xml b/doc/apt_auth.conf.5.xml
index 8621cdee2..37e4fbc98 100644
--- a/doc/apt_auth.conf.5.xml
+++ b/doc/apt_auth.conf.5.xml
@@ -13,7 +13,7 @@
&apt-email;
&apt-product;
<!-- The last update date -->
- <date>2017-08-17T00:00:00Z</date>
+ <date>2017-07-07T00:00:00Z</date>
</refentryinfo>
<refmeta>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 2ed3d1158..1c7b58ff4 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.7.0~rc2\n"
+"Project-Id-Version: apt-doc 1.7.0\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-09-20 21:04+0200\n"
+"POT-Creation-Date: 2018-10-07 07:56+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"
@@ -3010,7 +3010,7 @@ msgid ""
"parameters for compression and uncompression:"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
#: apt.conf.5.xml
#, no-wrap
msgid ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 5ac6cd4e4..76d08e45f 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-04-18 17:22+0200\n"
+"POT-Creation-Date: 2018-10-07 07:56+0200\n"
"PO-Revision-Date: 2018-02-03 13:12+0200\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -4276,7 +4276,7 @@ msgstr ""
"zusätzliche Befehlszeilenparameter zum Komprimieren und Dekomprimieren an "
"den Befehl <command>rev</command> übergeben:"
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
#: apt.conf.5.xml
#, no-wrap
msgid ""
diff --git a/doc/po/es.po b/doc/po/es.po
index 8f419acda..ba7fd28af 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-04-18 17:22+0200\n"
+"POT-Creation-Date: 2018-10-07 07:56+0200\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"
@@ -4272,7 +4272,7 @@ msgid ""
"parameters for compression and uncompression:"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
#: apt.conf.5.xml
#, no-wrap
msgid ""
diff --git a/doc/po/fr.po b/doc/po/fr.po
index b29f046e8..b1eb022b0 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 <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-04-18 17:22+0200\n"
+"POT-Creation-Date: 2018-10-07 07:56+0200\n"
"PO-Revision-Date: 2018-03-16 00:54+0100\n"
"Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -4270,7 +4270,7 @@ msgstr ""
"command> sans paramètre supplémentaire en ligne de commande pour la "
"compression et la décompression :"
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
#: apt.conf.5.xml
#, no-wrap
msgid ""
diff --git a/doc/po/it.po b/doc/po/it.po
index 870550dc7..4c36d1a68 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-04-18 17:22+0200\n"
+"POT-Creation-Date: 2018-10-07 07:56+0200\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"
@@ -4286,7 +4286,7 @@ msgstr ""
"command> senza parametri aggiuntivi per la compressione e la decompressione "
"nella riga di comando:"
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
#: apt.conf.5.xml
#, no-wrap
msgid ""
@@ -7580,8 +7580,8 @@ msgstr "Formato in stile deb822"
#| "character at the start of the line marks the entire line as a comment. An "
#| "entry can hence be disabled by commenting out each line belonging to the "
#| "stanza, but it is usually easier to add the field \"Enabled: no\" to the "
-#| "stanza to disable the entry. Removing the field or setting it to yes "
-#| "re-enables it. Options have the same syntax as every other field: A "
+#| "stanza to disable the entry. Removing the field or setting it to yes re-"
+#| "enables it. Options have the same syntax as every other field: A "
#| "fieldname separated by a colon (<literal>:</literal>) and optionally "
#| "spaces from its value(s). Note especially that multiple values are "
#| "separated by spaces, not by commas as in the one-line format. Multivalue "
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 8f7975c8e..6721ba080 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-04-18 17:22+0200\n"
+"POT-Creation-Date: 2018-10-07 07:56+0200\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"
@@ -4135,7 +4135,7 @@ msgstr ""
"し、<command>rev</command> による圧縮と展開の際に渡すコマンドラインパラメータ"
"を追加しない設定となります:"
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
#: apt.conf.5.xml
#, no-wrap
msgid ""
@@ -7272,8 +7272,8 @@ msgstr "deb822 スタイル形式"
#| "character at the start of the line marks the entire line as a comment. An "
#| "entry can hence be disabled by commenting out each line belonging to the "
#| "stanza, but it is usually easier to add the field \"Enabled: no\" to the "
-#| "stanza to disable the entry. Removing the field or setting it to yes "
-#| "re-enables it. Options have the same syntax as every other field: A "
+#| "stanza to disable the entry. Removing the field or setting it to yes re-"
+#| "enables it. Options have the same syntax as every other field: A "
#| "fieldname separated by a colon (<literal>:</literal>) and optionally "
#| "spaces from its value(s). Note especially that multiple values are "
#| "separated by spaces, not by commas as in the one-line format. Multivalue "
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 0e2be9bed..ccc80daae 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.6.1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-06-02 10:57+0200\n"
+"POT-Creation-Date: 2018-10-07 07:56+0200\n"
"PO-Revision-Date: 2018-05-19 23:38+0200\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -4366,7 +4366,7 @@ msgstr ""
"<command>rev</command> zal gebruiken zonder bijkomende "
"commandoregelparameters:"
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
#: apt.conf.5.xml
#, no-wrap
msgid ""
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 47b14b041..8361a2dbf 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-04-18 17:22+0200\n"
+"POT-Creation-Date: 2018-10-07 07:56+0200\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"
@@ -4268,7 +4268,7 @@ msgid ""
"parameters for compression and uncompression:"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
#: apt.conf.5.xml
#, no-wrap
msgid ""
diff --git a/doc/po/pt.po b/doc/po/pt.po
index b8b138117..394f06b66 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-04-18 17:22+0200\n"
+"POT-Creation-Date: 2018-10-07 07:56+0200\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"
@@ -4203,7 +4203,7 @@ msgid ""
"parameters for compression and uncompression:"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
#: apt.conf.5.xml
#, no-wrap
msgid ""
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 33ad7a358..0c37b896b 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -8,7 +8,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-04-18 17:22+0200\n"
+"POT-Creation-Date: 2018-10-07 07:56+0200\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"
@@ -2973,7 +2973,7 @@ msgid ""
"parameters for compression and uncompression:"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><informalexample><programlisting>
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
#: apt.conf.5.xml
#, no-wrap
msgid ""
diff --git a/po/apt-all.pot b/po/apt-all.pot
index c081032b6..18534b8a2 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt 1.7.0~rc2\n"
+"Project-Id-Version: apt 1.7.0\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-09-20 21:04+0200\n"
+"POT-Creation-Date: 2018-10-07 07:56+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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 23:58:09 +0000