Bug#1056724: hplip: diff for NMU version 3.22.10+dfsg0-3.1
Control: tags 1056724 + pending
Dear maintainer,
I've prepared an NMU for hplip (versioned as 3.22.10+dfsg0-3.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Your package is on the critical path for the udev usrmerge changes.
Given this in combination with the diversion mitigation, I will in a
moment upload to experimental (without delay, slightly lower version
number).
Thanks,
Chris
diff -Nru hplip-3.22.10+dfsg0/debian/changelog hplip-3.22.10+dfsg0/debian/changelog
--- hplip-3.22.10+dfsg0/debian/changelog 2023-09-14 22:39:02.000000000 +0200
+++ hplip-3.22.10+dfsg0/debian/changelog 2023-12-03 15:25:26.000000000 +0100
@@ -1,3 +1,12 @@
+hplip (3.22.10+dfsg0-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * libsane-hpaio: move 56-hpmud.rules to /usr.
+ Includes protective diversion against m-a: same file loss on upgrades.
+ Diversion can be removed in forky+1. (Closes: #1056724)
+
+ -- Chris Hofstaedtler <zeha@debian.org> Sun, 03 Dec 2023 15:25:26 +0100
+
hplip (3.22.10+dfsg0-3) unstable; urgency=medium
* debian/control: replace policykit-1 by pkexec, polkitd
diff -Nru hplip-3.22.10+dfsg0/debian/libsane-hpaio.install hplip-3.22.10+dfsg0/debian/libsane-hpaio.install
--- hplip-3.22.10+dfsg0/debian/libsane-hpaio.install 2023-09-14 22:39:02.000000000 +0200
+++ hplip-3.22.10+dfsg0/debian/libsane-hpaio.install 2023-12-03 15:25:26.000000000 +0100
@@ -1,5 +1,5 @@
etc/hp
etc/sane.d/dll.d
-etc/udev/rules.d/56-hpmud.rules lib/udev/rules.d
+etc/udev/rules.d/56-hpmud.rules usr/lib/udev/rules.d
usr/lib/*-*/sane/libsane*.so.*
usr/share/hplip/data/models/models.dat
diff -Nru hplip-3.22.10+dfsg0/debian/libsane-hpaio.lintian-overrides hplip-3.22.10+dfsg0/debian/libsane-hpaio.lintian-overrides
--- hplip-3.22.10+dfsg0/debian/libsane-hpaio.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ hplip-3.22.10+dfsg0/debian/libsane-hpaio.lintian-overrides 2023-12-03 15:25:26.000000000 +0100
@@ -0,0 +1,4 @@
+# begin-remove-after: released:forky
+# protective diversion for upgrades of files moved from / to /usr
+libsane-hpaio: diversion-for-unknown-file lib/udev/rules.d/56-hpmud.rules [preinst:*]
+# end-remove-after
diff -Nru hplip-3.22.10+dfsg0/debian/libsane-hpaio.postinst hplip-3.22.10+dfsg0/debian/libsane-hpaio.postinst
--- hplip-3.22.10+dfsg0/debian/libsane-hpaio.postinst 1970-01-01 01:00:00.000000000 +0100
+++ hplip-3.22.10+dfsg0/debian/libsane-hpaio.postinst 2023-12-03 15:25:26.000000000 +0100
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+# begin-remove-after: released:forky
+# protective diversion of files moved from / to /usr, to avoid file loss.
+# Only for upgrades.
+if [ "$1" = "configure" ]; then
+ # At this point, the package will have installed the same file in */usr*.
+ dpkg-divert --package usr-is-merged --no-rename \
+ --divert /lib/udev/rules.d/56-hpmud.rules.usr-is-merged \
+ --remove /lib/udev/rules.d/56-hpmud.rules
+fi
+# end-remove-after
+
+#DEBHELPER#
+
diff -Nru hplip-3.22.10+dfsg0/debian/libsane-hpaio.postrm hplip-3.22.10+dfsg0/debian/libsane-hpaio.postrm
--- hplip-3.22.10+dfsg0/debian/libsane-hpaio.postrm 1970-01-01 01:00:00.000000000 +0100
+++ hplip-3.22.10+dfsg0/debian/libsane-hpaio.postrm 2023-12-03 15:25:26.000000000 +0100
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+# begin-remove-after: released:forky
+# protective diversion of files moved from / to /usr, to avoid file loss.
+# Only for upgrades.
+if [ "$1" = "remove" ] && [ "$DPKG_MAINTSCRIPT_PACKAGE_REFCOUNT" = "1" ]; then
+ # Cleanup in case package is removed before upgrade is finished (postinst ran).
+ dpkg-divert --package usr-is-merged --no-rename \
+ --divert /lib/udev/rules.d/56-hpmud.rules.usr-is-merged \
+ --remove /lib/udev/rules.d/56-hpmud.rules
+fi
+# end-remove-after
+
+#DEBHELPER#
+
diff -Nru hplip-3.22.10+dfsg0/debian/libsane-hpaio.preinst hplip-3.22.10+dfsg0/debian/libsane-hpaio.preinst
--- hplip-3.22.10+dfsg0/debian/libsane-hpaio.preinst 1970-01-01 01:00:00.000000000 +0100
+++ hplip-3.22.10+dfsg0/debian/libsane-hpaio.preinst 2023-12-03 15:25:26.000000000 +0100
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+# begin-remove-after: released:forky
+# protective diversion of files moved from / to /usr, to avoid file loss.
+# Only for upgrades.
+if [ "$1" = "upgrade" ]; then
+ dpkg-divert --package usr-is-merged --no-rename \
+ --divert /lib/udev/rules.d/56-hpmud.rules.usr-is-merged \
+ --add /lib/udev/rules.d/56-hpmud.rules
+fi
+# end-remove-after
+
+#DEBHELPER#
+
Reply to: