Release 1.6.31.6.3

9 files changed, 33 insertions, 28 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a60380fc1..710fe9737 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 <deity@lists.debian.org>")
-set(PACKAGE_VERSION "1.6.2")
+set(PACKAGE_VERSION "1.6.3")
 
 if (NOT DEFINED DPKG_DATADIR)
   execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
diff --git a/debian/changelog b/debian/changelog
index 26ef95bc9..8dd68cdaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (1.6.3) unstable; urgency=medium
+
+  * Handle JSON hooks that just close the file/exit and fix some other errors
+    (LP: #1776218)
+
+ -- Julian Andres Klode <jak@debian.org>  Mon, 09 Jul 2018 16:41:27 +0200
+
 apt (1.6.2) unstable; urgency=medium
 
   * Fix build with new gtest (Closes: #897149)
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 290dbed98..c1db915b3 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-04-20T00:00:00Z</date>
+   <date>2018-06-25T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/apt-transport-https.1.xml b/doc/apt-transport-https.1.xml
index 8b6a0a5c7..bccfa4fb0 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-04-20T00:00:00Z</date>
+   <date>2018-06-25T00:00:00Z</date>
  </refentryinfo>
 
  <refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 32c40abb4..227f93211 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.2">
+<!ENTITY apt-product-version "1.6.3">
 
 <!-- (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 e3d4e4988..d377106f7 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-04-20T00:00:00Z</date>
+   <date>2018-06-25T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index ba6ceb8b5..68fb07f53 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.2\n"
+"Project-Id-Version: apt-doc 1.6.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-06-25 17:15+0200\n"
+"POT-Creation-Date: 2018-07-09 16:41+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"
@@ -545,7 +545,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt.8.xml apt.8.xml apt.8.xml apt.8.xml
+#: apt.8.xml
 msgid "(&apt-get;)"
 msgstr ""
 
@@ -578,7 +578,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt.8.xml apt-key.8.xml
+#: apt.8.xml apt-key.8.xml
 msgid ","
 msgstr ""
 
@@ -635,7 +635,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt.8.xml
+#: apt.8.xml
 msgid "(&apt-cache;)"
 msgstr ""
 
@@ -659,7 +659,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.8.xml apt.8.xml
+#: apt.8.xml
 msgid "(work-in-progress)"
 msgstr ""
 
@@ -983,12 +983,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml apt-get.8.xml
+#: apt-get.8.xml
 msgid "(and the"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml apt-get.8.xml
+#: apt-get.8.xml
 msgid "alias since 1.1)"
 msgstr ""
 
@@ -1506,8 +1506,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml apt-cache.8.xml apt-cache.8.xml apt-cache.8.xml
-#: apt-cache.8.xml apt-cache.8.xml apt-cache.8.xml apt-cache.8.xml
+#: apt-cache.8.xml
 msgid "&synopsis-pkg;"
 msgstr ""
 
@@ -2093,9 +2092,8 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml apt-mark.8.xml apt-mark.8.xml apt-cdrom.8.xml
-#: apt-transport-http.1.xml apt-transport-https.1.xml
-#: apt-transport-mirror.1.xml
+#: apt-key.8.xml apt-mark.8.xml apt-cdrom.8.xml apt-transport-http.1.xml
+#: apt-transport-https.1.xml apt-transport-mirror.1.xml
 msgid "Options"
 msgstr ""
 
@@ -4843,7 +4841,7 @@ msgid "gives the package name"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml apt_preferences.5.xml
+#: apt_preferences.5.xml
 msgid "the <literal>Version:</literal> line"
 msgstr ""
 
@@ -5052,7 +5050,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml apt_preferences.5.xml apt_preferences.5.xml
+#: apt_preferences.5.xml
 #, no-wrap
 msgid ""
 "apt-get install <replaceable>package-name</replaceable>\n"
@@ -6156,7 +6154,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml apt-ftparchive.1.xml
+#: apt-ftparchive.1.xml
 msgid "The option <option>--db</option> can be used to specify a binary caching DB."
 msgstr ""
 
@@ -6370,7 +6368,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml apt-ftparchive.1.xml
+#: apt-ftparchive.1.xml
 msgid ""
 "Specifies whether long descriptions should be included in the "
 "<filename>Packages</filename> file or split out into a master "
@@ -6576,12 +6574,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml apt-ftparchive.1.xml
+#: apt-ftparchive.1.xml
 msgid "Sets the binary extra override file."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml apt-ftparchive.1.xml
+#: apt-ftparchive.1.xml
 msgid "Sets the source extra override file."
 msgstr ""
 
@@ -8441,7 +8439,7 @@ msgid "Introduction"
 msgstr ""
 
 #. type: Content of: <book><chapter><section><title>
-#: offline.dbk offline.dbk offline.dbk
+#: offline.dbk
 msgid "Overview"
 msgstr ""
 
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index f9b994add..4eedcf520 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>2018-04-20T00:00:00Z</date>
+   <date>2018-06-25T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index b41c22bd9..478f8e744 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.6.2\n"
+"Project-Id-Version: apt 1.6.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-06-25 17:15+0200\n"
+"POT-Creation-Date: 2018-07-09 16:41+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"