[med-svn] [Git][med-team/gdcm][master] 4 commits: Revert "Link against vtk9 instead of vtk7"
Andreas Tille (@tille)
gitlab at salsa.debian.org
Fri Aug 12 08:47:56 BST 2022
Andreas Tille pushed to branch master at Debian Med / gdcm
Commits:
76b4b205 by Andreas Tille at 2022-08-12T09:19:10+02:00
Revert "Link against vtk9 instead of vtk7"
This reverts commit b55c048e9954fcf829ec941c44495c34c8e78891.
- - - - -
a40133a0 by Andreas Tille at 2022-08-12T09:20:43+02:00
Deal with new build target locations created by cmake
- - - - -
c43f5f90 by Andreas Tille at 2022-08-12T09:21:45+02:00
Complete changelog
- - - - -
7a5bf713 by Andreas Tille at 2022-08-12T09:33:31+02:00
Upload to unstable
- - - - -
4 changed files:
- debian/changelog
- debian/control
- debian/control.in
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,11 +1,12 @@
-gdcm (3.0.14-1) UNRELEASED; urgency=medium
+gdcm (3.0.14-1) unstable; urgency=medium
* Team upload.
* d/watch: Point to latest release
- * Link against vtk9 instead of vtk7
- Closes: #1013156
+ * Deal with new build target locations created by cmake
+ Closes: #1017027
+ * lintian-brush: Avoid explicitly specifying -Wl,--as-needed linker flag.
- -- Andreas Tille <tille at debian.org> Thu, 04 Aug 2022 11:30:12 +0200
+ -- Andreas Tille <tille at debian.org> Fri, 12 Aug 2022 09:22:00 +0200
gdcm (3.0.13-3) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -22,19 +22,19 @@ Build-Depends: castxml,
libpoppler-private-dev,
libsocket++-dev,
libssl-dev,
- libvtk9-dev,
- libvtk9-java [!hppa !hurd-any !kfreebsd-any],
+ libvtk7-dev,
+ libvtk7-java [!hppa !hurd-any !kfreebsd-any],
libxml2-dev,
libz-dev,
mono-devel [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 ppc64el s390x arm64] <!nocil>,
ninja-build,
pvrg-jpeg,
python3-dev,
- python3-vtk9,
+ python3-vtk7,
swig,
uuid-dev,
xsltproc
-Build-Depends-Indep: doxygen, doxygen-latex, ghostscript, graphviz, vtk9-doc
+Build-Depends-Indep: doxygen, doxygen-latex, ghostscript, graphviz, vtk7-doc
Build-Conflicts: libopenjpeg-dev
Standards-Version: 4.6.1
Vcs-Browser: https://salsa.debian.org/med-team/gdcm
@@ -191,7 +191,7 @@ Description: Grassroots DICOM VTK tools and utilities
Package: gdcm-doc
Architecture: all
Section: doc
-Depends: doc-base, vtk9-doc, ${misc:Depends}
+Depends: doc-base, vtk7-doc, ${misc:Depends}
Description: Grassroots DICOM documentation
Grassroots DiCoM is a C++ library for DICOM medical files. It is
automatically wrapped to python/C#/Java (using swig). It supports
=====================================
debian/control.in
=====================================
@@ -22,19 +22,19 @@ Build-Depends: castxml,
libpoppler-private-dev,
libsocket++-dev,
libssl-dev,
- libvtk9-dev,
- libvtk9-java [!hppa !hurd-any !kfreebsd-any],
+ libvtk7-dev,
+ libvtk7-java [!hppa !hurd-any !kfreebsd-any],
libxml2-dev,
libz-dev,
mono-devel [@DEB_MONO_ARCHS@] <!nocil>,
ninja-build,
pvrg-jpeg,
python3-dev,
- python3-vtk9,
+ python3-vtk7,
swig,
uuid-dev,
xsltproc
-Build-Depends-Indep: doxygen, doxygen-latex, ghostscript, graphviz, vtk9-doc
+Build-Depends-Indep: doxygen, doxygen-latex, ghostscript, graphviz, vtk7-doc
Build-Conflicts: libopenjpeg-dev
Standards-Version: 4.6.1
Vcs-Browser: https://salsa.debian.org/med-team/gdcm
@@ -191,7 +191,7 @@ Description: Grassroots DICOM VTK tools and utilities
Package: gdcm-doc
Architecture: all
Section: doc
-Depends: doc-base, vtk9-doc, ${misc:Depends}
+Depends: doc-base, vtk7-doc, ${misc:Depends}
Description: Grassroots DICOM documentation
Grassroots DiCoM is a C++ library for DICOM medical files. It is
automatically wrapped to python/C#/Java (using swig). It supports
=====================================
debian/rules
=====================================
@@ -110,15 +110,13 @@ override_dh_auto_build-arch:
dh_auto_build
override_dh_auto_install-arch:
- # See #664188
- 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 #664188 and #711214
+ find obj-* -name "GDCMTargets*.cmake" -exec sed -i -e "s/FATAL_ERROR/STATUS/g" \{\} \;
# 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
+ find obj-* -name "GDCMTargets*.cmake" -exec \
+ sed -i -e 's@/lib/\(.\+\)/libvtkgdcmsharpglue.so@/lib/cli/vtkgdcm-sharp-3.0/libvtkgdcmsharpglue.so@' \
+ -e 's@/lib/python/dist-packages/vtkgdcmPython.so@/lib/python3/dist-packages/vtkgdcmPython.cpython-$(PV)-$(DEB_HOST_MULTIARCH).so@' \
+ \{\} \;
dh_auto_install
# PHP
View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/compare/b55c048e9954fcf829ec941c44495c34c8e78891...7a5bf71340e22f9f11b5ebedf86778ba99db8c45
--
View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/compare/b55c048e9954fcf829ec941c44495c34c8e78891...7a5bf71340e22f9f11b5ebedf86778ba99db8c45
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/20220812/bc1cef43/attachment-0001.htm>
More information about the debian-med-commit
mailing list