base-files.patch

diff -Nru base-files-13.1ubuntu1/debian/changelog base-files-13.1ubuntu2/debian/changelog
--- base-files-13.1ubuntu1/debian/changelog	2024-05-01 00:20:45.000000000 +0200
+++ base-files-13.1ubuntu2/debian/changelog	2024-06-10 17:30:19.000000000 +0200
@@ -1,3 +1,9 @@
+base-files (13.1ubuntu2) UNRELEASED; urgency=medium
+
+  * Rename protective diversions to include a leading dot as Debian does.
+
+ -- Julian Andres Klode <[email protected]>  Mon, 10 Jun 2024 17:30:19 +0200
+
 base-files (13.1ubuntu1) oracular; urgency=medium
 
   * Merge from Debian unstable.  Remaining changes:
diff -Nru base-files-13.1ubuntu1/debian/preinst base-files-13.1ubuntu2/debian/preinst
--- base-files-13.1ubuntu1/debian/preinst	2024-05-01 00:20:45.000000000 +0200
+++ base-files-13.1ubuntu2/debian/preinst	2024-06-10 17:30:19.000000000 +0200
@@ -26,8 +26,16 @@
 		fi
 	done
 	for d in $USR_MERGE; do
+		# Remove legacy 24.04 protective diversions without leading dot
+		# FIXME: Remove this after 26.04
+		if [ "$(dpkg-divert --truename /$d)" = "/$d.usr-is-merged" ]; then
+			dpkg-divert --quiet --package base-files --remove --no-rename --divert /$d.usr-is-merged /$d
+			if [ -d /$d.usr-is-merged ]; then
+				mv --no-target-directory /$d.usr-is-merged /.$d.usr-is-merged
+			fi
+		fi
 		# Install DEP17 M4 protective diversions
-		dpkg-divert --quiet --package base-files --add --no-rename --divert /$d.usr-is-merged /$d
+		dpkg-divert --quiet --package base-files --add --no-rename --divert /.$d.usr-is-merged /$d
 	done
 fi