Release 2.5.5

wangzhen0518 · Jan 17, 2023 · 09d4933 · 09d4933
1 parent 0970d64
commit 09d4933
Show file tree

Hide file tree

Showing 58 changed files with 552 additions and 207 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -205,7 +205,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.5.4")
+set(PACKAGE_VERSION "2.5.5")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,27 @@
+apt (2.5.5) unstable; urgency=medium
+
+  [ David Kalnischkies ]
+  * Do not document path to be repeatable in apt-ftparchive cmds
+
+  [ Julian Andres Klode ]
+  * gitlab-ci: Install adduser
+  * make ?installed pattern match installed version only when narrowed
+  * apt-patterns(7): Grouping with () and or using | are supported
+
+  [ Egon Willighagen ]
+  * Typo fix
+
+  [ Camiel Vletter ]
+  * improve `--help` text for cmdline `apt autoremove`
+
+  [ Frans Spiesschaert ]
+  * Dutch manpages translation update (Closes: #1023456, #1025843)
+
+  [ Алексей Шилин ]
+  * Add 'tasks' section to default APT::Never-MarkAuto-Sections list
+
+ -- Julian Andres Klode <jak@debian.org>  Tue, 17 Jan 2023 16:33:38 +0100
+
 apt (2.5.4) unstable; urgency=medium
 
   [ David Kalnischkies ]

diff --git a/doc/apt-patterns.7.xml b/doc/apt-patterns.7.xml
@@ -13,7 +13,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2021-12-26T00:00:00Z</date>
+   <date>2023-01-13T00:00:00Z</date>
  </refentryinfo>
 
  <refmeta>

diff --git 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.5.4">
+<!ENTITY apt-product-version "2.5.5">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "buster">

diff --git 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.5.4\n"
+"Project-Id-Version: apt-doc 2.5.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-10-31 12:11+0100\n"
+"POT-Creation-Date: 2023-01-17 16:33+0100\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"
@@ -8269,7 +8269,10 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-patterns.7.xml
-msgid "Selects packages that are currently installed."
+msgid ""
+"Selects packages that are currently installed. Since version 2.5.4, "
+"narrowing this pattern (see narrowing patterns above) makes it only match "
+"installed versions (see version patterns below)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -8376,6 +8379,15 @@ msgid ""
 "in <command>apt-cache policy</command>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects package versions that are currently installed. Versions prior to "
+"2.5.4 only matched at the package level, hence "
+"<code>?any-version(?installed?version(2.0))</code>matched even if 2.0 was "
+"not installed, but another version was."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
 msgid "<code>?origin(REGEX)</code>"
@@ -8692,14 +8704,6 @@ msgid ""
 "it would require the package name to contain <code>poptional</code>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-patterns.7.xml
-msgid ""
-"Grouping patterns with <code>(...)</code> or writing <code>?or(A,B)</code> "
-"as <code>A|B</code> are not supported. We do not believe that the use of "
-"<code>|</code> is that common, and the grouping is not necessary without it."
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-patterns.7.xml
 msgid ""

diff --git a/doc/po/de.po b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 2.0.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-10-31 12:11+0100\n"
+"POT-Creation-Date: 2023-01-17 16:33+0100\n"
 "PO-Revision-Date: 2020-04-04 08:45+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -11761,8 +11761,11 @@ msgstr "<code>~i</code>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-patterns.7.xml
-msgid "Selects packages that are currently installed."
-msgstr "wählt Pakete aus, die derzeit installiert sind."
+msgid ""
+"Selects packages that are currently installed. Since version 2.5.4, "
+"narrowing this pattern (see narrowing patterns above) makes it only match "
+"installed versions (see version patterns below)."
+msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
@@ -11887,6 +11890,15 @@ msgstr ""
 "Ursprung bedeutet hier, die Werte nach <code>o=</code> in <command>apt-cache "
 "policy</command>."
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects package versions that are currently installed. Versions prior to "
+"2.5.4 only matched at the package level, hence <code>?any-version(?installed?"
+"version(2.0))</code>matched even if 2.0 was not installed, but another "
+"version was."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
 msgid "<code>?origin(REGEX)</code>"
@@ -12283,18 +12295,6 @@ msgstr ""
 "code> eintippen, würde es erfordern, dass der Paketname <code>poptional</"
 "code> enthält."
 
-#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-patterns.7.xml
-msgid ""
-"Grouping patterns with <code>(...)</code> or writing <code>?or(A,B)</code> "
-"as <code>A|B</code> are not supported. We do not believe that the use of "
-"<code>|</code> is that common, and the grouping is not necessary without it."
-msgstr ""
-"Bündelnde Muster mit <code>(…)</code> oder der Schreibweise <code>A|B</code> "
-"für <code>?or(A,B)</code> werden nicht unterstützt. Wir gehen nicht davon "
-"aus, dass die Verwendung von <code>|</code> üblich ist und ohne diese ist "
-"eine Bündelung unnötig."
-
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-patterns.7.xml
 msgid ""
@@ -13946,6 +13946,20 @@ msgstr ""
 "fortfahren, wodurch die bereits auf der Platte heruntergeladenen Archive "
 "benutzt werden."
 
+#~ msgid "Selects packages that are currently installed."
+#~ msgstr "wählt Pakete aus, die derzeit installiert sind."
+
+#~ msgid ""
+#~ "Grouping patterns with <code>(...)</code> or writing <code>?or(A,B)</"
+#~ "code> as <code>A|B</code> are not supported. We do not believe that the "
+#~ "use of <code>|</code> is that common, and the grouping is not necessary "
+#~ "without it."
+#~ msgstr ""
+#~ "Bündelnde Muster mit <code>(…)</code> oder der Schreibweise <code>A|B</"
+#~ "code> für <code>?or(A,B)</code> werden nicht unterstützt. Wir gehen nicht "
+#~ "davon aus, dass die Verwendung von <code>|</code> üblich ist und ohne "
+#~ "diese ist eine Bündelung unnötig."
+
 #~ msgid "Regular expressions and &glob; syntax"
 #~ msgstr "Reguläre Ausdrücke und &glob;-Syntax"
 

diff --git 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: 2022-10-31 12:11+0100\n"
+"POT-Creation-Date: 2023-01-17 16:33+0100\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"
@@ -11207,7 +11207,10 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-patterns.7.xml
-msgid "Selects packages that are currently installed."
+msgid ""
+"Selects packages that are currently installed. Since version 2.5.4, "
+"narrowing this pattern (see narrowing patterns above) makes it only match "
+"installed versions (see version patterns below)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -11314,6 +11317,15 @@ msgid ""
 "in <command>apt-cache policy</command>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects package versions that are currently installed. Versions prior to "
+"2.5.4 only matched at the package level, hence <code>?any-version(?installed?"
+"version(2.0))</code>matched even if 2.0 was not installed, but another "
+"version was."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
 msgid "<code>?origin(REGEX)</code>"
@@ -11633,14 +11645,6 @@ msgid ""
 "package name to contain <code>poptional</code>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-patterns.7.xml
-msgid ""
-"Grouping patterns with <code>(...)</code> or writing <code>?or(A,B)</code> "
-"as <code>A|B</code> are not supported. We do not believe that the use of "
-"<code>|</code> is that common, and the grouping is not necessary without it."
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-patterns.7.xml
 msgid ""

diff --git a/doc/po/fr.po b/doc/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.8.0\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2022-10-31 12:11+0100\n"
+"POT-Creation-Date: 2023-01-17 16:33+0100\n"
 "PO-Revision-Date: 2019-05-01 17:00+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -11672,7 +11672,10 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-patterns.7.xml
-msgid "Selects packages that are currently installed."
+msgid ""
+"Selects packages that are currently installed. Since version 2.5.4, "
+"narrowing this pattern (see narrowing patterns above) makes it only match "
+"installed versions (see version patterns below)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -11781,6 +11784,15 @@ msgid ""
 "in <command>apt-cache policy</command>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects package versions that are currently installed. Versions prior to "
+"2.5.4 only matched at the package level, hence <code>?any-version(?installed?"
+"version(2.0))</code>matched even if 2.0 was not installed, but another "
+"version was."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
 msgid "<code>?origin(REGEX)</code>"
@@ -12102,14 +12114,6 @@ msgid ""
 "package name to contain <code>poptional</code>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-patterns.7.xml
-msgid ""
-"Grouping patterns with <code>(...)</code> or writing <code>?or(A,B)</code> "
-"as <code>A|B</code> are not supported. We do not believe that the use of "
-"<code>|</code> is that common, and the grouping is not necessary without it."
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-patterns.7.xml
 msgid ""

diff --git 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: 2022-10-31 12:11+0100\n"
+"POT-Creation-Date: 2023-01-17 16:33+0100\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"
@@ -11407,7 +11407,10 @@ msgstr "<option>--installed</option>"
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-patterns.7.xml
-msgid "Selects packages that are currently installed."
+msgid ""
+"Selects packages that are currently installed. Since version 2.5.4, "
+"narrowing this pattern (see narrowing patterns above) makes it only match "
+"installed versions (see version patterns below)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -11530,6 +11533,15 @@ msgid ""
 "in <command>apt-cache policy</command>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects package versions that are currently installed. Versions prior to "
+"2.5.4 only matched at the package level, hence <code>?any-version(?installed?"
+"version(2.0))</code>matched even if 2.0 was not installed, but another "
+"version was."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
 #, fuzzy
@@ -11903,14 +11915,6 @@ msgid ""
 "package name to contain <code>poptional</code>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-patterns.7.xml
-msgid ""
-"Grouping patterns with <code>(...)</code> or writing <code>?or(A,B)</code> "
-"as <code>A|B</code> are not supported. We do not believe that the use of "
-"<code>|</code> is that common, and the grouping is not necessary without it."
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-patterns.7.xml
 msgid ""

diff --git 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: 2022-10-31 12:11+0100\n"
+"POT-Creation-Date: 2023-01-17 16:33+0100\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"
@@ -10984,7 +10984,10 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt-patterns.7.xml
-msgid "Selects packages that are currently installed."
+msgid ""
+"Selects packages that are currently installed. Since version 2.5.4, "
+"narrowing this pattern (see narrowing patterns above) makes it only match "
+"installed versions (see version patterns below)."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -11093,6 +11096,15 @@ msgid ""
 "in <command>apt-cache policy</command>."
 msgstr ""
 
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-patterns.7.xml
+msgid ""
+"Selects package versions that are currently installed. Versions prior to "
+"2.5.4 only matched at the package level, hence <code>?any-version(?installed?"
+"version(2.0))</code>matched even if 2.0 was not installed, but another "
+"version was."
+msgstr ""
+
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
 #: apt-patterns.7.xml
 msgid "<code>?origin(REGEX)</code>"
@@ -11414,14 +11426,6 @@ msgid ""
 "package name to contain <code>poptional</code>."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-patterns.7.xml
-msgid ""
-"Grouping patterns with <code>(...)</code> or writing <code>?or(A,B)</code> "
-"as <code>A|B</code> are not supported. We do not believe that the use of "
-"<code>|</code> is that common, and the grouping is not necessary without it."
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
 #: apt-patterns.7.xml
 msgid ""