From 5a042d8c8e8265fc8b8a123b93cbebc9e345556b Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Tue, 17 May 2022 17:06:25 +0200
Subject: Release 2.5.0

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f3a6a7c2..863768034 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,7 +205,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.4.5")
+set(PACKAGE_VERSION "2.5.0")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)
diff --git a/debian/changelog b/debian/changelog
index 2d069a498..797a15627 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,49 @@
+apt (2.5.0) unstable; urgency=medium
+
+  [ Helmut Grohne ]
+  * Avoid use of deprecated std::iterator (twice) (Closes: #1008036)
+
+  [ David Kalnischkies ]
+  * Document tagfile-keys.h as internal to apt
+  * Drop support for long obsoleted Suggests alias: Optional
+  * Do not order long obsoleted fields anymore
+  * Stop parsing undocumented unknown EDSP field APT-Hash
+  * Avoid .c_str() on strings feed into pkgTagSection::FindS
+  * Use pkgTagSection::Key in more places in src:apt
+  * Parse Checksum fields via pkgTagSection::Key, too
+  * Avoid building all docs in nodoc build profile
+  * Add pkg.apt.nodoxygen build profile
+  * Use build-dep & satisfy for our CI dependency resolution
+  * Mark pkg-config-test autopkgtest as superficial
+  * Avoid building inside the source dir in autopkgtest
+  * Link interactive helpers against system libapt for autopkgtest
+  * Remove unused public zlib include from libapt fileutl.h
+  * Run ./prepare-release post-build checks in Gitlab CI
+  * Do not build documentation twice in CI
+  * Ignore stty failures in testcases
+  * Include our config.h in all C++ files to avoid ODR violations
+  * Ship our README.md in apt package
+
+  [ Frans Spiesschaert ]
+  * Dutch program translation update (Closes: #1010029)
+  * Dutch manpages translation update (Closes: #1010030)
+
+  [ Troy Varney ]
+  * Fix mirror method dequeuing incorrect items
+
+  [ Julian Andres Klode ]
+  * Do not accept arguments for apt-cache dotty, xvcg.
+    These commands do not actually interpret the same
+    arguments as depends, or any own ones for that matter.
+  * tests: Add g++ dependency to pkg-config test
+
+  [ Vagrant Cascadian ]
+  * Pass -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON via dh_auto_configure override
+    (Closes: #1009796)
+  * Add support for "nodoc" build profile (Closes: #1009797)
+
+ -- Julian Andres Klode <jak@debian.org>  Tue, 17 May 2022 18:50:45 +0200
+
 apt (2.4.5) unstable; urgency=medium
 
   * Only protect two kernels, not last installed one (LP: #1968154)
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index ce403c49f..4e0c3a3e7 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.4.5">
+<!ENTITY apt-product-version "2.5.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 30689c4b4..e1ee7eec9 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.4.5\n"
+"Project-Id-Version: apt-doc 2.5.0\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-04-08 12:23+0200\n"
+"POT-Creation-Date: 2022-05-17 17:06+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 7d70fb2df..f1d6db887 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.4.5\n"
+"Project-Id-Version: apt 2.5.0\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-04-08 12:23+0200\n"
+"POT-Creation-Date: 2022-05-17 17:06+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