From 3586b5cede55c3da3e4e026c296659b86dce0782 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Wed, 18 Apr 2018 16:35:08 +0200
Subject: Release 1.6

---
 CMakeLists.txt                | 2 +-
 debian/changelog              | 7 +++++++
 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            | 4 ++--
 doc/sources.list.5.xml        | 2 +-
 po/apt-all.pot                | 4 ++--
 9 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c847e22b2..c39619a57 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~rc1")
+set(PACKAGE_VERSION "1.6")
 
 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..fa7c42381 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (1.6) unstable; urgency=medium
+
+  * Make libzstd optional in CMakeLists.txt, to aid cross-building
+  * Point debian-branch to 1.6.y
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 18 Apr 2018 16:34:33 +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;
    <!-- The last update date -->
-   <date>2018-04-07T00:00:00Z</date>
+   <date>2018-04-15T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
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;
    <!-- The last update date -->
-   <date>2018-02-26T00:00:00Z</date>
+   <date>2018-04-15T00:00:00Z</date>
  </refentryinfo>
 
  <refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index a693e621e..387537a1d 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~rc1">
+<!ENTITY apt-product-version "1.6">
 
 <!-- (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 6d7b273f6..e64de6b77 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-02-26T00:00:00Z</date>
+   <date>2018-04-15T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 3641831c4..17e4f48ab 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.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-04-15 21:57+0200\n"
+"POT-Creation-Date: 2018-04-18 16:35+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"
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index c3e8980a9..070026180 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-02-27T00:00:00Z</date>
+   <date>2018-04-15T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 3df622b0f..704fd28f9 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.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2018-04-15 21:57+0200\n"
+"POT-Creation-Date: 2018-04-18 16:34+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"
-- 
cgit v1.2.3