From 761852064521d9f34d3179c002427658342b6f03 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Tue, 2 Jul 2024 22:28:51 +0200
Subject: Release 2.9.6

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a457110a9..1998ca889 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -206,7 +206,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.9.5")
+set(PACKAGE_VERSION "2.9.6")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)
diff --git a/debian/changelog b/debian/changelog
index 35b62bcd0..ab7133ac4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+apt (2.9.6) unstable; urgency=medium
+
+  * solver3: Do not accidentally promote Replaces and Enhances to
+    dependencies; this fixes a regression in 2.9.5 when we added
+    code to promote currently satisfied Suggests to Depends.
+  * solver3: Unmark packages before setting any in ToDepCache
+  * solver3: Refactor (rewrite) FromDepCache() (Closes: #1071519)
+    This was intended to not have any behavioural changes, but verifying
+    the things that changed actually showed that they fixed subtle bugs.
+  * solver3: Consider packages as obsolete and not versions; this makes things
+    a bit easier to reason about.
+  * solver3: Only demote obsolete packages in choices for upgrades; this
+    fixes packages being needlessly replaced in apt install.
+
+ -- Julian Andres Klode <jak@debian.org>  Tue, 02 Jul 2024 22:20:36 +0200
+
 apt (2.9.5) unstable; urgency=medium
 
   [ Julian Andres Klode ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index f849c0c69..b2b38f9dc 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.9.5">
+<!ENTITY apt-product-version "2.9.6">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "bullseye">
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 979992b28..84ac0e802 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.9.5\n"
+"Project-Id-Version: apt-doc 2.9.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-06-13 19:06+0000\n"
+"POT-Creation-Date: 2024-07-02 20:27+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 51f7bf3e8..1f74e756e 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.9.5\n"
+"Project-Id-Version: apt 2.9.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-06-13 19:06+0000\n"
+"POT-Creation-Date: 2024-07-02 20:27+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-70-g09d2