diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | doc/apt-verbatim.ent | 2 | ||||
| -rw-r--r-- | doc/apt.8.xml | 2 | ||||
| -rw-r--r-- | doc/po/apt-doc.pot | 16 | ||||
| -rw-r--r-- | doc/po/de.po | 14 | ||||
| -rw-r--r-- | doc/po/es.po | 14 | ||||
| -rw-r--r-- | doc/po/fr.po | 14 | ||||
| -rw-r--r-- | doc/po/it.po | 14 | ||||
| -rw-r--r-- | doc/po/ja.po | 14 | ||||
| -rw-r--r-- | doc/po/nl.po | 14 | ||||
| -rw-r--r-- | doc/po/pl.po | 14 | ||||
| -rw-r--r-- | doc/po/pt.po | 14 | ||||
| -rw-r--r-- | doc/po/pt_BR.po | 14 | ||||
| -rw-r--r-- | po/apt-all.pot | 4 |
15 files changed, 89 insertions, 76 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 756e4947c..f97996270 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 "3.1.11") +set(PACKAGE_VERSION "3.1.12") string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION}) if (NOT DEFINED DPKG_DATADIR) diff --git a/debian/changelog b/debian/changelog index 7696fdfa8..aae9fb0ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +apt (3.1.12) unstable; urgency=medium + + [ Ruoyu Zhong ] + * Fix missing includes + + [ Julian Andres Klode ] + * Correctly copy provided version in m-a lazy-init (Closes: #1120463) + * Special cow + * weakptr: Simplify destructor to use range-based for + * Improve documentation for apt --cli-version + + -- Julian Andres Klode <jak@debian.org> Mon, 10 Nov 2025 11:35:04 +0100 + apt (3.1.11) unstable; urgency=medium * Adjust test cases to treat 3.0 as default APT_SOLVER if not set diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent index d1e8cb9f6..c6f9a2939 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 "3.1.11"> +<!ENTITY apt-product-version "3.1.12"> <!-- (Code)names for various things used all over the place --> <!ENTITY debian-oldstable-codename "bookworm"> diff --git a/doc/apt.8.xml b/doc/apt.8.xml index 739cbaeec..2c39b7eee 100644 --- a/doc/apt.8.xml +++ b/doc/apt.8.xml @@ -13,7 +13,7 @@ &apt-email; &apt-product; <!-- The last update date --> - <date>2025-06-10T00:00:00Z</date> + <date>2025-11-07T00:00:00Z</date> </refentryinfo> <refmeta> diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 31f4beb69..7899a184b 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.1.11\n" +"Project-Id-Version: apt-doc 3.1.12\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2025-10-26 08:32+0000\n" +"POT-Creation-Date: 2025-11-10 10:36+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" @@ -844,6 +844,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> +#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-config.8.xml +#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml +msgid "options" +msgstr "" + +#. type: Content of: <refentry><refsect1><title> #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml #: apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml apt_preferences.5.xml #: sources.list.5.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml @@ -1248,12 +1254,6 @@ msgid "" "<package>apt-doc</package> package." msgstr "" -#. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml -#: apt-sortpkgs.1.xml apt-ftparchive.1.xml -msgid "options" -msgstr "" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" diff --git a/doc/po/de.po b/doc/po/de.po index ccb54de5e..000a4fdd9 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 2.9.27\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2025-10-25 20:53+0000\n" +"POT-Creation-Date: 2025-11-10 10:36+0000\n" "PO-Revision-Date: 2025-02-28 15:48+0100\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -1065,6 +1065,12 @@ msgstr "" "da sie die Abwärtskompatibilität so weit wie möglich aufrechterhalten." #. type: Content of: <refentry><refsect1><title> +#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-config.8.xml +#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml +msgid "options" +msgstr "Optionen" + +#. type: Content of: <refentry><refsect1><title> #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml #: apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml apt_preferences.5.xml #: sources.list.5.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml @@ -1666,12 +1672,6 @@ msgstr "" "der Datei &apt-acquire-additional-files; im Paket <package>apt-doc</package> " "zu finden." -#. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml -#: apt-sortpkgs.1.xml apt-ftparchive.1.xml -msgid "options" -msgstr "Optionen" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" diff --git a/doc/po/es.po b/doc/po/es.po index 7d4b8a3b6..36367a07e 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -38,7 +38,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2025-10-25 20:53+0000\n" +"POT-Creation-Date: 2025-11-10 10:36+0000\n" "PO-Revision-Date: 2014-07-04 01:31+0200\n" "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n" "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -1114,6 +1114,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> +#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-config.8.xml +#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml +msgid "options" +msgstr "Opciones" + +#. type: Content of: <refentry><refsect1><title> #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml #: apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml apt_preferences.5.xml #: sources.list.5.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml @@ -1707,12 +1713,6 @@ msgid "" "acquire-additional-files; shipped by the <package>apt-doc</package> package." msgstr "" -#. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml -#: apt-sortpkgs.1.xml apt-ftparchive.1.xml -msgid "options" -msgstr "Opciones" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" diff --git a/doc/po/fr.po b/doc/po/fr.po index 5559af243..3e3b2554f 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 2.9.14\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2025-10-25 20:53+0000\n" +"POT-Creation-Date: 2025-11-10 10:36+0000\n" "PO-Revision-Date: 2025-04-15 13:14+0200\n" "Last-Translator: bubu <bubub@no-log.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1073,6 +1073,12 @@ msgstr "" "compatibilité ascendante." #. type: Content of: <refentry><refsect1><title> +#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-config.8.xml +#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml +msgid "options" +msgstr "options" + +#. type: Content of: <refentry><refsect1><title> #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml #: apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml apt_preferences.5.xml #: sources.list.5.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml @@ -1671,12 +1677,6 @@ msgstr "" "peut être trouvée dans le fichier &apt-acquire-additional-files; fourni par " "le paquet <package>apt-doc</package>." -#. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml -#: apt-sortpkgs.1.xml apt-ftparchive.1.xml -msgid "options" -msgstr "options" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" diff --git a/doc/po/it.po b/doc/po/it.po index 14954df43..9503e616e 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2025-10-25 20:53+0000\n" +"POT-Creation-Date: 2025-11-10 10:36+0000\n" "PO-Revision-Date: 2017-03-27 19:05+0200\n" "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" @@ -1143,6 +1143,12 @@ msgstr "" "che essi mantengono il più possibile la compatibilità all'indietro." #. type: Content of: <refentry><refsect1><title> +#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-config.8.xml +#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml +msgid "options" +msgstr "opzioni" + +#. type: Content of: <refentry><refsect1><title> #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml #: apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml apt_preferences.5.xml #: sources.list.5.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml @@ -1718,12 +1724,6 @@ msgstr "" "acquire-additional-files; fornito con il pacchetto <package>apt-doc</" "package>." -#. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml -#: apt-sortpkgs.1.xml apt-ftparchive.1.xml -msgid "options" -msgstr "opzioni" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" diff --git a/doc/po/ja.po b/doc/po/ja.po index 4860993bf..bc1b64ec2 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2025-10-25 20:53+0000\n" +"POT-Creation-Date: 2025-11-10 10:36+0000\n" "PO-Revision-Date: 2017-01-06 04:50+0900\n" "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" @@ -1135,6 +1135,12 @@ msgstr "" "うべきです。" #. type: Content of: <refentry><refsect1><title> +#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-config.8.xml +#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml +msgid "options" +msgstr "オプション" + +#. type: Content of: <refentry><refsect1><title> #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml #: apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml apt_preferences.5.xml #: sources.list.5.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml @@ -1682,12 +1688,6 @@ msgstr "" "package> パッケージに収録されている <literal><filename>doc/acquire-" "additional-files.txt</filename></literal> で見つけることができます。" -#. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml -#: apt-sortpkgs.1.xml apt-ftparchive.1.xml -msgid "options" -msgstr "オプション" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" diff --git a/doc/po/nl.po b/doc/po/nl.po index 421a6bc56..f3142ff69 100644 --- a/doc/po/nl.po +++ b/doc/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 3.1.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2025-10-25 20:53+0000\n" +"POT-Creation-Date: 2025-11-10 10:36+0000\n" "PO-Revision-Date: 2025-08-28 22:52+0200\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -1127,6 +1127,12 @@ msgstr "" "worden." #. type: Content of: <refentry><refsect1><title> +#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-config.8.xml +#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml +msgid "options" +msgstr "opties" + +#. type: Content of: <refentry><refsect1><title> #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml #: apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml apt_preferences.5.xml #: sources.list.5.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml @@ -1733,12 +1739,6 @@ msgstr "" "het bestand &apt-acquire-additional-files; dat te vinden is in het pakket " "<package>apt-doc</package>." -#. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml -#: apt-sortpkgs.1.xml apt-ftparchive.1.xml -msgid "options" -msgstr "opties" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" diff --git a/doc/po/pl.po b/doc/po/pl.po index a02d07355..3fb3f2f9c 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2025-10-25 20:53+0000\n" +"POT-Creation-Date: 2025-11-10 10:36+0000\n" "PO-Revision-Date: 2014-07-04 02:13+0200\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n" @@ -1075,6 +1075,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> +#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-config.8.xml +#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml +msgid "options" +msgstr "opcje" + +#. type: Content of: <refentry><refsect1><title> #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml #: apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml apt_preferences.5.xml #: sources.list.5.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml @@ -1688,12 +1694,6 @@ msgid "" "acquire-additional-files; shipped by the <package>apt-doc</package> package." msgstr "" -#. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml -#: apt-sortpkgs.1.xml apt-ftparchive.1.xml -msgid "options" -msgstr "opcje" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" diff --git a/doc/po/pt.po b/doc/po/pt.po index 954c31ea8..a86fffa26 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 3.1.4\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2025-10-25 20:53+0000\n" +"POT-Creation-Date: 2025-11-10 10:36+0000\n" "PO-Revision-Date: 2025-08-14 23:16+0100\n" "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n" "Language-Team: Portuguese <>\n" @@ -1110,6 +1110,12 @@ msgstr "" "compatibilidade com versões anteriores sempre que possível." #. type: Content of: <refentry><refsect1><title> +#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-config.8.xml +#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml +msgid "options" +msgstr "opções" + +#. type: Content of: <refentry><refsect1><title> #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml #: apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml apt_preferences.5.xml #: sources.list.5.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml @@ -1696,12 +1702,6 @@ msgstr "" "detalhada e esta pode ser encontrada no ficheiro &apt-acquire-additional-" "files; existente no pacote <package>apt-doc</package>." -#. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml -#: apt-sortpkgs.1.xml apt-ftparchive.1.xml -msgid "options" -msgstr "opções" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index 42ee2c3b0..04496b1f4 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2025-10-25 20:53+0000\n" +"POT-Creation-Date: 2025-11-10 10:36+0000\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@ -813,6 +813,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> +#: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-config.8.xml +#: apt-extracttemplates.1.xml apt-sortpkgs.1.xml apt-ftparchive.1.xml +msgid "options" +msgstr "" + +#. type: Content of: <refentry><refsect1><title> #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml #: apt-cdrom.8.xml apt-config.8.xml apt.conf.5.xml apt_preferences.5.xml #: sources.list.5.xml apt-extracttemplates.1.xml apt-sortpkgs.1.xml @@ -1216,12 +1222,6 @@ msgid "" "acquire-additional-files; shipped by the <package>apt-doc</package> package." msgstr "" -#. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml apt-cache.8.xml apt-config.8.xml apt-extracttemplates.1.xml -#: apt-sortpkgs.1.xml apt-ftparchive.1.xml -msgid "options" -msgstr "" - #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml msgid "" diff --git a/po/apt-all.pot b/po/apt-all.pot index 26654e7cb..30fd26093 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt 3.1.11\n" +"Project-Id-Version: apt 3.1.12\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2025-10-26 08:32+0000\n" +"POT-Creation-Date: 2025-11-10 10:36+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" |