Control: tags 1056911 + pending

Dear maintainer,

I've prepared an NMU for libfreenect (versioned as 1:0.5.3-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).

Best,
Chris
diff -Nru libfreenect-0.5.3/debian/changelog libfreenect-0.5.3/debian/changelog
--- libfreenect-0.5.3/debian/changelog	2022-09-13 18:30:00.000000000 +0200
+++ libfreenect-0.5.3/debian/changelog	2023-11-26 15:57:36.000000000 +0100
@@ -1,3 +1,12 @@
+libfreenect (1:0.5.3-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Move udev files from /lib to /usr/lib, including protective diversion
+    against Multi-Arch: same file loss scenario (DEP17 P7 M10).
+    (Closes: #1056911)
+
+ -- Chris Hofstaedtler <z...@debian.org>  Sun, 26 Nov 2023 15:57:36 +0100
+
 libfreenect (1:0.5.3-3) unstable; urgency=medium
 
   * debian/control
diff -Nru libfreenect-0.5.3/debian/libfreenect0.5.lintian-overrides libfreenect-0.5.3/debian/libfreenect0.5.lintian-overrides
--- libfreenect-0.5.3/debian/libfreenect0.5.lintian-overrides	1970-01-01 01:00:00.000000000 +0100
+++ libfreenect-0.5.3/debian/libfreenect0.5.lintian-overrides	2023-11-26 15:57:36.000000000 +0100
@@ -0,0 +1,4 @@
+# begin-remove-after: released:forky
+# protective diversion for upgrades of files moved from / to /usr
+libfreenect0.5: diversion-for-unknown-file lib/udev/rules.d/60-libfreenect0.5.rules [preinst:*]
+# end-remove-after
diff -Nru libfreenect-0.5.3/debian/libfreenect0.5.postinst libfreenect-0.5.3/debian/libfreenect0.5.postinst
--- libfreenect-0.5.3/debian/libfreenect0.5.postinst	1970-01-01 01:00:00.000000000 +0100
+++ libfreenect-0.5.3/debian/libfreenect0.5.postinst	2023-11-26 15:57:36.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" = "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/60-libfreenect0.5.rules.usr-is-merged \
+        --remove /lib/udev/rules.d/60-libfreenect0.5.rules
+fi
+# end-remove-after
+
+#DEBHELPER#
diff -Nru libfreenect-0.5.3/debian/libfreenect0.5.postrm libfreenect-0.5.3/debian/libfreenect0.5.postrm
--- libfreenect-0.5.3/debian/libfreenect0.5.postrm	1970-01-01 01:00:00.000000000 +0100
+++ libfreenect-0.5.3/debian/libfreenect0.5.postrm	2023-11-26 15:57:36.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" = "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/60-libfreenect0.5.rules.usr-is-merged \
+        --remove /lib/udev/rules.d/60-libfreenect0.5.rules
+fi
+# end-remove-after
+
+#DEBHELPER#
+
diff -Nru libfreenect-0.5.3/debian/libfreenect0.5.preinst libfreenect-0.5.3/debian/libfreenect0.5.preinst
--- libfreenect-0.5.3/debian/libfreenect0.5.preinst	1970-01-01 01:00:00.000000000 +0100
+++ libfreenect-0.5.3/debian/libfreenect0.5.preinst	2023-11-26 15:57:36.000000000 +0100
@@ -0,0 +1,15 @@
+#!/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/60-libfreenect0.5.rules.usr-is-merged \
+        --add /lib/udev/rules.d/60-libfreenect0.5.rules
+fi
+# end-remove-after
+
+#DEBHELPER#
+
diff -Nru libfreenect-0.5.3/debian/rules libfreenect-0.5.3/debian/rules
--- libfreenect-0.5.3/debian/rules	2022-09-13 18:30:00.000000000 +0200
+++ libfreenect-0.5.3/debian/rules	2023-11-26 15:57:36.000000000 +0100
@@ -23,6 +23,11 @@
 override_dh_installdocs:
 	dh_installdocs --all CONTRIB
 
+override_dh_installudev:
+	dh_installudev
+	set -e; if test -d debian/libfreenect0.5/lib/udev/rules.d; then mv debian/libfreenect0.5/lib/udev debian/libfreenect0.5/usr/lib; fi
+	set -e; if test -d debian/libfreenect0.5/lib; then rmdir debian/libfreenect0.5/lib; fi
+
 override_dh_makeshlibs:
 	dh_makeshlibs -Xfakenect
 

Reply via email to