[med-svn] [Git][med-team/gdcm][master] 6 commits: d/control: adjust default-jdk-headless build-dep to exclude hurd-any and others
Michael R. Crusoe (@crusoe)
gitlab at salsa.debian.org
Sat Sep 14 13:41:17 BST 2024
Michael R. Crusoe pushed to branch master at Debian Med / gdcm
Commits:
675f4b86 by Michael R. Crusoe at 2024-09-14T13:10:23+02:00
d/control: adjust default-jdk-headless build-dep to exclude hurd-any and others
just as is already done for default-jdk
drop the now-unneeded default-jdk build-dep
Closes: #1080040
- - - - -
6e9e0c2d by Michael R. Crusoe at 2024-09-14T14:38:43+02:00
reformatted d/control; removed the now-unneeded d/control.in
- - - - -
e213b94e by Michael R. Crusoe at 2024-09-14T14:38:46+02:00
Remove trailing whitespace in debian/changelog (routine-update)
- - - - -
0193a1d0 by Michael R. Crusoe at 2024-09-14T14:39:13+02:00
Build-Depends: s/dh-python/dh-sequence-python3/ (routine-update)
- - - - -
5ded2ce3 by Michael R. Crusoe at 2024-09-14T14:39:17+02:00
Rules-Requires-Root: no (routine-update)
- - - - -
dbe15b22 by Michael R. Crusoe at 2024-09-14T14:40:21+02:00
Build-Depends: s/javahelper/dh-sequence-javahelper/
- - - - -
4 changed files:
- debian/changelog
- debian/control
- − debian/control.in
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,6 +1,15 @@
gdcm (3.0.24-5) UNRELEASED; urgency=medium
+ * Team upload.
* Adjust patch metadata to be "pq" friendly
+ * d/control: adjust default-jdk-headless build-dep to exclude hurd-any
+ and others, just as is already done for default-jdk; drop the now-unneeded
+ default-jdk build-dep. Closes: #1080040
+ * reformatted d/control; removed the now-unneeded d/control.in
+ * Remove trailing whitespace in debian/changelog (routine-update)
+ * Build-Depends: s/dh-python/dh-sequence-python3/ (routine-update)
+ * Rules-Requires-Root: no (routine-update)
+ * Build-Depends: s/javahelper/dh-sequence-javahelper/
-- Michael R. Crusoe <crusoe at debian.org> Sat, 14 Sep 2024 10:59:38 +0200
@@ -39,7 +48,7 @@ gdcm (3.0.24-1) unstable; urgency=high
This switches to git mode, to stabilise to ls-remote "API".
* New upstream version 3.0.24
This version addresses CVE-2024-22373, CVE-2024-22391 and CVE-2024-25569.
- Closes: #1070387
+ Closes: #1070387
* 02_fixhurd.patch: unfuzz.
* Deleted 6631a74c39145b71dedcbe07c43bd6b1631b100d.patch.
It is applied upstream.
=====================================
debian/control
=====================================
@@ -8,13 +8,12 @@ Priority: optional
Build-Depends: castxml,
cmake,
debhelper-compat (= 13),
- default-jdk [!hppa !hurd-any !kfreebsd-any],
- default-jdk-headless,
- dh-python,
+ default-jdk-headless [!hppa !hurd-any !kfreebsd-any],
+ dh-sequence-python3,
dh-strip-nondeterminism,
docbook-xsl-ns,
dpkg-dev (>= 1.22.5),
- javahelper,
+ dh-sequence-javahelper,
libcharls-dev (>= 2.4.1),
libexpat-dev,
libjson-c-dev,
@@ -34,21 +33,27 @@ Build-Depends: castxml,
swig,
uuid-dev,
xsltproc
-Build-Depends-Indep: doxygen, doxygen-latex, ghostscript, graphviz, vtk9-doc
+Build-Depends-Indep: doxygen,
+ doxygen-latex,
+ ghostscript,
+ graphviz,
+ vtk9-doc
Build-Conflicts: libopenjpeg-dev
Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/med-team/gdcm
Vcs-Git: https://salsa.debian.org/med-team/gdcm.git
Homepage: http://gdcm.sourceforge.net/
+Rules-Requires-Root: no
Package: libgdcm3.0t64
-Provides: ${t64:Provides}
-Replaces: libgdcm3.0
-Breaks: libgdcm3.0 (<< ${source:Version})
Architecture: any
Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
+Breaks: libgdcm3.0 (<< ${source:Version})
+Provides: ${t64:Provides}
+Replaces: libgdcm3.0
Description: Grassroots DICOM runtime libraries
Grassroots DiCoM is a C++ library for DICOM medical files. It is
automatically wrapped to python/C#/Java (using swig). It supports
@@ -61,9 +66,11 @@ Package: libgdcm-tools
Architecture: any
Multi-Arch: foreign
Section: utils
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Recommends: pvrg-jpeg
-Suggests: dcmtk, dicom3tools
+Suggests: dcmtk,
+ dicom3tools
Description: Grassroots DICOM tools and utilities
Grassroots DiCoM is a C++ library for DICOM medical files. It is
automatically wrapped to python/C#/Java (using swig). It supports
@@ -76,9 +83,8 @@ Description: Grassroots DICOM tools and utilities
Package: libgdcm-dev
Architecture: any
Section: libdevel
-Depends: libgdcm3.0t64 (= ${binary:Version}), ${misc:Depends}
-Breaks: libgdcm2-dev
-Replaces: libgdcm2-dev
+Depends: libgdcm3.0t64 (= ${binary:Version}),
+ ${misc:Depends}
Description: Grassroots DICOM development libraries and headers
Grassroots DiCoM is a C++ library for DICOM medical files. It is
automatically wrapped to python/C#/Java (using swig). It supports
@@ -104,13 +110,14 @@ Description: Grassroots DICOM Python bindings
Python bindings to the GDCM DICOM library.
Package: libvtkgdcm-9.1t64
-Provides: ${t64:Provides}
-Replaces: libvtkgdcm-9.1
-Breaks: libvtkgdcm-9.1 (<< ${source:Version})
Architecture: any
Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
+Breaks: libvtkgdcm-9.1 (<< ${source:Version})
+Provides: ${t64:Provides}
+Replaces: libvtkgdcm-9.1
Description: Grassroots DICOM VTK runtime libraries
Grassroots DiCoM is a C++ library for DICOM medical files. It is
automatically wrapped to python/C#/Java (using swig). It supports
@@ -122,9 +129,9 @@ Description: Grassroots DICOM VTK runtime libraries
Package: libvtkgdcm-dev
Architecture: any
Section: libdevel
-Depends: libgdcm-dev, libvtkgdcm-9.1t64 (= ${binary:Version}), ${misc:Depends}
-Breaks: libvtkgdcm2-dev
-Replaces: libvtkgdcm2-dev
+Depends: libgdcm-dev,
+ libvtkgdcm-9.1t64 (= ${binary:Version}),
+ ${misc:Depends}
Description: Grassroots DICOM VTK development libraries and headers
Grassroots DiCoM is a C++ library for DICOM medical files. It is
automatically wrapped to python/C#/Java (using swig). It supports
@@ -154,7 +161,8 @@ Package: libvtkgdcm-tools
Architecture: any
Multi-Arch: foreign
Section: utils
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
Suggests: libgdcm-tools
Description: Grassroots DICOM VTK tools and utilities
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -168,7 +176,9 @@ Description: Grassroots DICOM VTK tools and utilities
Package: gdcm-doc
Architecture: all
Section: doc
-Depends: doc-base, vtk9-doc, ${misc:Depends}
+Depends: doc-base,
+ vtk9-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
@@ -179,7 +189,9 @@ Description: Grassroots DICOM documentation
Package: libgdcm-java
Architecture: alpha amd64 arm64 armel armhf i386 ia64 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
Section: java
-Depends: ${java:Depends}, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${java:Depends},
+ ${misc:Depends},
+ ${shlibs:Depends}
Suggests: java-virtual-machine
Description: Grassroots DICOM Java bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
=====================================
debian/control.in deleted
=====================================
@@ -1,205 +0,0 @@
-Source: gdcm
-Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Steve M. Robbins <smr at debian.org>,
- Sébastien Jodogne <s.jodogne at gmail.com>,
- Gert Wollny <gewo at debian.org>
-Section: libs
-Priority: optional
-Build-Depends: castxml,
- cli-common-dev [@DEB_MONO_ARCHS@] <!nocil>,
- cmake,
- debhelper-compat (= 13),
- default-jdk [!hppa !hurd-any !kfreebsd-any],
- default-jdk-headless,
- dh-python,
- dh-strip-nondeterminism,
- docbook-xsl-ns,
- dpkg-dev (>= 1.22.5),
- javahelper,
- libcharls-dev (>= 2.4.1),
- libexpat-dev,
- libjson-c-dev,
- libopenjp2-7-dev,
- libpapyrus3-dev,
- libpoppler-private-dev,
- libsocket++-dev,
- libssl-dev,
- libvtk9-dev,
- libvtk9-qt-dev,
- libxml2-dev,
- libz-dev,
- mono-devel [@DEB_MONO_ARCHS@] <!nocil>,
- ninja-build,
- pvrg-jpeg,
- python3-dev,
- python3-vtk9,
- swig,
- uuid-dev,
- xsltproc
-Build-Depends-Indep: doxygen, doxygen-latex, ghostscript, graphviz, vtk9-doc
-Build-Conflicts: libopenjpeg-dev
-Standards-Version: 4.7.0
-Vcs-Browser: https://salsa.debian.org/med-team/gdcm
-Vcs-Git: https://salsa.debian.org/med-team/gdcm.git
-Homepage: http://gdcm.sourceforge.net/
-
-Package: libgdcm3.0t64
-Provides: ${t64:Provides}
-Replaces: libgdcm3.0
-Breaks: libgdcm3.0 (<< ${source:Version})
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Description: Grassroots DICOM runtime libraries
- Grassroots DiCoM is a C++ library for DICOM medical files. It is
- automatically wrapped to python/C#/Java (using swig). It supports
- RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated. It also
- comes with DICOM Part 3,6 & 7 of the standard as XML files.
- .
- This package contains the libraries needed to run GDCM applications.
-
-Package: libgdcm-tools
-Architecture: any
-Multi-Arch: foreign
-Section: utils
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Recommends: pvrg-jpeg
-Suggests: dcmtk, dicom3tools
-Description: Grassroots DICOM tools and utilities
- Grassroots DiCoM is a C++ library for DICOM medical files. It is
- automatically wrapped to python/C#/Java (using swig). It supports
- RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
- .
- Install this package for the gdcmanon, gdcmclean, gdcmconv, gdcmdiff,
- gdcmdump, gdcmpap3, gdcmgendir, gdcmimg, gdcminfo, gdcmpdf, gdcmraw,
- gdcmscanner, gdcmscu, gdcmtar, gdcmxml programs.
-
-Package: libgdcm-dev
-Architecture: any
-Section: libdevel
-Depends: libgdcm3.0t64 (= ${binary:Version}), ${misc:Depends}
-Breaks: libgdcm2-dev
-Replaces: libgdcm2-dev
-Description: Grassroots DICOM development libraries and headers
- Grassroots DiCoM is a C++ library for DICOM medical files. It is
- automatically wrapped to python/C#/Java (using swig). It supports
- RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
- .
- Headers and static libraries for libgdcm. These are not needed to use
- GDCM, but are needed to build plugins or programs that link against
- libgdcm.
-
-Package: libgdcm-cil
-Build-Profiles: <!nocil>
-Architecture: amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mipsel powerpc ppc64 ppc64el s390x
-Section: cli-mono
-Depends: ${cli:Depends}, ${misc:Depends}, ${shlibs:Depends}
-Description: Grassroots DICOM CLI bindings
- Grassroots DiCoM is a C++ library for DICOM medical files. It is
- automatically wrapped to python/C#/Java (using swig). It supports
- RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
- .
- CLI bindings to the GDCM DICOM library. It allows developers to use
- GDCM from C# environment.
-
-Package: python3-gdcm
-Architecture: any
-Section: python
-Depends: libgdcm3.0t64 (= ${binary:Version}),
- ${misc:Depends},
- ${python3:Depends},
- ${shlibs:Depends}
-Provides: ${python:Provides}
-Description: Grassroots DICOM Python bindings
- Grassroots DiCoM is a C++ library for DICOM medical files. It is
- automatically wrapped to python/C#/Java (using swig). It supports
- RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
- .
- Python bindings to the GDCM DICOM library.
-
-Package: libvtkgdcm-9.1t64
-Provides: ${t64:Provides}
-Replaces: libvtkgdcm-9.1
-Breaks: libvtkgdcm-9.1 (<< ${source:Version})
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Description: Grassroots DICOM VTK runtime libraries
- Grassroots DiCoM is a C++ library for DICOM medical files. It is
- automatically wrapped to python/C#/Java (using swig). It supports
- RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
- .
- Libvtkgdcm is a library that quickly allow programmer to use GDCM
- from a VTK environment.
-
-Package: libvtkgdcm-dev
-Architecture: any
-Section: libdevel
-Depends: libgdcm-dev, libvtkgdcm-9.1t64 (= ${binary:Version}), ${misc:Depends}
-Breaks: libvtkgdcm2-dev
-Replaces: libvtkgdcm2-dev
-Description: Grassroots DICOM VTK development libraries and headers
- Grassroots DiCoM is a C++ library for DICOM medical files. It is
- automatically wrapped to python/C#/Java (using swig). It supports
- RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
- .
- Headers and static libraries for libvtkgdcm. These are not needed to
- use GDCM, but are needed to build plugins or programs that link
- against libvtkgdcm.
-
-Package: python3-vtkgdcm
-Architecture: any
-Section: python
-Depends: libvtkgdcm-9.1t64 (= ${binary:Version}),
- ${misc:Depends},
- ${python3:Depends},
- ${shlibs:Depends}
-Suggests: python3-gdcm
-Provides: ${python:Provides}
-Description: Grassroots DICOM VTK/Python bindings
- Grassroots DiCoM is a C++ library for DICOM medical files. It is
- automatically wrapped to python/C#/Java (using swig). It supports
- RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
- .
- VTK/Python bindings to the GDCM DICOM library.
-
-Package: libvtkgdcm-tools
-Architecture: any
-Multi-Arch: foreign
-Section: utils
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: libgdcm-tools
-Description: Grassroots DICOM VTK tools and utilities
- Grassroots DiCoM is a C++ library for DICOM medical files. It is
- automatically wrapped to python/C#/Java (using swig). It supports
- RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
- .
- Libvtkgdcm-tools provides a number of command line debugging and utility
- tool. Install this package for the gdcmviewer, gdcm2pnm and gdcm2vtk
- programs.
-
-Package: gdcm-doc
-Architecture: all
-Section: doc
-Depends: doc-base, vtk9-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
- RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
- .
- This is the documentation for gdcm and vtkgdcm
-
-Package: libgdcm-java
-Architecture: alpha amd64 arm64 armel armhf i386 ia64 loong64 m68k mips64el mipsel powerpc ppc64 ppc64el riscv64 s390x sh4 sparc64 x32
-Section: java
-Depends: ${java:Depends}, ${misc:Depends}, ${shlibs:Depends}
-Suggests: java-virtual-machine
-Description: Grassroots DICOM Java bindings
- Grassroots DiCoM is a C++ library for DICOM medical files. It is
- automatically wrapped to python/C#/Java (using swig). It supports
- RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
- .
- Java bindings to the GDCM DICOM library. It allows developers to use
- GDCM from Java environment.
=====================================
debian/rules
=====================================
@@ -36,7 +36,7 @@ else
endif
%:
- dh $@ --with python3 --with javahelper --buildsystem=cmake+ninja
+ dh $@ --buildsystem=cmake+ninja
PYVER := $(shell py3versions -dv)
PV := $(shell echo $(PYVER) | sed 's/\.//')
@@ -150,6 +150,3 @@ override_dh_compress:
#TODO I cannot set documentation to separate build target as man page
# depends on doc, and bin tools depends on man page
-
-debian/control: debian/control.in
- sed -e"s/@PYVER@/$(PYVER)/g" -e "s/@DEB_MONO_ARCHS@/$(DEB_MONO_ARCHS)/g" $< > $@
View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/compare/f4330c951b3a20e7c4c3b58eb31ade6710530e1a...dbe15b2245e38aed8e66bf899934e51d12996eb3
--
View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/compare/f4330c951b3a20e7c4c3b58eb31ade6710530e1a...dbe15b2245e38aed8e66bf899934e51d12996eb3
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/20240914/4fd8f958/attachment-0001.htm>
More information about the debian-med-commit
mailing list