From f21ca6d73dacc277e0b3d7a8fa15b2c30633d3ae Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Wed, 8 Jul 2020 09:40:38 +0200
Subject: Release 2.1.7

---
 CMakeLists.txt       |  2 +-
 debian/changelog     | 30 ++++++++++++++++++++++++++++++
 doc/apt-verbatim.ent |  2 +-
 doc/po/apt-doc.pot   |  4 ++--
 po/apt-all.pot       |  4 ++--
 5 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7dbf8abc3..afd74adb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -204,7 +204,7 @@ check_cxx_target(HAVE_FMV_SSE42_AND_CRC32DI "sse4.2" "__builtin_ia32_crc32di(0,i
 # 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 "2.1.6")
+set(PACKAGE_VERSION "2.1.7")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)
diff --git a/debian/changelog b/debian/changelog
index 4f4e835d6..c7651c4d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+apt (2.1.7) unstable; urgency=medium
+
+  [ David Kalnischkies ]
+  * Do not hardcode (wrong) group and mode in setup warning (Closes: #962310)
+  * Do not sent our filename-provides trick to EDSP solvers (Closes: #962741)
+  * Tell EDSP solvers about all installed pkgs ignoring arch
+  * Deduplicate EDSP Provides line of M-A:foreign packages
+  * Delay removals due to Conflicts until Depends are resolved
+  * Filter out impossible solutions for protected propagation
+  * Add dependency points in the resolver also to providers
+  * Reorder config check before checking systemd for non-interactive http
+  * Reorder config check before result looping for SRV parsing debug
+  * Fix test due to display change in ls (coreutils 8.32)
+  * Detect pkg-config-dpkghook failure in tests to avoid fallback (Closes: #964475)
+
+  [ Américo Monteiro ]
+  * Portuguese manpages translation update (Closes: #962483)
+
+  [ Julian Andres Klode ]
+  * Replace some magic 64*1024 with APT_BUFFER_SIZE
+  * Add basic support for the Protected field
+
+  [ Sergio Oller Moreno ]
+  * Minor Catalan grammar typo
+
+  [ Frans Spiesschaert ]
+  * Dutch program translation update (Closes: #963008)
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 08 Jul 2020 09:38:35 +0200
+
 apt (2.1.6) unstable; urgency=medium
 
   [ David Kalnischkies ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 6a72016e6..c691d1de8 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -274,7 +274,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "2.1.6">
+<!ENTITY apt-product-version "2.1.7">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "stretch">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index e69b006fe..f0bf7bdf1 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 2.1.6\n"
+"Project-Id-Version: apt-doc 2.1.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2020-06-03 18:25+0200\n"
+"POT-Creation-Date: 2020-07-08 09:40+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/po/apt-all.pot b/po/apt-all.pot
index 80273ad11..395e52cee 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.1.6\n"
+"Project-Id-Version: apt 2.1.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2020-06-03 18:25+0200\n"
+"POT-Creation-Date: 2020-07-08 09:40+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-18-g5258