Bug#1058848: comedilib: use udev.pc to place udev rules

[Michael Biebl]

Hi


On Mon, 21 Oct 2024 14:35:28 +0200 Michael Biebl <bi...@debian.org> wrote:

Hi Gudjon,

in case you need a sponsor for comedilib, please let me know.
I'm happy to help with sorting out the outstanding RC issues.

I've uploaded the attached debdiff to DELAYED/3

Please include those changes in your next upload.

They supersede/replace the changes from

https://salsa.debian.org/electronics-team/comedilib/-/commit/ae61c14b8cc2e880dea57542007f9d489c8b9052

Regards
Michael

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-11-10 20:03:22.000000000 +0100
@@ -1,3 +1,13 @@
+comedilib (0.11.0+5-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Helmut Grohne ]
+  * Move files to /usr and mitigate loss (DEP17). (Closes: #1058848)
+  * Fix installation of lintian overrides.
+
+ -- Michael Biebl <bi...@debian.org>  Sun, 10 Nov 2024 20:03:22 +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-11-10 19:59:15.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-11-10 
19:59:15.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-11-10 
19:59:15.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-11-10 
19:59:15.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-11-10 
19:59:15.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-11-10 19:59:15.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

OpenPGP_signature.asc
Description: OpenPGP digital signature