From f9b5f49fe6030fc028bc93debf856d1ae75ca7ab Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 10 Jun 2025 18:05:29 +0200 Subject: Release 3.1.1 --- CMakeLists.txt | 2 +- debian/changelog | 35 +++++++++++++++++++++++++++++++++++ doc/apt-get.8.xml | 2 +- doc/apt-verbatim.ent | 2 +- doc/apt.8.xml | 2 +- doc/apt.conf.5.xml | 2 +- doc/po/apt-doc.pot | 4 ++-- po/apt-all.pot | 4 ++-- 8 files changed, 44 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 23eeba49b..14204810f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -204,7 +204,7 @@ endif() # Configure some variables like package, version and architecture. set(PACKAGE ${PROJECT_NAME}) set(PACKAGE_MAIL "APT Development Team ") -set(PACKAGE_VERSION "3.1.0") +set(PACKAGE_VERSION "3.1.1") string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION}) if (NOT DEFINED DPKG_DATADIR) diff --git a/debian/changelog b/debian/changelog index 9055aeed0..205d400f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,38 @@ +apt (3.1.1) experimental; urgency=medium + + * Bump CMAKE_CXX_STANDARD to 23 and fix code + * solver3: Assume manual packages. This orders all the manually + installed packages by preference (as we do for providers), + and ensures that we will not remove manual packages if we + do not need to. + * solver3: Merge intersecting dependencies (LP: #2111792) + When seeing dependencies on the same package, such as + Depends: a (>= 1), a (<< 2) + merge them into a single depends so that both of them + are satisfied by the same package, rather than say + Package: a-0, Provides: a (= 0) - satisfies a (<< 2) + Package: a-2, Provides: a (= 1) - satisfies a (>= 1) + * solver3: Ignore Architecture: all for obsoleted-by. + This avoids a problem in unstable/proposed setups where binaries + are not published together for all architectures, and foo:native + could be considered obsolete because of a newer bar:all. + * solver3: Filter installed Recommends + A currently satisfied Recommends is filtered to the same packages + it is currently satisfied by, ensuring that say, removing a will + not install a `b` to keep a Recommends: a | b satisfied. + * solver3: Minor refactorings + - Remove Work::choice + - solver3: Allow CompareProviders3 with empty package + * solver3: Minor bug fixes + - Handle failed assumption in Pop() + - If no choice was made nothing to invert + (avoid trying to "undo" the root assignment) + - Initialize startTime if not set in Pop() + - solver3: Explicitly declare and define ~Solver + * Avoid cast alignment warning in cache string view + + -- Julian Andres Klode Tue, 10 Jun 2025 17:39:38 +0200 + apt (3.1.0) experimental; urgency=medium [ Julian Andres Klode ] diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 93f02a5a7..e5bc0fc6b 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -14,7 +14,7 @@ &apt-email; &apt-product; - 2024-11-18T00:00:00Z + 2025-06-10T00:00:00Z diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index 3e77070fb..de3962952 100644 --- a/doc/apt-verbatim.ent +++ b/doc/apt-verbatim.ent @@ -268,7 +268,7 @@ "> - + diff --git a/doc/apt.8.xml b/doc/apt.8.xml index 2c1256dce..737b23f7e 100644 --- a/doc/apt.8.xml +++ b/doc/apt.8.xml @@ -13,7 +13,7 @@ &apt-email; &apt-product; - 2025-05-19T00:00:00Z + 2025-06-10T00:00:00Z diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml index 18379ac19..22b2752a1 100644 --- a/doc/apt.conf.5.xml +++ b/doc/apt.conf.5.xml @@ -19,7 +19,7 @@ &apt-email; &apt-product; - 2025-01-05T00:00:00Z + 2025-06-10T00:00:00Z diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 5fa5ee718..4c85ca1d3 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 3.0.1\n" +"Project-Id-Version: apt-doc 3.1.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2025-05-19 18:28+0200\n" +"POT-Creation-Date: 2025-06-10 16:03+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/apt-all.pot b/po/apt-all.pot index 4cf638092..ee6f39df8 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 3.0.1\n" +"Project-Id-Version: apt 3.1.1\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2025-05-19 18:28+0200\n" +"POT-Creation-Date: 2025-06-10 16:03+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit v1.2.3-70-g09d2