reassign 1058848 libcomedi0t64
found 1058848 comedilib/0.11.0+5-1.1
user helm...@debian.org
usertags dep17p1
affects 1058848 + libcomedi0t64
severity 1058848 important
thanks
On Sun, Dec 17, 2023 at 01:07:40AM +0100, Chris Hofstaedtler wrote:
> your package installs files related to udev, into /lib. These
> files need to be moved to /usr/lib as part of Debian's usr-merge
> effort [1].
This still holds.
> Attached you will find a patch using udev.pc to place the udev files
> (using pkg-config). This works today in unstable and also for
> bookworm, and is safe to do now.
> Once udev.pc in unstable points to /usr/lib, your package will
> benefit automatically after a binNMU or any other upload.
The original patch is no longer applicable, because:
> If during the trixie cycle your package will undergo structural
> changes or any other file moves, please see the wiki and upload
> to experimental first when these changes are done.
time64 caused those structural changes mentioned above. Uploading the
original patch would now cause comedilib to become rc-buggy.
I'm attaching an updated patch that addresses the structural changes
introduced in time64. I've tested it with piuparts and manually:
mmdebstrap trixie /dev/null --include libcomedi-dev --customize-hook='echo "deb
http://deb.debian.org/debian sid main" > "$1/etc/apt/sources.list.d/sid.list"'
--chrooted-customize-hook="apt-get update" --customize-hook="upload
libcomedi0t64_0.11.0+5-1.2_amd64.deb /l.deb" --customize-hook="upload
libcomedi-dev_0.11.0+5-1.2_amd64.deb /d.deb" --chrooted-customize-hook="dpkg
--auto-deconfigure --unpack /l.deb /d.deb; dpkg -r libcomedi0; apt-get -y
install /l.deb /d.deb" --chrooted-customize-hook="dpkg --verify"
I also note that the earlier time64 upload failed to enabled
installation of lintian overrides. This is also rectified here.
Helmut
diff -Nru comedilib-0.11.0+5/debian/changelog
comedilib-0.11.0+5/debian/changelog
--- comedilib-0.11.0+5/debian/changelog 2024-02-28 18:26:26.000000000 +0100
+++ comedilib-0.11.0+5/debian/changelog 2024-03-26 10:02:30.000000000 +0100
@@ -1,3 +1,10 @@
+comedilib (0.11.0+5-1.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Move files to /usr and mitigate loss (DEP17). (Closes: #1058848)
+
+ -- Helmut Grohne <hel...@subdivi.de> Tue, 26 Mar 2024 10:02:30 +0100
+
comedilib (0.11.0+5-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru comedilib-0.11.0+5/debian/control comedilib-0.11.0+5/debian/control
--- comedilib-0.11.0+5/debian/control 2024-02-28 18:26:26.000000000 +0100
+++ comedilib-0.11.0+5/debian/control 2024-03-26 10:02:30.000000000 +0100
@@ -40,7 +40,7 @@
Package: libcomedi0t64
Provides: ${t64:Provides}
Replaces: libcomedi0
-Breaks: libcomedi0 (<< ${source:Version})
+Conflicts: libcomedi0 (<< ${source:Version})
Section: libs
Architecture: any
Depends: ${misc:Depends},
diff -Nru comedilib-0.11.0+5/debian/libcomedi0t64.install
comedilib-0.11.0+5/debian/libcomedi0t64.install
--- comedilib-0.11.0+5/debian/libcomedi0t64.install 2020-07-25
10:48:45.000000000 +0200
+++ comedilib-0.11.0+5/debian/libcomedi0t64.install 2024-03-26
10:02:27.000000000 +0100
@@ -10,5 +10,5 @@
usr/share/man/man8/*
usr/share/doc/comedilib/*.conf usr/share/doc/libcomedi0/
etc/pcmcia/*
-lib/udev/*
+usr/lib/udev/*
diff -Nru comedilib-0.11.0+5/debian/libcomedi0t64.lintian-overrides
comedilib-0.11.0+5/debian/libcomedi0t64.lintian-overrides
--- comedilib-0.11.0+5/debian/libcomedi0t64.lintian-overrides 2024-02-28
18:20:47.000000000 +0100
+++ comedilib-0.11.0+5/debian/libcomedi0t64.lintian-overrides 2024-03-26
10:02:30.000000000 +0100
@@ -1 +1,5 @@
libcomedi0t64: package-name-doesnt-match-sonames libcomedi0
+# begin-remove-after: released:trixie
+# DEP17P7 mitigation
+diversion-for-unknown-file lib/udev/rules.d/90-comedi.rules [*]
+# end-remove-after
diff -Nru comedilib-0.11.0+5/debian/libcomedi0t64.postinst
comedilib-0.11.0+5/debian/libcomedi0t64.postinst
--- comedilib-0.11.0+5/debian/libcomedi0t64.postinst 2020-07-25
10:48:45.000000000 +0200
+++ comedilib-0.11.0+5/debian/libcomedi0t64.postinst 2024-03-26
10:02:30.000000000 +0100
@@ -4,6 +4,13 @@
test $DEBIAN_SCRIPT_DEBUG && set -v -x
+# begin-remove-after: released:trixie
+if test "$1" = configure; then
+ dpkg-divert --no-rename --package libcomedi0t64 --divert
/lib/udev/rules.d/90-comedi.rules.usr-is-merged --remove
/lib/udev/rules.d/90-comedi.rules
+fi
+# end-remove-after
+
+
case "$1" in
configure|upgrade)
diff -Nru comedilib-0.11.0+5/debian/libcomedi0t64.preinst
comedilib-0.11.0+5/debian/libcomedi0t64.preinst
--- comedilib-0.11.0+5/debian/libcomedi0t64.preinst 1970-01-01
01:00:00.000000000 +0100
+++ comedilib-0.11.0+5/debian/libcomedi0t64.preinst 2024-03-26
10:02:30.000000000 +0100
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+# begin-remove-after: released:trixie
+if test "$1" = upgrade || test "$1" = install; then
+ dpkg-divert --no-rename --package libcomedi0t64 --divert
/lib/udev/rules.d/90-comedi.rules.usr-is-merged --add
/lib/udev/rules.d/90-comedi.rules
+fi
+# end-remove-after
+
+#DEBHELPER#
diff -Nru comedilib-0.11.0+5/debian/rules comedilib-0.11.0+5/debian/rules
--- comedilib-0.11.0+5/debian/rules 2020-07-25 10:48:45.000000000 +0200
+++ comedilib-0.11.0+5/debian/rules 2024-03-26 10:02:30.000000000 +0100
@@ -168,8 +168,8 @@
# do mv $$f $${f%.so}.$$ABITAG.so;
done;)
mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
mv $(CURDIR)/debian/tmp/usr/lib/pkgconfig
$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
- mkdir -p debian/tmp/lib/udev/rules.d
- cp debian/90-comedi.rules debian/tmp/lib/udev/rules.d/
+ mkdir -p debian/tmp/usr/lib/udev/rules.d
+ cp debian/90-comedi.rules debian/tmp/usr/lib/udev/rules.d/
chmod 644 debian/tmp/usr/lib/python*/dist-packages/comedi/comedi.py
mkdir -p debian/tmp/usr/share/doc/libcomedi-dev/demo
cp -a demo debian/libcomedi-dev/usr/share/doc/libcomedi-dev
@@ -197,6 +197,7 @@
dh_installcron
dh_installinfo
dh_installchangelogs ChangeLog
+ dh_lintian
dh_link
dh_strip --no-automatic-dbgsym
dh_compress --exclude=.c
