Created
June 10, 2024 15:38
-
-
Save julian-klode/6c3a02fee3a27b1c7a1a8a5d325676e7 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 <juliank@ubuntu.com> 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 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment