summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--debian/changelog13
-rw-r--r--doc/apt-verbatim.ent2
-rw-r--r--doc/po/apt-doc.pot4
-rw-r--r--po/apt-all.pot4
-rw-r--r--po/ca.po11
6 files changed, 25 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12a4ab227..06e3fc9fa 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.7")
+set(PACKAGE_VERSION "2.9.8")
string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
if (NOT DEFINED DPKG_DATADIR)
diff --git a/debian/changelog b/debian/changelog
index bc576da0f..b5b954467 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+apt (2.9.8) unstable; urgency=medium
+
+ [ Aristo Chen ]
+ * Do not return error if `Signed-By` value in source list is empty
+
+ [ Carles Pina i Estany ]
+ * Update Catalan translation
+
+ [ Julian Andres Klode ]
+ * Fix obsoleted-by handling for experimental in 3.0 solver
+
+ -- Julian Andres Klode <jak@debian.org> Mon, 12 Aug 2024 16:12:43 +0200
+
apt (2.9.7) unstable; urgency=medium
[ sid ]
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index f415a0eba..9698e55f0 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.7">
+<!ENTITY apt-product-version "2.9.8">
<!-- (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 4779a0d98..6d97a73d9 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.7\n"
+"Project-Id-Version: apt-doc 2.9.8\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-07-30 04:29+0000\n"
+"POT-Creation-Date: 2024-08-12 14:14+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 7259cd41e..6b199d222 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt 2.9.7\n"
+"Project-Id-Version: apt 2.9.8\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-07-30 04:29+0000\n"
+"POT-Creation-Date: 2024-08-12 14:14+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/ca.po b/po/ca.po
index a77094d62..fca25f17f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 1.4~beta1\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2024-05-25 09:01+0000\n"
+"POT-Creation-Date: 2024-08-12 14:14+0000\n"
"PO-Revision-Date: 2024-08-08 22:47+0100\n"
"Last-Translator: Carles Pina i Estany <cpina@debian.org>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -2019,7 +2019,6 @@ msgstr ""
#: apt-private/private-install.cc
#, c-format
-#| msgid "Download Failed"
msgid " Download size: %sB / %sB\n"
msgstr " Mida de la descàrrega: %sB / %sB\n"
@@ -2032,7 +2031,6 @@ msgstr "S'ha d'obtenir %sB/%sB d'arxius.\n"
#: apt-private/private-install.cc
#, c-format
-#| msgid "Download Failed"
msgid " Download size: %sB\n"
msgstr " Mida de la descàrrega: %sB\n"
@@ -2361,7 +2359,6 @@ msgid "The following packages have unmet dependencies:"
msgstr "Els següents paquets tenen dependències sense satisfer:"
#: apt-private/private-output.cc
-#| msgid "satisfy dependency strings"
msgid "Unsatisfied dependencies:"
msgstr "Dependències no satisfetes:"
@@ -2461,7 +2458,6 @@ msgstr "%lu actualitzats, %lu nous a instal·lar, "
#: apt-private/private-output.cc
#, c-format
-#| msgid "Installing %s"
msgid "Upgrading: %lu, Installing: %lu, "
msgstr "S'està actualitzant: %lu, s'està instal·lant: %lu, "
@@ -4084,6 +4080,11 @@ msgstr "No es pot invocar "
msgid "untrusted public key algorithm: %s"
msgstr "no es confia en l'algoritme de clau pública: %s"
+#: methods/gpgv.cc
+#, c-format
+msgid "%s will be deprecated in a future release"
+msgstr ""
+
#. TRANSLATORS: %s is a single techy word like 'NODATA'
#: methods/gpgv.cc
#, c-format