Greetings fellow maintainers,

I brought a few changes to vtk-dicom to address the remaining RC
bug #988643.  Changes are available on Salsa for review[1].  You
will find a debdiff against the version in bullseye attached.  I
did a few tests to make sure the issue is corrected, such as:
  - running the script Testing/TestDICOMPython.py to make sure
    I introduced no regressions in the Python module;
  - running piuparts --fail-on-broken-symlinks to make sure the
    issue was effectively fixed for vtk-dicom binary packages;
  - the usual build and (superficial) autopkgtest.

I did not leave the symlink in dist-packages/ because
libvtkDICOMPython*.so is not an importable Cython module (after
trying a import within Python), but a library used by the Cython
module vtkDICOMPython*.so (per `objdump -p` output).  However,
consecutive to changes in multi-arch hints I had to bring per
lintian regression, I attempted to install concurrently the
package libvtk-dicom-dev both in native and foreign
architecture, and it would now fail with the following:

        # apt install libvtk-dicom-dev:i386
        Reading package lists... Done
        Building dependency tree... Done
        Reading state information... Done
        Some packages could not be installed. This may mean that you have
        requested an impossible situation or if you are using the unstable
        distribution that some required packages have not yet been created
        or been moved out of Incoming.
        The following information may help to resolve the situation:
        
        The following packages have unmet dependencies:
         python3-vtk7:i386 : Depends: python3-autobahn:i386 but it is not 
installable
                             Depends: python3-mpi4py:i386 but it is not going 
to be installed
                             Depends: python3-twisted:i386 but it is not 
installable
        E: Unable to correct problems, you have held broken packages.

Please let me know how much it is a concern as we are in hard
freeze, in which case an alternative approach might simply be to
not install the symlink libvtkDICOMPython*.so at all.  If it
seems otherwise alright, I will restore the git tag, and feel
free to sponsor upload, or proceed to DM grants as you see most
suitable.

[1]: https://salsa.debian.org/med-team/vtk-dicom

Thanks Andreas Beckmann for all your QA tests!

Have a nice day,  :)
-- 
Étienne Mollier <etienne.moll...@mailoo.org>
Fingerprint:  8f91 b227 c7d6 f2b1 948c  8236 793c f67e 8f0d 11da
Sent from /dev/tty1, please excuse my verbosity.
diff -Nru vtk-dicom-0.8.12/debian/changelog vtk-dicom-0.8.12/debian/changelog
--- vtk-dicom-0.8.12/debian/changelog	2019-12-22 14:42:19.000000000 +0100
+++ vtk-dicom-0.8.12/debian/changelog	2021-05-21 23:33:15.000000000 +0200
@@ -1,3 +1,23 @@
+vtk-dicom (0.8.12-3) unstable; urgency=medium
+
+  * Team upload.
+  * Mark python3-vtk-dicom Multi-Arch: same.
+  * Make libvtk-dicom-dev depend on python3-vtk-dicom.
+  * Move libvtkDICOMPython*.so from /usr/lib/python3/dist-packages to
+    /usr/lib/<triplet>, and from python3-vtk-dicom to libvtk-dicom-dev:
+    this whole dance repairs a broken symlink with limited side regressions.
+    Closes: #988643
+
+ -- Étienne Mollier <etienne.moll...@mailoo.org>  Fri, 21 May 2021 23:33:15 +0200
+
+vtk-dicom (0.8.12-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fix autopkgtest.  Thanks for the patch to Étienne Mollier.
+    Closes: #988745
+
+ -- Andreas Tille <ti...@debian.org>  Wed, 19 May 2021 15:30:05 +0200
+
 vtk-dicom (0.8.12-1) unstable; urgency=medium
 
   * New upstream version 0.8.12
diff -Nru vtk-dicom-0.8.12/debian/control vtk-dicom-0.8.12/debian/control
--- vtk-dicom-0.8.12/debian/control	2019-12-22 14:42:19.000000000 +0100
+++ vtk-dicom-0.8.12/debian/control	2021-05-21 21:20:12.000000000 +0200
@@ -25,6 +25,7 @@
 Multi-Arch: same
 Section: libdevel
 Depends: libvtkdicom0.8 (= ${binary:Version}),
+         python3-vtk-dicom (= ${binary:Version}),
          ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Breaks: libvtk-dicom0.7-dev,
@@ -84,6 +85,7 @@
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: ${python3:Provides}
+Multi-Arch: same
 Description: DICOM for VTK - Python
  This package contains a set of classes for managing DICOM
  files and metadata from within VTK, and some utility programs
diff -Nru vtk-dicom-0.8.12/debian/libvtk-dicom-dev.install vtk-dicom-0.8.12/debian/libvtk-dicom-dev.install
--- vtk-dicom-0.8.12/debian/libvtk-dicom-dev.install	2019-12-22 14:42:19.000000000 +0100
+++ vtk-dicom-0.8.12/debian/libvtk-dicom-dev.install	2021-05-21 20:26:37.000000000 +0200
@@ -1,5 +1,6 @@
 usr/include/*
 usr/lib/*/libvtkDICOM.so 
+usr/lib/*/libvtkDICOMPython*.so
 usr/lib/*/cmake/*
 
 
diff -Nru vtk-dicom-0.8.12/debian/python3-vtk-dicom.install vtk-dicom-0.8.12/debian/python3-vtk-dicom.install
--- vtk-dicom-0.8.12/debian/python3-vtk-dicom.install	2019-12-22 14:42:19.000000000 +0100
+++ vtk-dicom-0.8.12/debian/python3-vtk-dicom.install	2021-05-21 20:26:24.000000000 +0200
@@ -1,5 +1,4 @@
 #!/usr/bin/dh-exec 
 usr/lib/*/libvtkDICOMPython*.so.* 
-usr/lib/*/libvtkDICOMPython*.so usr/lib/python${PYVER}/dist-packages
 usr/lib/*/vtkDICOMPython*.so usr/lib/python${PYVER}/dist-packages
 
diff -Nru vtk-dicom-0.8.12/debian/tests/autopkgtest-pkg-python.conf vtk-dicom-0.8.12/debian/tests/autopkgtest-pkg-python.conf
--- vtk-dicom-0.8.12/debian/tests/autopkgtest-pkg-python.conf	1970-01-01 01:00:00.000000000 +0100
+++ vtk-dicom-0.8.12/debian/tests/autopkgtest-pkg-python.conf	2021-05-19 22:40:52.000000000 +0200
@@ -0,0 +1 @@
+import_name = vtkDICOMPython

Attachment: signature.asc
Description: PGP signature

Reply via email to