--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: libopenni2-0: move udev rules to /usr
- From: Helmut Grohne <helmut@subdivi.de>
- Date: Mon, 23 Oct 2023 16:04:50 +0200
- Message-id: <20231023140450.GA2397549@subdivi.de>
Package: libopenni2-0
Version: 2.2.0.33+dfsg-15
Tags: patch moreinfo
User: helmutg@debian.org
Usertags: dep17p7
Hi Jochen,
I set out to add dh-sequence-movetousr to openni2 and I ended up not
doing it. It is one file that is to be moved and that file happens to
trigger a DEP17P7 problem. For this reason, I added a DEP17M10
mitigation via protective diversions. I note that this is quite
repetitive in maintainer scripts and wonder whether there should be some
automation. On the flip side I expect a low two-digit number of cases
where this is needed. It also needs a lintian override.
When combining this unconditional mitigation with dh_movetousr, there is
a risk of keeping the mitigation when performing the backport reverting
the move. When doing that, the file will end up missing after an upgrade
(because the unpack would be diverted and then removed). So the
automatic reversion of dh_movetousr is actually harmful here. Moreover
if we'd then do another version of openni2 and backport that (again
reverting the move), the upgrade from that backport to trixie would also
be broken, because the version check in preinst no longer matches. So
instead, I am unconditionally moving the file here even in
bookworm-backports. As far as I understand it, udev processes both
locations, so this is fine and if it does not, bookworm is eventually
merged anyway. I also explicitly made it work such that if
dh_installudev moves, it'll not FTBFS.
So I think this is how it works best, but maybe this is not the final
solution and hence I'm tagging it moreinfo. What do you think?
Helmut
diff -Nru openni2-2.2.0.33+dfsg/debian/changelog openni2-2.2.0.33+dfsg/debian/changelog
--- openni2-2.2.0.33+dfsg/debian/changelog 2021-02-05 20:15:35.000000000 +0100
+++ openni2-2.2.0.33+dfsg/debian/changelog 2023-10-23 14:41:21.000000000 +0200
@@ -1,3 +1,9 @@
+openni2 (2.2.0.33+dfsg-16) UNRELEASED; urgency=medium
+
+ * Move files to /usr. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de> Mon, 23 Oct 2023 14:41:21 +0200
+
openni2 (2.2.0.33+dfsg-15) unstable; urgency=medium
* Add patch for Java 17 (Closes: #982019)
diff -Nru openni2-2.2.0.33+dfsg/debian/control openni2-2.2.0.33+dfsg/debian/control
--- openni2-2.2.0.33+dfsg/debian/control 2020-12-03 19:21:15.000000000 +0100
+++ openni2-2.2.0.33+dfsg/debian/control 2023-10-23 14:41:21.000000000 +0200
@@ -7,7 +7,7 @@
Build-Depends: debhelper-compat (= 13),
freeglut3-dev,
libusb-1.0-0-dev,
- python3,
+ python3:any,
doxygen,
graphviz,
libjpeg-dev,
diff -Nru openni2-2.2.0.33+dfsg/debian/libopenni2-0.lintian-overrides openni2-2.2.0.33+dfsg/debian/libopenni2-0.lintian-overrides
--- openni2-2.2.0.33+dfsg/debian/libopenni2-0.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ openni2-2.2.0.33+dfsg/debian/libopenni2-0.lintian-overrides 2023-10-23 14:41:21.000000000 +0200
@@ -0,0 +1,2 @@
+# DEP17P7 mitigation
+diversion-for-unknown-file lib/udev/rules.d/60-libopenni2-0.rules [*]
diff -Nru openni2-2.2.0.33+dfsg/debian/libopenni2-0.postinst openni2-2.2.0.33+dfsg/debian/libopenni2-0.postinst
--- openni2-2.2.0.33+dfsg/debian/libopenni2-0.postinst 1970-01-01 01:00:00.000000000 +0100
+++ openni2-2.2.0.33+dfsg/debian/libopenni2-0.postinst 2023-10-23 14:39:34.000000000 +0200
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if test "$1" = configure && test -n "$(dpkg-divert --list /lib/udev/rules.d/60-libopenni2-0.rules)"; then
+ rm -f /lib/udev/rules.d/60-libopenni2-0.rules.usr-is-merged
+ dpkg-divert --no-rename --package usr-is-merged --remove /lib/udev/rules.d/60-libopenni2-0.rules
+fi
+
+#DEBHELPER#
diff -Nru openni2-2.2.0.33+dfsg/debian/libopenni2-0.postrm openni2-2.2.0.33+dfsg/debian/libopenni2-0.postrm
--- openni2-2.2.0.33+dfsg/debian/libopenni2-0.postrm 1970-01-01 01:00:00.000000000 +0100
+++ openni2-2.2.0.33+dfsg/debian/libopenni2-0.postrm 2023-10-23 14:41:21.000000000 +0200
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+if test "$1" = abort-upgrade -o "$1" = upgrade-failed -o "$1" = remove && test -n "$(dpkg-divert --list /lib/udev/rules.d/60-libopenni2-0.rules)"; then
+ rm -f /lib/udev/rules.d/60-libopenni2-0.rules.usr-is-merged
+ dpkg-divert --no-rename --package usr-is-merged --remove /lib/udev/rules.d/60-libopenni2-0.rules
+fi
+
+#DEBHELPER#
diff -Nru openni2-2.2.0.33+dfsg/debian/libopenni2-0.preinst openni2-2.2.0.33+dfsg/debian/libopenni2-0.preinst
--- openni2-2.2.0.33+dfsg/debian/libopenni2-0.preinst 1970-01-01 01:00:00.000000000 +0100
+++ openni2-2.2.0.33+dfsg/debian/libopenni2-0.preinst 2023-10-23 14:41:21.000000000 +0200
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if test "$1" = upgrade && dpkg --compare-versions "$2" lt 2.2.0.33+dfsg-16; then
+ dpkg-divert --no-rename --package usr-is-merged --divert /lib/udev/rules.d/60-libopenni2-0.rules.usr-is-merged --add /lib/udev/rules.d/60-libopenni2-0.rules
+fi
+
+#DEBHELPER#
diff -Nru openni2-2.2.0.33+dfsg/debian/rules openni2-2.2.0.33+dfsg/debian/rules
--- openni2-2.2.0.33+dfsg/debian/rules 2020-12-03 19:11:13.000000000 +0100
+++ openni2-2.2.0.33+dfsg/debian/rules 2023-10-23 14:41:21.000000000 +0200
@@ -8,5 +8,8 @@
cd Source/Documentation && python3 ./Runme.py
cd Bin/*-Release/ && mv NiViewer NiViewer2
+execute_after_dh_installudev:
+ set -e; if test -d debian/libopenni2-0/lib/udev/rules.d; then mv debian/libopenni2-0/lib/udev debian/libopenni2-0/usr/lib; fi
+
override_dh_shlibdeps:
dh_shlibdeps -- --ignore-missing-info
--- End Message ---
--- Begin Message ---
Source: openni2
Source-Version: 2.2.0.33+dfsg-16
Done: Jochen Sprickerhof <jspricke@debian.org>
We believe that the bug you reported is fixed in the latest version of
openni2, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 1054411@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Jochen Sprickerhof <jspricke@debian.org> (supplier of updated openni2 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sun, 26 Nov 2023 09:01:52 +0100
Source: openni2
Architecture: source
Version: 2.2.0.33+dfsg-16
Distribution: experimental
Urgency: medium
Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Changed-By: Jochen Sprickerhof <jspricke@debian.org>
Closes: 1054411
Changes:
openni2 (2.2.0.33+dfsg-16) experimental; urgency=medium
.
[ Jochen Sprickerhof ]
* Drop gitlab-ci
* Switch watch to /tags
* Bump policy version (no changes)
* Switch to non transitional libglut-dev
.
[ Helmut Grohne ]
* Move files to /usr. (Closes: #1054411)
Checksums-Sha1:
6aa40586ddd4f4ff0c9d9e9a90b6b78e3af86c7b 2302 openni2_2.2.0.33+dfsg-16.dsc
6d9d788d79844a9d9bac2db962eff9ec8489e317 18512 openni2_2.2.0.33+dfsg-16.debian.tar.xz
a4a10fc6952b639e90312574e86046d6c232d15e 8787 openni2_2.2.0.33+dfsg-16_source.buildinfo
Checksums-Sha256:
0df112614467b88ef8b63d210cba3f15f8f1574bbbfcf7c96e2e40275cfcc3e0 2302 openni2_2.2.0.33+dfsg-16.dsc
23076545e9c94665e7137d256d4770c42d4b285cb25c68a50b865ce4c72df041 18512 openni2_2.2.0.33+dfsg-16.debian.tar.xz
b15a003245e3502575453ee0154f724810b2a87a31f4ee157ea5a371611ac0a3 8787 openni2_2.2.0.33+dfsg-16_source.buildinfo
Files:
ccc02e3495693ed94a3fa0e83321b7e9 2302 libs optional openni2_2.2.0.33+dfsg-16.dsc
73f83a14f45ac26c9268425cf62b4fc7 18512 libs optional openni2_2.2.0.33+dfsg-16.debian.tar.xz
901e5417a733407de7cc689792b850e6 8787 libs optional openni2_2.2.0.33+dfsg-16_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEc7KZy9TurdzAF+h6W//cwljmlDMFAmVi+6cACgkQW//cwljm
lDMxzg/9FD+Sb7k9AIEe/57daL5X0vYsa+stb8bTVQe2HehisMD3TJg2uJ6wAX9x
A7DMCe/dbx6+I7/I8qh6t12RKYjPfV0Rro5OfzE753aeBnxp5kAIl8fVj2Q7xdUk
bzl2IhW7+iVJfDWnzIkfwpiwxCUGuWgAwJIc9WvT+oDdNowbbFq0sosK14LhQtNk
a6bvNZ33IIC9NT96F4HBxDRcYoBDMx+o/GEzElEQshE8G/FvE88mkon7Idg8BRG6
R08foPcLGtC554aRP4kTuOKlWh/6Vks9AziFWpXvosfwOPawZKBYRn86jjKkosp7
Qo2s1Jg3akTSjjZSv/6VnszGr6YVc0FC+kBg5fdCwbHzcwpyWj13BmXavZbr2aTk
NVEhLphZEcyPjK++5YQcn5bOsWMP6SUzoEYWSFxugkFGD3wKfFCKhFErN1Za4qzG
ZvkdyRdYcuedD7OXNqz67E704xxImLWRnjy05gCoh91RdevDPq4JGNqcLV1ZV567
7sra4YT+CgA3lenr7s68vTrfZ5rLtbVAvg1KELFzXuDqRkC70tEWSwj9uxt6JHaG
l6oX4LRwP+rmIaFeHdJIkSj2PI3MyYWhR+FPexwAr8Ae/xoihsDO1lg1hrZhXpbI
8ngOAOLaOuxM8736uTRay+71K0KqlGhFgmx9j8VC+B80CZ3J0BU=
=83MN
-----END PGP SIGNATURE-----
--- End Message ---