From cb608f5c1e8af4f6fe68bc31cb96013308a4003b Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Wed, 3 Jun 2020 18:25:57 +0200
Subject: Release 2.1.6

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fbe8ac24..7dbf8abc3 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.5")
+set(PACKAGE_VERSION "2.1.6")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)
diff --git a/debian/changelog b/debian/changelog
index 541bfbba9..4f4e835d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+apt (2.1.6) unstable; urgency=medium
+
+  [ David Kalnischkies ]
+  * Fix small memory leak in MethodConfig
+  * Consider protected packages for removal if they are marked as such
+  * Consider if a fix is successful before claiming it is
+  * Allow 20 instead of 10 loops for pkgProblemResolver
+  * Deal with duplicates in the solution space of a dep
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 03 Jun 2020 18:25:22 +0200
+
 apt (2.1.5) unstable; urgency=medium
 
   [ David Kalnischkies ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index d19393aee..6a72016e6 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.5">
+<!ENTITY apt-product-version "2.1.6">
 
 <!-- (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 fc0d02697..e69b006fe 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.5\n"
+"Project-Id-Version: apt-doc 2.1.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2020-05-26 12:20+0200\n"
+"POT-Creation-Date: 2020-06-03 18:25+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 e5981af14..80273ad11 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.1.5\n"
+"Project-Id-Version: apt 2.1.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2020-05-26 12:20+0200\n"
+"POT-Creation-Date: 2020-06-03 18:25+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