[med-svn] [Git][med-team/gdcm][master] 6 commits: add missing dependencies to libgdcm-dev

[Étienne Mollier (@emollier)]

Étienne Mollier pushed to branch master at Debian Med / gdcm


Commits:
cddfeab9 by Etienne Mollier at 2021-07-28T15:42:03+02:00
add missing dependencies to libgdcm-dev

Dependencies added are: libgdcm-tools, libvtkgdcm-cil, libvtkgdcm-dev,
libvtkgdcm-java, and python3-vtkgdcm.  This should partly address the
issue #989296.

- - - - -
92bee734 by Etienne Mollier at 2021-07-28T16:12:03+02:00
d/rules: adjust GDCMTargets*.cmake

Some files are reaffected on the fly by multiarchitecture support,
pybuild, and possibly other scripts, after .cmake files are generated.
This causes various inconsistencies with the names of libraries,
between what is recorded in GDCMTargets*.cmake, and what is
effectively present in the file system.  This addresses the second
point of #989296, the first point being the missing dependencies to
libgdcm-dev.

Closes: #989296

- - - - -
74039f4f by Etienne Mollier at 2021-07-28T16:20:20+02:00
update changelog

- - - - -
0dc3b4e0 by Etienne Mollier at 2021-07-28T21:20:22+02:00
d/rules: fix typos in the new sed script

- - - - -
561c492d by Etienne Mollier at 2021-07-28T21:41:45+02:00
d/changelog: rewrap entries

The aim is to clarify that both changes are closing the bug.

- - - - -
0031cf59 by Etienne Mollier at 2021-07-29T23:26:02+02:00
ready to upload to unstable perhaps

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/control.in
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+gdcm (3.0.8-2) unstable; urgency=medium
+
+  [ Étienne Mollier ]
+  * corrections to satisfy GDCMTargets*.cmake:
+    - d/control{,.in}: add missing dependencies to libgdcm-dev
+    - d/rules: adjust GDCMTargets-*.cmake
+    Closes: #989296
+
+ -- Étienne Mollier <emollier at debian.org>  Thu, 29 Jul 2021 23:25:51 +0200
+
 gdcm (3.0.8-1) unstable; urgency=medium
 
   [ Gert Wollny ]


=====================================
debian/control
=====================================
@@ -81,7 +81,12 @@ Package: libgdcm-dev
 Architecture: any
 Section: libdevel
 Depends: libgdcm3.0 (= ${binary:Version}),
-         ${misc:Depends}
+         ${misc:Depends},
+         libgdcm-tools,
+         libvtkgdcm-cil,
+         libvtkgdcm-dev,
+         libvtkgdcm-java,
+         python3-vtkgdcm
 Breaks: libgdcm2-dev
 Replaces: libgdcm2-dev
 Description: Grassroots DICOM development libraries and headers


=====================================
debian/control.in
=====================================
@@ -81,7 +81,12 @@ Package: libgdcm-dev
 Architecture: any
 Section: libdevel
 Depends: libgdcm3.0 (= ${binary:Version}),
-         ${misc:Depends}
+         ${misc:Depends},
+         libgdcm-tools,                                                
+         libvtkgdcm-cil,                                               
+         libvtkgdcm-dev,                                               
+         libvtkgdcm-java,                                              
+         python3-vtkgdcm
 Breaks: libgdcm2-dev
 Replaces: libgdcm2-dev
 Description: Grassroots DICOM development libraries and headers


=====================================
debian/rules
=====================================
@@ -54,6 +54,7 @@ endif
 	dh $@ $(WITH_CLI) --with python3 --with javahelper  --buildsystem=cmake+ninja
 
 PYVER 	 := $(shell py3versions -dv)
+PV	 := $(shell echo $(PYVER) | sed 's/\.//')
 PYMODDIR := /usr/lib/$(shell py3versions -d)
 VTKVERS=$(shell apt-cache policy libvtk7-dev | grep "Installed:" | cut -d: -f2 | cut -d' ' -f2 | cut -d- -f1 | cut -d. -f1-2)
 
@@ -114,6 +115,11 @@ override_dh_auto_install-arch:
 	sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-*/GDCMTargets-*.cmake
 	# See #711214
 	sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-*/GDCMTargets.cmake
+	# See #989296
+	sed -i -e 's@/lib/\(.\+\)/libvtkgdcmsharpglue.so@/lib/cli/vtkgdcm-sharp-3.0/libvtkgdcmsharpglue.so@' \
+		obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-*/GDCMTargets-*.cmake
+	sed -i -e 's@/lib/python/dist-packages/vtkgdcmPython.so@/lib/python3/dist-packages/vtkgdcmPython.cpython-$(PV)-$(DEB_HOST_MULTIARCH).so@' \
+		obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-*/GDCMTargets-*.cmake
 
 	dh_auto_install
 	# PHP



View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/compare/12f3dccbe234893b239d379658cac4880212db49...0031cf594197aad21f8e04bcf572b6f13d77f127

-- 
View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/compare/12f3dccbe234893b239d379658cac4880212db49...0031cf594197aad21f8e04bcf572b6f13d77f127
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20210729/1ab6e79b/attachment-0001.htm>