From ade9d3c41da55171f258a3aeed2e3b3350da8920 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Mon, 8 Mar 2021 11:51:58 +0100
Subject: Release 2.3.0

---
 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 6e7ff2a9b..07d5475fc 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.2.1")
+set(PACKAGE_VERSION "2.3.0")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)
diff --git a/debian/changelog b/debian/changelog
index b5d79119d..78327a9c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+apt (2.3.0) experimental; urgency=medium
+
+  [ David Kalnischkies ]
+  * Deal with rred shortcomings around empty patch files (LP: #1918112)
+    - Allow merging with empty pdiff patches
+    - Rename pdiff merge patches only after they are all downloaded
+    - Start pdiff patching from the last possible starting point
+    - Ensure all index files sent custom tags to the methods
+
+ -- Julian Andres Klode <jak@debian.org>  Mon, 08 Mar 2021 11:50:31 +0100
+
 apt (2.2.1) unstable; urgency=medium
 
   [ Julian Andres Klode ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 6b2107496..9dd4090dd 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.2.1">
+<!ENTITY apt-product-version "2.3.0">
 
 <!-- (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 bf1c92e39..d4b96c5ae 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.2.1\n"
+"Project-Id-Version: apt-doc 2.3.0\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2021-03-01 22:28+0100\n"
+"POT-Creation-Date: 2021-03-08 11:51+0100\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 38f5cda0e..91b9bab18 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.2.1\n"
+"Project-Id-Version: apt 2.3.0\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2021-03-01 22:28+0100\n"
+"POT-Creation-Date: 2021-03-08 11:51+0100\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