From a5c65bce372375d40eb317e1a2b181cced54affa Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Tue, 26 May 2020 12:20:42 +0200
Subject: Release 2.1.5

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 115041f54..3fbe8ac24 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.4")
+set(PACKAGE_VERSION "2.1.5")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)
diff --git a/debian/changelog b/debian/changelog
index 1e33ff23f..541bfbba9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+apt (2.1.5) unstable; urgency=medium
+
+  [ David Kalnischkies ]
+  * Reset candidate version explicitly for internal state-keeping
+    (Closes: #961266)
+  * Known-bad candidate versions are not an upgrade option
+  * Keep status number if candidate is discarded for kept back display
+  * Allow pkgDepCache to be asked to check internal consistency
+  * Don't update candidate provides map if the same as current
+  * Ensure EDSP doesn't use a dangling architecture string
+  * Allow FMV SSE4.2 detection to succeed on clang
+  * Mark PatternTreeParser::Node destructor as virtual
+
+  [ Frans Spiesschaert ]
+  * Dutch manpages translation update (Closes: #961431)
+
+ -- Julian Andres Klode <jak@debian.org>  Tue, 26 May 2020 12:19:40 +0200
+
 apt (2.1.4) unstable; urgency=medium
 
   [ David Kalnischkies ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 35f0cb610..d19393aee 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.4">
+<!ENTITY apt-product-version "2.1.5">
 
 <!-- (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 c54974473..fc0d02697 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.4\n"
+"Project-Id-Version: apt-doc 2.1.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2020-05-19 11:29+0200\n"
+"POT-Creation-Date: 2020-05-26 12:20+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 60a64d5d7..e5981af14 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.1.4\n"
+"Project-Id-Version: apt 2.1.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2020-05-19 11:29+0200\n"
+"POT-Creation-Date: 2020-05-26 12:20+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