Control: tags -1 + pending
Hi Helmut! On Tue, 3 Dec 2024 14:09:04 +0100 Helmut Grohne <hel...@subdivi.de> wrote:
Package: libcomedi0t64 Version: 0.11.0+5-1.2 Severity: serious Justification: installing into aliased locations is release-critical Tags: patch User: helm...@debian.org Usertags: dep17m2 Hi, Michael uploaded my earlier patch #1058848 submission as NMU 0.11.0+5-1.2. Unfortunately, the patch given there is incomplete and it still installs an empty /lib/udev/rules.d into libcomedi0t64. I am attaching a followup patch to get rid of that directory.
Thanks for spotting this issue.I used your patch and did a bit more cleanup. The resulting debdiff is attached and I've uploaded the changes to DELAYED/7 (thus marking as pending).
Gudjon, please holler if I should delay further.If you are ok with the changes, please apply them with your next maintainer upload.
The binary debdiff looks like this:$ debdiff --nocontrol --dirs --show-moved comedilib_0.11.0+5-1.2_amd64.changes comedilib_0.11.0+5-1.3_amd64.changes
[The following lists of changes regard files as different if they have different names, permissions or owners.] Files only in first set of .debs, found in package libcomedi0t64 ---------------------------------------------------------------- -rw-r--r-- root/root /usr/share/doc/libcomedi0/das1600.conf -rw-r--r-- root/root /usr/share/doc/libcomedi0/dt282x.conf -rw-r--r-- root/root /usr/share/doc/libcomedi0/modules.conf drwxr-xr-x root/root /lib/ drwxr-xr-x root/root /lib/udev/ drwxr-xr-x root/root /lib/udev/rules.d/ drwxr-xr-x root/root /usr/share/doc/libcomedi0/ New files in second set of .debs, found in package libcomedi0t64 ---------------------------------------------------------------- -rw-r--r-- root/root /usr/share/doc/libcomedi0t64/das1600.conf -rw-r--r-- root/root /usr/share/doc/libcomedi0t64/dt282x.conf -rw-r--r-- root/root /usr/share/doc/libcomedi0t64/modules.conf 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-11-10 20:03:22.000000000 +0100
+++ comedilib-0.11.0+5/debian/changelog 2024-12-06 18:15:12.000000000 +0100
@@ -1,3 +1,18 @@
+comedilib (0.11.0+5-1.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Helmut Grohne ]
+ * Delete empty, aliased udev rules.dir (DEP17). (Closes: #1088958)
+ * Drop unused Build-Depends: fop. (Closes: #983240)
+
+ [ Michael Biebl ]
+ * Clean up unnecessary .dirs files more thoroughly while at it.
+ * Fix installation of example conf files after the libcomedi0 →
+ libcomedi0t64 rename.
+
+ -- Michael Biebl <bi...@debian.org> Fri, 06 Dec 2024 18:15:12 +0100
+
comedilib (0.11.0+5-1.2) 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-11-10 19:59:15.000000000 +0100
+++ comedilib-0.11.0+5/debian/control 2024-12-06 18:15:12.000000000 +0100
@@ -13,7 +13,6 @@
libtool,
xmlto,
imagemagick,
- fop,
libboost-program-options-dev,
libgsl-dev,
python3-all-dev,
diff -Nru comedilib-0.11.0+5/debian/libcomedi0t64.dirs
comedilib-0.11.0+5/debian/libcomedi0t64.dirs
--- comedilib-0.11.0+5/debian/libcomedi0t64.dirs 2020-07-25
10:48:45.000000000 +0200
+++ comedilib-0.11.0+5/debian/libcomedi0t64.dirs 2024-12-06
18:15:12.000000000 +0100
@@ -1,10 +1 @@
-usr/lib/
-usr/sbin/
-#usr/lib/ruby/1.8/local/lib/site_ruby/1.8/
-usr/share/man/man1/
-usr/share/man/man7/
-usr/share/man/man8/
-usr/share/doc/libcomedi0/
-etc/pcmcia/
-lib/udev/rules.d/
var/lib/comedi/calibrations
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 2024-11-10
19:59:15.000000000 +0100
+++ comedilib-0.11.0+5/debian/libcomedi0t64.install 2024-12-06
18:15:12.000000000 +0100
@@ -8,7 +8,6 @@
usr/share/man/man1/*
usr/share/man/man7/*
usr/share/man/man8/*
-usr/share/doc/comedilib/*.conf usr/share/doc/libcomedi0/
+usr/share/doc/comedilib/*.conf usr/share/doc/libcomedi0t64/
etc/pcmcia/*
usr/lib/udev/*
-
diff -Nru comedilib-0.11.0+5/debian/libcomedi-dev.dirs
comedilib-0.11.0+5/debian/libcomedi-dev.dirs
--- comedilib-0.11.0+5/debian/libcomedi-dev.dirs 2020-07-25
10:48:45.000000000 +0200
+++ comedilib-0.11.0+5/debian/libcomedi-dev.dirs 1970-01-01
01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-usr/include/
-usr/share/man/man3/
-usr/share/doc/libcomedi-dev/html/
-usr/share/doc/libcomedi-dev/demo
diff -Nru comedilib-0.11.0+5/debian/python3-comedilib.dirs
comedilib-0.11.0+5/debian/python3-comedilib.dirs
--- comedilib-0.11.0+5/debian/python3-comedilib.dirs 2020-07-25
10:48:45.000000000 +0200
+++ comedilib-0.11.0+5/debian/python3-comedilib.dirs 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/python3/dist-packages/comedi/
diff -Nru comedilib-0.11.0+5/debian/rules comedilib-0.11.0+5/debian/rules
--- comedilib-0.11.0+5/debian/rules 2024-11-10 19:59:15.000000000 +0100
+++ comedilib-0.11.0+5/debian/rules 2024-12-06 18:15:12.000000000 +0100
@@ -170,15 +170,16 @@
mv $(CURDIR)/debian/tmp/usr/lib/pkgconfig
$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
mkdir -p debian/tmp/usr/lib/udev/rules.d
cp debian/90-comedi.rules debian/tmp/usr/lib/udev/rules.d/
+ mkdir -p $(CURDIR)/debian/tmp/usr/share/man/man8
+ cp $(CURDIR)/debian/manpages/*.8 $(CURDIR)/debian/tmp/usr/share/man/man8
chmod 644 debian/tmp/usr/lib/python*/dist-packages/comedi/comedi.py
- mkdir -p debian/tmp/usr/share/doc/libcomedi-dev/demo
+ mkdir -p debian/libcomedi-dev/usr/share/doc/libcomedi-dev/demo
cp -a demo debian/libcomedi-dev/usr/share/doc/libcomedi-dev
rm -f debian/libcomedi-dev/usr/share/doc/libcomedi-dev/demo/Makefile*
cp debian/Makefile.debian_demo
debian/libcomedi-dev/usr/share/doc/libcomedi-dev/demo/Makefile
cd debian/libcomedi-dev/usr/share/doc/libcomedi-dev/demo && make clean
rm -rf debian/tmp/usr/local
find debian/ -name _comedi.*a -exec rm -f {} \;
- cp $(CURDIR)/debian/manpages/*.8 $(CURDIR)/debian/tmp/usr/share/man/man8
binary-indep: build install
OpenPGP_signature.asc
Description: OpenPGP digital signature
