apt: update to 3.2.0

app-admin/apt/autobuild/patches/0001-fix-CMake-Documentation.cmake-fix-XSL-stylesheets-in.patch → app-admin/apt/autobuild/patches/0001-AOSCOS-fix-CMake-Documentation.cmake-fix-XSL-stylesh.patch

@@ -1,19 +1,21 @@
-From 0e6448b5c2115a90314143ddde3a00196b2f24fe Mon Sep 17 00:00:00 2001
+From 04e67432f185bd3eb4a25ce5990e439610baa7fa Mon Sep 17 00:00:00 2001
 From: Mingcong Bai <jeffbai@aosc.io>
 Date: Fri, 27 Sep 2024 11:14:43 +0800
-Subject: [PATCH 1/3] fix(CMake/Documentation.cmake): fix XSL stylesheets
- include path
+Subject: [PATCH 1/3] AOSCOS: fix(CMake/Documentation.cmake): fix XSL
+ stylesheets include path
 
 AOSC OS does not ship the unversioned /usr/share/xml/docbook/xsl-stylesheets,
 but one with a versioned suffix.
 
 This may be fixed in the future (with a symlink).
+
+Signed-off-by: Mingcong Bai <jeffbai@aosc.io>
 ---
  CMake/Documentation.cmake | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMake/Documentation.cmake b/CMake/Documentation.cmake
-index f3eb4c5e1..52ba8a454 100644
+index efd00d2f9..847fc18e3 100644
 --- a/CMake/Documentation.cmake
 +++ b/CMake/Documentation.cmake
 @@ -31,7 +31,7 @@ find_path(DOCBOOK_XSL manpages/docbook.xsl
@@ -26,5 +28,5 @@ index f3eb4c5e1..52ba8a454 100644
           /usr/share/sgml/docbook/xsl-stylesheets
           # Fink
 -- 
-2.46.2
+2.52.0
 

app-admin/apt/autobuild/patches/0002-fix-completions-do-not-assume-RPM-even-if-etc-debian.patch → app-admin/apt/autobuild/patches/0002-AOSCOS-fix-completions-do-not-assume-RPM-even-if-etc.patch

@@ -1,22 +1,30 @@
-From 53ed952c9a3f8a6550b29544bde7a0dbd2d2a00e Mon Sep 17 00:00:00 2001
+From efa48687ccd4f828d06facbb9f16d12289120d65 Mon Sep 17 00:00:00 2001
 From: Mingcong Bai <jeffbai@aosc.io>
 Date: Fri, 27 Sep 2024 11:16:38 +0800
-Subject: [PATCH 2/3] fix(completions): do not assume RPM even if
+Subject: [PATCH 2/3] AOSCOS: fix(completions): do not assume RPM even if
  /etc/debian_version is not found
 
 AOSC OS is not a Debian-derivative nor an RPM distribution.
+
+Signed-off-by: Mingcong Bai <jeffbai@aosc.io>
+
+[Mingcong Bai: Resolved a minor (invisible) merge conflict in
+ completions/bash/apt since 3.1.16.]
+
+Signed-off-by: Mingcong Bai <jeffbai@aosc.io>
 ---
- completions/bash/apt | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
+ completions/bash/apt | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
 
 diff --git a/completions/bash/apt b/completions/bash/apt
-index 59a8eaa94..8638d0e3c 100644
+index e2379db78..10ec6a3e2 100644
 --- a/completions/bash/apt
 +++ b/completions/bash/apt
-@@ -176,14 +176,8 @@ _apt()
+@@ -200,15 +200,8 @@ _apt()
      if [[ -v command ]]; then
          case $command in
-             remove|purge|autoremove|autopurge)
+             remove|purge|autoremove|autopurge|why)
+-                _apt_patterns && return 0
 -                if [[ -f /etc/debian_version ]]; then
 -                    # Debian system
 -                    COMPREPLY=( $( \
@@ -29,7 +37,7 @@ index 59a8eaa94..8638d0e3c 100644
 +                    _xfunc dpkg _comp_dpkg_installed_packages $cur ) )
                  return 0
                  ;;
-             show|list|download|changelog|depends|rdepends)
+             show|list|download|changelog|depends|rdepends|why-not)
 -- 
-2.46.2
+2.52.0
 

app-admin/apt/spec

@@ -1,5 +1,4 @@
-VER=3.0.3
-REL=2
+VER=3.2.0
 SRCS="git::commit=tags/$VER::https://salsa.debian.org/apt-team/apt.git"
 CHKSUMS="SKIP"
 CHKUPDATE="anitya::id=7208"