From 8f84d45b7b7fcefb622314b74ac103dba347fb7c Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Tue, 13 Apr 2021 17:26:59 +0200
Subject: Release 2.3.1

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07d5475fc..4430947cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,7 +200,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 "2.3.0")
+set(PACKAGE_VERSION "2.3.1")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)
diff --git a/debian/changelog b/debian/changelog
index 78327a9c2..6faf06657 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+apt (2.3.1) experimental; urgency=medium
+
+  [ David Kalnischkies ]
+  * Replace macro and manual management with lambda and RAII:
+    - Replace multi-statement macro with lambda
+    - Use RAII to clean up tmp dir for dpkg recursive install
+    - Handle multi-arch pkgnames for dpkg call via RAII
+    - Merge the three RAII vectors managing args lifetime
+  * Harden test for no new acquires after transaction abort (Closes: #984966)
+
+  [ Julian Andres Klode ]
+  * Check for and discard expected warning from MaybeAddAuth
+  * Fix downloads of unsized files that are largest in pipeline (LP: #1921626)
+  * Error on packages without a Size field (option Acquire::AllowUnsizedPackages)
+  * debian/gbp.conf: HEAD branch is main now
+
+  [ Cameron Katri ]
+  * add vendor information for Procursus
+
+ -- Julian Andres Klode <jak@debian.org>  Tue, 13 Apr 2021 17:23:49 +0200
+
 apt (2.3.0) experimental; urgency=medium
 
   [ David Kalnischkies ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 9dd4090dd..b22bde69d 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.3.0">
+<!ENTITY apt-product-version "2.3.1">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "buster">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index d4b96c5ae..f1169ae6e 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.3.0\n"
+"Project-Id-Version: apt-doc 2.3.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2021-03-08 11:51+0100\n"
+"POT-Creation-Date: 2021-04-13 15:26+0000\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 91b9bab18..4cacd7870 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.3.0\n"
+"Project-Id-Version: apt 2.3.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2021-03-08 11:51+0100\n"
+"POT-Creation-Date: 2021-04-13 15:26+0000\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