[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1036762: marked as done (unblock: apt/2.6.1)

Your message dated Thu, 25 May 2023 18:18:16 +0200
with message-id <d8525a37-8b51-39c0-2e08-11c3bb577999@debian.org>
and subject line Re: Bug#1036762: unblock: apt/2.6.1
has caused the Debian Bug report #1036762,
regarding unblock: apt/2.6.1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1036762: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1036762
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: apt@packages.debian.org, juliank@ubuntu.com
Control: affects -1 + src:apt

Please unblock package apt

As requested adding back adduser dep.

+ Changed the .gitlab-ci and debian/gbp.conf to point at
  bookworm and 2.6.y branch for future stable updates.

+ Usual autogenerated version number bumps in files

Full diff attached.

unblock apt/2.6.1

-- 
debian developer - deb.li/jak | jak-linux.org - free software dev
ubuntu core developer                              i speak de, en

diff -Nru apt-2.6.0/CMakeLists.txt apt-2.6.1/CMakeLists.txt
--- apt-2.6.0/CMakeLists.txt	2023-03-06 13:26:39.000000000 +0100
+++ apt-2.6.1/CMakeLists.txt	2023-05-25 16:11:37.000000000 +0200
@@ -205,7 +205,7 @@
 # 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.6.0")
+set(PACKAGE_VERSION "2.6.1")
 string(REGEX MATCH "^[0-9.]+" PROJECT_VERSION ${PACKAGE_VERSION})
 
 if (NOT DEFINED DPKG_DATADIR)
diff -Nru apt-2.6.0/debian/changelog apt-2.6.1/debian/changelog
--- apt-2.6.0/debian/changelog	2023-03-06 13:26:39.000000000 +0100
+++ apt-2.6.1/debian/changelog	2023-05-25 16:11:37.000000000 +0200
@@ -1,3 +1,14 @@
+apt (2.6.1) unstable; urgency=medium
+
+  * Restore adduser dependency for bookworm.
+    This caused some regressions to late in the bookworm cycle. To keep
+    upgrade paths (which will have adduser installed) the same, we drop
+    the base-password alternative rather than requiring both dependencies,
+    as that could change resolving or ordering bugs. (Closes: #1035654)
+  * Point gitlab-ci and gbp to bookworm/2.6.y
+
+ -- Julian Andres Klode <jak@debian.org>  Thu, 25 May 2023 16:11:37 +0200
+
 apt (2.6.0) unstable; urgency=medium
 
   * The "unhappy bookworm" release. Too many changes needed to clarify
diff -Nru apt-2.6.0/debian/control apt-2.6.1/debian/control
--- apt-2.6.0/debian/control	2023-03-06 13:26:39.000000000 +0100
+++ apt-2.6.1/debian/control	2023-05-25 16:11:37.000000000 +0200
@@ -37,7 +37,7 @@
 
 Package: apt
 Architecture: any
-Depends: base-passwd (>= 3.6.1) | adduser,
+Depends: adduser,
          gpgv | gpgv2 | gpgv1,
          libapt-pkg6.0 (>= ${binary:Version}),
          ${apt:keyring},
diff -Nru apt-2.6.0/debian/gbp.conf apt-2.6.1/debian/gbp.conf
--- apt-2.6.0/debian/gbp.conf	2023-03-06 13:26:39.000000000 +0100
+++ apt-2.6.1/debian/gbp.conf	2023-05-25 16:11:37.000000000 +0200
@@ -3,7 +3,7 @@
 ;preexport = ./prepare-release pre-export
 prebuild = ./prepare-release pre-build
 postbuild = ./prepare-release post-build
-debian-branch = main
+debian-branch = 2.6.y
 debian-tag = %(version)s
 export-dir = ../build-area
 sign-tags = True
diff -Nru apt-2.6.0/doc/apt-verbatim.ent apt-2.6.1/doc/apt-verbatim.ent
--- apt-2.6.0/doc/apt-verbatim.ent	2023-03-06 13:26:39.000000000 +0100
+++ apt-2.6.1/doc/apt-verbatim.ent	2023-05-25 16:11:37.000000000 +0200
@@ -274,7 +274,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "2.6.0">
+<!ENTITY apt-product-version "2.6.1">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "bullseye">
diff -Nru apt-2.6.0/doc/po/apt-doc.pot apt-2.6.1/doc/po/apt-doc.pot
--- apt-2.6.0/doc/po/apt-doc.pot	2023-03-06 13:26:39.000000000 +0100
+++ apt-2.6.1/doc/po/apt-doc.pot	2023-05-25 16:11:37.000000000 +0200
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 2.6.0\n"
+"Project-Id-Version: apt-doc 2.6.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2023-03-06 12:29+0000\n"
+"POT-Creation-Date: 2023-05-25 14:17+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 -Nru apt-2.6.0/.gitlab-ci.yml apt-2.6.1/.gitlab-ci.yml
--- apt-2.6.0/.gitlab-ci.yml	2023-03-06 13:26:39.000000000 +0100
+++ apt-2.6.1/.gitlab-ci.yml	2023-05-25 16:11:37.000000000 +0200
@@ -1,4 +1,4 @@
-image: debian:unstable
+image: debian:bookworm
 variables:
   DEBIAN_FRONTEND: noninteractive
   CCACHE_DIR: $CI_PROJECT_DIR/.ccache
@@ -30,7 +30,7 @@
     - unbuffer ./test/integration/run-tests -q -j 4
 
 test as user:
-  image: i386/debian:unstable
+  image: i386/debian:bookworm
   stage: test
   script:
     - apt-get install --no-install-recommends -qq libxml2-utils
diff -Nru apt-2.6.0/po/apt-all.pot apt-2.6.1/po/apt-all.pot
--- apt-2.6.0/po/apt-all.pot	2023-03-06 13:26:39.000000000 +0100
+++ apt-2.6.1/po/apt-all.pot	2023-05-25 16:11:37.000000000 +0200
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 2.6.0\n"
+"Project-Id-Version: apt 2.6.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2023-03-06 12:29+0000\n"
+"POT-Creation-Date: 2023-05-25 14:17+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"

--- End Message ---
--- Begin Message --- 
Hi,

On 25-05-2023 16:45, Julian Andres Klode wrote:

unblock apt/2.6.1


unblocked (and aged)

Paul

Attachment: OpenPGP_signature
Description: OpenPGP digital signature


--- End Message ---
Reply to: