summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Andres Klode <julian.klode@canonical.com>2025-01-22 11:57:47 +0100
committerJulian Andres Klode <julian.klode@canonical.com>2025-01-22 11:57:47 +0100
commit76c8294463e7d148d2fe3d95ef1ac18a68631dc5 (patch)
treeb9fd6eb0210f767ee30e0cf137b7847c91820b92
parent0c07c8f38e320e8f8b303011813018f8f02beed8 (diff)
Release 2.9.252.9.25
-rw-r--r--CMakeLists.txt2
-rw-r--r--debian/changelog6
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/po/apt-doc.pot4
-rw-r--r--po/apt-all.pot4
5 files changed, 12 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d32d94194..3523d6173 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 <deity@lists.debian.org>")
-set(PACKAGE_VERSION "2.9.24")
+set(PACKAGE_VERSION "2.9.25")
string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
if (NOT DEFINED DPKG_DATADIR)
diff --git a/debian/changelog b/debian/changelog
index b1ea07a4b..e8195f3fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apt (2.9.25) unstable; urgency=medium
+
+ * sqv, gpgv: Do not fail if Dir::Etc::Trusted is set and trusted.gpg.d is missing
+
+ -- Julian Andres Klode <jak@debian.org> Wed, 22 Jan 2025 11:07:01 +0100
+
apt (2.9.24) unstable; urgency=medium
* gitlab-ci: Use platform: linux/i386 instead of i386/debian image
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index eb6170615..53b099ad7 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -268,7 +268,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "2.9.24">
+<!ENTITY apt-product-version "2.9.25">
<!-- (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 c3dddfa03..5b17c4398 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.24\n"
+"Project-Id-Version: apt-doc 2.9.25\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-22 10:57+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 fae50d5c6..7ecbc4815 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt 2.9.24\n"
+"Project-Id-Version: apt 2.9.25\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2025-01-21 11:21+0000\n"
+"POT-Creation-Date: 2025-01-22 10:57+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"