Control: tags -1 + patch Hi,
please find a patch to move the files - including a protective diversion - attached. Please upload at your earliest convenience. In a short time all these bugs will probably become release-criticial. Many thanks, Chris
diff -Nru libosmosdr-0.1.8.effcaa7/debian/changelog libosmosdr-0.1.8.effcaa7/debian/changelog --- libosmosdr-0.1.8.effcaa7/debian/changelog 2016-04-29 05:26:45.000000000 +0200 +++ libosmosdr-0.1.8.effcaa7/debian/changelog 2023-11-25 15:01:25.000000000 +0100 @@ -1,3 +1,12 @@ +libosmosdr (0.1.8.effcaa7-7.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Remove long obsolete postinst tasks: udev reload, ldconfig. + * Move udev files from /lib to /usr/lib, including protective diversion + against Multi-Arch: same file loss scenario (DEP17 P7 M10). (Closes: #-1) + + -- Chris Hofstaedtler <[email protected]> Sat, 25 Nov 2023 15:01:25 +0100 + libosmosdr (0.1.8.effcaa7-7) unstable; urgency=medium * build on kfreebsd-any diff -Nru libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.dirs libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.dirs --- libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.dirs 2013-07-15 15:51:09.000000000 +0200 +++ libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib diff -Nru libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.lintian-overrides libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.lintian-overrides --- libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 +++ libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.lintian-overrides 2023-11-25 15:01:25.000000000 +0100 @@ -0,0 +1,4 @@ +# begin-remove-after: released:forky +# protective diversion for upgrades of files moved from / to /usr +libosmosdr0: diversion-for-unknown-file lib/udev/rules.d/60-libosmosdr0.rules [preinst:*] +# end-remove-after diff -Nru libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.postinst libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.postinst --- libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.postinst 2012-05-15 02:53:22.000000000 +0200 +++ libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.postinst 2023-11-25 15:01:25.000000000 +0100 @@ -1,29 +1,16 @@ #! /bin/sh - set -e -#DEBHELPER# - +# begin-remove-after: released:forky +# protective diversion of files moved from / to /usr, to avoid file loss. +# Only for upgrades. if [ "$1" = "configure" ]; then - ldconfig + # 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-libosmosdr0.rules.usr-is-merged \ + --remove /lib/udev/rules.d/60-libosmosdr0.rules fi +# end-remove-after -# same test as udev postinst... -chrooted() { - if [ "$(stat -c %d/%i /)" = "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ]; - then - # the devicenumber/inode pair of / is the same as that of /sbin/init's - # root, so we're *not* in a chroot and hence return false. - return 1 - fi - return 0 -} - -if [ "$1" = "configure" ]; then - if ! chrooted ; then - # try to update udev now - udevadm control --reload-rules || true ; - fi -fi +#DEBHELPER# -exit 0 diff -Nru libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.postrm libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.postrm --- libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.postrm 1970-01-01 01:00:00.000000000 +0100 +++ libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.postrm 2023-11-25 15:01:25.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-libosmosdr0.rules.usr-is-merged \ + --remove /lib/udev/rules.d/60-libosmosdr0.rules +fi +# end-remove-after + +#DEBHELPER# + diff -Nru libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.preinst libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.preinst --- libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.preinst 1970-01-01 01:00:00.000000000 +0100 +++ libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.preinst 2023-11-25 15:01:25.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-libosmosdr0.rules.usr-is-merged \ + --add /lib/udev/rules.d/60-libosmosdr0.rules +fi +# end-remove-after + +#DEBHELPER# + diff -Nru libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.udev libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.udev --- libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.udev 2016-04-27 03:53:29.000000000 +0200 +++ libosmosdr-0.1.8.effcaa7/debian/libosmosdr0.udev 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -osmosdr.rules diff -Nru libosmosdr-0.1.8.effcaa7/debian/rules libosmosdr-0.1.8.effcaa7/debian/rules --- libosmosdr-0.1.8.effcaa7/debian/rules 2015-09-11 04:15:33.000000000 +0200 +++ libosmosdr-0.1.8.effcaa7/debian/rules 2023-11-25 15:01:25.000000000 +0100 @@ -10,3 +10,8 @@ debian/librtlsdr0.udev: osmosdr.rules cp -p osmosdr.rules debian/libosmosdr0.udev + +override_dh_installudev: + dh_installudev + set -e; if test -d debian/libosmosdr0/lib/udev/rules.d; then mv debian/libosmosdr0/lib/udev debian/libosmosdr0/usr/lib; fi + set -e; if test -d debian/libosmosdr0/lib; then rmdir debian/libosmosdr0/lib; fi
