Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian....@packages.debian.org
Usertags: pu

Dear Release Team,

We would like to remove the legacy usr-is-merged/usrmerge packages from
testing/unstable, but debootstrap in bookworm still pulls usr-is-merged
in manually and fails if it cannot be found. As you know, it is no
longer necessary in testing/unstable as the work is done in base-files.

I have uploaded debootstrap/1.0.128+nmu2+deb12u2 to bookworm-p-u with
this change backported from unstable. debdiff attached.

Thanks!
diff -Nru debootstrap-1.0.128+nmu2+deb12u1/debian/changelog debootstrap-1.0.128+nmu2+deb12u2/debian/changelog
--- debootstrap-1.0.128+nmu2+deb12u1/debian/changelog	2023-08-30 15:21:17.000000000 +0100
+++ debootstrap-1.0.128+nmu2+deb12u2/debian/changelog	2024-12-29 19:02:52.000000000 +0000
@@ -1,3 +1,9 @@
+debootstrap (1.0.128+nmu2+deb12u2) bookworm; urgency=medium
+
+  * Do not pull in usr-is-merged in trixie/sid (Closes: #1091649)
+
+ -- Luca Boccassi <bl...@debian.org>  Sun, 29 Dec 2024 19:02:52 +0000
+
 debootstrap (1.0.128+nmu2+deb12u1) bookworm; urgency=medium
 
   * Non-maintainer upload targeting Debian 12.2, with maintainer approval
diff -Nru debootstrap-1.0.128+nmu2+deb12u1/debian/.gitignore debootstrap-1.0.128+nmu2+deb12u2/debian/.gitignore
--- debootstrap-1.0.128+nmu2+deb12u1/debian/.gitignore	2023-08-30 15:21:17.000000000 +0100
+++ debootstrap-1.0.128+nmu2+deb12u2/debian/.gitignore	1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-debootstrap
-debootstrap-udeb
-files
-*.debhelper.log
-*.substvars
-
diff -Nru debootstrap-1.0.128+nmu2+deb12u1/scripts/debian-common debootstrap-1.0.128+nmu2+deb12u2/scripts/debian-common
--- debootstrap-1.0.128+nmu2+deb12u1/scripts/debian-common	2023-08-30 15:21:17.000000000 +0100
+++ debootstrap-1.0.128+nmu2+deb12u2/scripts/debian-common	2024-12-29 18:30:53.000000000 +0000
@@ -41,19 +41,24 @@
 		;;
 	esac
 
-	# On suites >= bookworm, either we set up a merged-/usr system
+	# On suites == bookworm, either we set up a merged-/usr system
 	# via merge_usr, or we deliberately avoid that migration by creating
 	# the flag file. This means there's no need for the live migration
 	# 'usrmerge' package and its extra dependencies:
 	# we can install the empty 'usr-is-merged' metapackage to indicate
 	# that the transition has been done.
+	# On suites > bookworm there are no longer usr-is-merged or usrmerge
+	# packages, so ensure the dependency is pruned if present.
 	case "$CODENAME" in
 		etch*|lenny|squeeze|wheezy|jessie*|stretch|buster|bullseye)
 			;;
-		*)
+		bookworm)
 			required="$required usr-is-merged"
 			EXCLUDE_DEPENDENCY="$EXCLUDE_DEPENDENCY usrmerge"
 			;;
+		*)
+			EXCLUDE_DEPENDENCY="$EXCLUDE_DEPENDENCY usrmerge"
+			;;
 	esac
 }
 

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to