[med-svn] [Git][med-team/gdcm][master] 16 commits: routine-update: Standards-Version: 4.5.0
Andreas Tille
gitlab at salsa.debian.org
Wed Mar 4 09:46:12 GMT 2020
Andreas Tille pushed to branch master at Debian Med / gdcm
Commits:
98becaaa by Andreas Tille at 2020-03-04T09:56:51+01:00
routine-update: Standards-Version: 4.5.0
- - - - -
6a39ddba by Andreas Tille at 2020-03-04T09:56:51+01:00
routine-update: debhelper-compat 12
- - - - -
13759c10 by Andreas Tille at 2020-03-04T09:58:10+01:00
routine-update: Drop obsolete get-orig-source target
- - - - -
0904dfc6 by Andreas Tille at 2020-03-04T09:59:22+01:00
routine-update: DEB_BUILD_OPTIONS allow override_dh_auto_test
- - - - -
cab9fd48 by Andreas Tille at 2020-03-04T09:59:22+01:00
R-U: Trailing whitespace in debian/changelog
- - - - -
d9db86d2 by Andreas Tille at 2020-03-04T09:59:22+01:00
R-U: Trailing whitespace in debian/control
- - - - -
5ac8574e by Andreas Tille at 2020-03-04T09:59:22+01:00
R-U: Trailing whitespace in debian/copyright
- - - - -
20177e1d by Andreas Tille at 2020-03-04T09:59:22+01:00
R-U: Trailing whitespace in debian/rules
- - - - -
a651e076 by Andreas Tille at 2020-03-04T09:59:22+01:00
routine-update: Add salsa-ci file
- - - - -
13a5f06d by Andreas Tille at 2020-03-04T09:59:23+01:00
Trim trailing whitespace.
Fixes: lintian: file-contains-trailing-whitespace
See-also: https://lintian.debian.org/tags/file-contains-trailing-whitespace.html
- - - - -
6c99734c by Andreas Tille at 2020-03-04T09:59:24+01:00
Wrap long lines in changelog entries: 2.0.10-2.
Fixes: lintian: debian-changelog-line-too-long
See-also: https://lintian.debian.org/tags/debian-changelog-line-too-long.html
- - - - -
23facc6d by Andreas Tille at 2020-03-04T09:59:27+01:00
Use secure URI in debian/watch.
Fixes: lintian: debian-watch-uses-insecure-uri
See-also: https://lintian.debian.org/tags/debian-watch-uses-insecure-uri.html
- - - - -
babe90cf by Andreas Tille at 2020-03-04T10:04:44+01:00
No idea whether control.in is maintained but bring it up to date somehow
- - - - -
18ad2972 by Andreas Tille at 2020-03-04T10:36:24+01:00
Build on ports without java
- - - - -
b8a19d1d by Andreas Tille at 2020-03-04T10:37:45+01:00
We have now salsa-ci.yml and can drop .gitlab-ci.yml
- - - - -
71e1c7d8 by Andreas Tille at 2020-03-04T10:39:35+01:00
Build-Depends: swig (instead of swig3.0)
- - - - -
9 changed files:
- − debian/.gitlab-ci.yml
- debian/changelog
- − debian/compat
- debian/control
- debian/control.in
- debian/copyright
- debian/rules
- + debian/salsa-ci.yml
- debian/watch
Changes:
=====================================
debian/.gitlab-ci.yml deleted
=====================================
@@ -1,14 +0,0 @@
-image: debian:sid
-
-build:
- stage: build
- before_script:
- - apt-get update && apt-get -y install devscripts git-buildpackage
- - mk-build-deps --tool "apt -y -o Debug::pkgProblemResolver=yes --no-install-recommends" --install -r debian/control
- script:
- - git checkout pristine-tar
- - git pull
- - git checkout master
- - git pull
- - gbp buildpackage -uc -us
-
=====================================
debian/changelog
=====================================
@@ -1,3 +1,29 @@
+gdcm (3.0.4-3) UNRELEASED; urgency=medium
+
+ [ Andreas Tille ]
+ * Team upload.
+ * Standards-Version: 4.5.0 (routine-update)
+ * debhelper-compat 12 (routine-update)
+ * Drop useless get-orig-source target (routine-update)
+ * Respect DEB_BUILD_OPTIONS in override_dh_auto_test target (routine-
+ update)
+ * Remove trailing whitespace in debian/changelog (routine-update)
+ * Remove trailing whitespace in debian/control (routine-update)
+ * Remove trailing whitespace in debian/copyright (routine-update)
+ * Remove trailing whitespace in debian/rules (routine-update)
+ * Add salsa-ci file in favour of .gitlab-ci.yml
+ * Trim trailing whitespace.
+ * Wrap long lines in changelog entries: 2.0.10-2.
+ * Use secure URI in debian/watch.
+ * Build-Depends: swig (instead of swig3.0)
+ Closes: #952597
+
+ [ Samuel Thibault ]
+ * Build on ports without java
+ Closes: #947990
+
+ -- Andreas Tille <tille at debian.org> Wed, 04 Mar 2020 09:56:51 +0100
+
gdcm (3.0.4-2) unstable; urgency=medium
* d/control: Depend on vtk7-doc instead of vtk6-doc
@@ -23,7 +49,7 @@ gdcm (3.0.3-1~exp1) experimental; urgency=medium
* d/watch: update to version 4 of watch file
* New upstream version 3.0.3
* d/ Update to new 3.0 so version
- * d/p: Update patches and remove patches that were applied
+ * d/p: Update patches and remove patches that were applied
upstream
* ci: Get some log output on failure
* d/rules: Fix cmake file patchup code (Thanks Mathieu)
@@ -34,7 +60,7 @@ gdcm (3.0.3-1~exp1) experimental; urgency=medium
* d/gdcm-doc*: Fix version of PDF file
* d/control: Fix dev package names
- [Steffenn Möller]
+ [Steffenn Möller]
* d/u/metadata: yamllint
-- Gert Wollny <gewo at debian.org> Sun, 20 Oct 2019 15:16:32 +0200
@@ -1041,9 +1067,10 @@ gdcm (2.0.10-2) unstable; urgency=low
* debian/libgdcm2.0.docs: New.
[ Mathieu Malaterre ]
- * debian/patches/gdcm210_tagbackport.patch: Patch released on gdcm 2.0.10 svn tag
- * debian/patches/dcm210_branchbackport.patch: Patch released on gdcm-2-0 branch
- Closes: #529276.
+ * debian/patches/gdcm210_tagbackport.patch: Patch released on gdcm 2.0.10 svn
+ tag
+ * debian/patches/dcm210_branchbackport.patch: Patch released on gdcm-2-0
+ branch Closes: #529276.
* Use vtk/5.2.1-4, Closes: #529193
-- Mathieu Malaterre (malat) <mathieu.malaterre at gmail.com> Mon, 18 May 2009 14:31:47 +0200
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -1,46 +1,46 @@
Source: gdcm
-Section: libs
-Priority: optional
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>
-Build-Depends: cmake (>= 2.8.9),
- debhelper (>= 11),
- default-jdk,
- dh-strip-nondeterminism,
- dh-python,
- python3-dev,
- pvrg-jpeg,
- uuid-dev,
- libz-dev,
- libexpat-dev,
- swig3.0,
- javahelper,
- libvtk7-dev,
- libcharls-dev (>= 1.1.0),
- libopenjp2-7-dev,
- libvtk7-java,
- libxml2-dev,
- libjson-c-dev,
- libpoppler-private-dev,
- libssl-dev,
- ninja-build,
- python3-vtk7 (>= 7.1.1-1~exp4),
- castxml,
- libsocket++-dev,
- libpapyrus3-dev,
- cli-common-dev (>= 0.9) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 ppc64el s390x arm64],
- mono-devel (>= 2.10.5) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 ppc64el s390x arm64],
- xsltproc,
+ Sébastien Jodogne <s.jodogne at gmail.com>,
+ Gert Wollny <gewo at debian.org>
+Section: libs
+Priority: optional
+Build-Depends: cmake,
+ debhelper-compat (= 12),
+ default-jdk [!hppa !hurd-any !kfreebsd-any],
+ dh-strip-nondeterminism,
+ dh-python,
+ python3-dev,
+ pvrg-jpeg,
+ uuid-dev,
+ libz-dev,
+ libexpat-dev,
+ swig,
+ javahelper,
+ libvtk7-dev,
+ libcharls-dev (>= 1.1.0),
+ libopenjp2-7-dev,
+ libvtk7-java [!hppa !hurd-any !kfreebsd-any],
+ libxml2-dev,
+ libjson-c-dev,
+ libpoppler-private-dev,
+ libssl-dev,
+ ninja-build,
+ python3-vtk7,
+ castxml,
+ libsocket++-dev,
+ libpapyrus3-dev,
+ cli-common-dev,
+ mono-devel,
+ xsltproc,
docbook-xsl-ns
Build-Depends-Indep: vtk7-doc,
- doxygen,
- doxygen-latex,
- ghostscript,
- graphviz
+ doxygen,
+ doxygen-latex,
+ ghostscript,
+ graphviz
Build-Conflicts: libopenjpeg-dev
-Standards-Version: 4.1.4
+Standards-Version: 4.5.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/
@@ -48,8 +48,9 @@ Homepage: http://gdcm.sourceforge.net/
Package: libgdcm3.0
Architecture: any
Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc: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
@@ -60,11 +61,13 @@ Description: Grassroots DICOM runtime libraries
Package: libgdcm-tools
Architecture: any
-Section: utils
Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Section: utils
+Depends: ${shlibs:Depends},
+ ${misc: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
@@ -75,11 +78,12 @@ Description: Grassroots DICOM tools and utilities
gdcmxml programs.
Package: libgdcm-dev
-Section: libdevel
Architecture: any
+Section: libdevel
+Depends: libgdcm3.0 (= ${binary:Version}),
+ ${misc:Depends}
Breaks: libgdcm2-dev
Replaces: libgdcm2-dev
-Depends: libgdcm3.0 (= ${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
@@ -90,9 +94,11 @@ Description: Grassroots DICOM development libraries and headers
libgdcm.
Package: libgdcm-cil
-Section: cli-mono
Architecture: amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 ppc64el s390x arm64
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
+Section: cli-mono
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${cli: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
@@ -102,9 +108,12 @@ Description: Grassroots DICOM CLI bindings
GDCM from C# environment.
Package: python3-gdcm
-Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libgdcm3.0 (= ${binary:Version})
+Section: python
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${python3:Depends},
+ libgdcm3.0 (= ${binary:Version})
Provides: ${python:Provides}
Description: Grassroots DICOM Python bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -116,8 +125,9 @@ Description: Grassroots DICOM Python bindings
Package: libvtkgdcm3.0
Architecture: any
Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc: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
@@ -127,11 +137,13 @@ Description: Grassroots DICOM VTK runtime libraries
from a VTK environment.
Package: libvtkgdcm-dev
-Section: libdevel
Architecture: any
+Section: libdevel
+Depends: libvtkgdcm3.0 (= ${binary:Version}),
+ libgdcm-dev,
+ ${misc:Depends}
Breaks: libvtkgdcm2-dev
Replaces: libvtkgdcm2-dev
-Depends: libvtkgdcm3.0 (= ${binary:Version}), libgdcm-dev, ${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
@@ -142,9 +154,12 @@ Description: Grassroots DICOM VTK development libraries and headers
against libvtkgdcm.
Package: libvtkgdcm-cil
-Section: cli-mono
Architecture: amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 ppc64el s390x arm64
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libgdcm3.0 (= ${binary:Version})
+Section: cli-mono
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${cli:Depends},
+ libgdcm3.0 (= ${binary:Version})
Suggests: libgdcm-cil
Description: Grassroots DICOM VTK CLI bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -154,11 +169,14 @@ Description: Grassroots DICOM VTK CLI bindings
VTK CLI bindings to the GDCM DICOM library.
Package: python3-vtkgdcm
-Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libvtkgdcm3.0 (= ${binary:Version})
-Provides: ${python:Provides}
+Section: python
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${python3:Depends},
+ libvtkgdcm3.0 (= ${binary:Version})
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
@@ -168,9 +186,10 @@ Description: Grassroots DICOM VTK/Python bindings
Package: libvtkgdcm-tools
Architecture: any
-Section: utils
Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Section: utils
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Suggests: libgdcm-tools
Description: Grassroots DICOM VTK tools and utilities
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -184,7 +203,9 @@ Description: Grassroots DICOM VTK tools and utilities
Package: gdcm-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}, vtk7-doc, doc-base
+Depends: ${misc:Depends},
+ vtk7-doc,
+ doc-base
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
@@ -193,9 +214,11 @@ Description: Grassroots DICOM documentation
This is the documentation for gdcm and vtkgdcm
Package: libgdcm-java
+Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x alpha ia64 m68k powerpc ppc64 riscv64 sh4 sparc64 x32
Section: java
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${java:Depends}
Suggests: java-virtual-machine
Description: Grassroots DICOM Java bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -206,9 +229,12 @@ Description: Grassroots DICOM Java bindings
GDCM from Java environment.
Package: libvtkgdcm-java
-Section: java
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}, libgdcm3.0 (= ${binary:Version})
+Section: java
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${java:Depends},
+ libgdcm3.0 (= ${binary:Version})
Suggests: libgdcm-java
Description: Grassroots DICOM VTK Java bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -216,4 +242,3 @@ Description: Grassroots DICOM VTK Java bindings
RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
.
VTK Java bindings to the GDCM DICOM library.
-
=====================================
debian/control.in
=====================================
@@ -1,46 +1,46 @@
Source: gdcm
-Section: libs
-Priority: optional
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>
-Build-Depends: cmake (>= 2.8.9),
- debhelper (>= 11),
- default-jdk,
- dh-strip-nondeterminism,
- dh-python,
- python3-dev,
- pvrg-jpeg,
- uuid-dev,
- libz-dev,
- libexpat-dev,
- swig3.0,
- javahelper,
- libvtk7-dev,
- libcharls-dev (>= 1.1.0),
- libopenjp2-7-dev,
- libvtk7-java,
- libxml2-dev,
- libjson-c-dev,
- libpoppler-private-dev,
- libssl-dev,
- ninja-build,
- python3-vtk7 (>= 7.1.1-1~exp4),
- castxml,
- libsocket++-dev,
- libpapyrus3-dev,
- cli-common-dev (>= 0.9) [@DEB_MONO_ARCHS@],
- mono-devel (>= 2.10.5) [@DEB_MONO_ARCHS@],
- xsltproc,
+ Sébastien Jodogne <s.jodogne at gmail.com>,
+ Gert Wollny <gewo at debian.org>
+Section: libs
+Priority: optional
+Build-Depends: cmake,
+ debhelper-compat (= 12),
+ default-jdk [!hppa !hurd-any !kfreebsd-any],
+ dh-strip-nondeterminism,
+ dh-python,
+ python3-dev,
+ pvrg-jpeg,
+ uuid-dev,
+ libz-dev,
+ libexpat-dev,
+ swig,
+ javahelper,
+ libvtk7-dev,
+ libcharls-dev (>= 1.1.0),
+ libopenjp2-7-dev,
+ libvtk7-java [!hppa !hurd-any !kfreebsd-any],
+ libxml2-dev,
+ libjson-c-dev,
+ libpoppler-private-dev,
+ libssl-dev,
+ ninja-build,
+ python3-vtk7,
+ castxml,
+ libsocket++-dev,
+ libpapyrus3-dev,
+ cli-common-dev [@DEB_MONO_ARCHS@],
+ mono-devel [@DEB_MONO_ARCHS@],
+ xsltproc,
docbook-xsl-ns
Build-Depends-Indep: vtk7-doc,
- doxygen,
- doxygen-latex,
- ghostscript,
- graphviz
+ doxygen,
+ doxygen-latex,
+ ghostscript,
+ graphviz
Build-Conflicts: libopenjpeg-dev
-Standards-Version: 4.1.4
+Standards-Version: 4.5.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/
@@ -48,8 +48,9 @@ Homepage: http://gdcm.sourceforge.net/
Package: libgdcm3.0
Architecture: any
Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc: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
@@ -60,11 +61,13 @@ Description: Grassroots DICOM runtime libraries
Package: libgdcm-tools
Architecture: any
-Section: utils
Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Section: utils
+Depends: ${shlibs:Depends},
+ ${misc: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
@@ -74,10 +77,13 @@ Description: Grassroots DICOM tools and utilities
gdcmgendir, gdcmimg, gdcminfo, gdcmpdf, gdcmraw, gdcmscanner, gdcmscu, gdcmtar,
gdcmxml programs.
-Package: libgdcm2-dev
-Section: libdevel
+Package: libgdcm-dev
Architecture: any
-Depends: libgdcm3.0 (= ${binary:Version}), ${misc:Depends}
+Section: libdevel
+Depends: libgdcm3.0 (= ${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
@@ -88,9 +94,11 @@ Description: Grassroots DICOM development libraries and headers
libgdcm.
Package: libgdcm-cil
+Architecture: amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 ppc64el s390x arm64
Section: cli-mono
-Architecture: @DEB_MONO_ARCHS@
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${cli: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
@@ -100,9 +108,12 @@ Description: Grassroots DICOM CLI bindings
GDCM from C# environment.
Package: python3-gdcm
-Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libgdcm3.0 (= ${binary:Version})
+Section: python
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${python3:Depends},
+ libgdcm3.0 (= ${binary:Version})
Provides: ${python:Provides}
Description: Grassroots DICOM Python bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -114,8 +125,9 @@ Description: Grassroots DICOM Python bindings
Package: libvtkgdcm3.0
Architecture: any
Multi-Arch: same
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc: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
@@ -124,10 +136,14 @@ Description: Grassroots DICOM VTK runtime libraries
Libvtkgdcm is a library that quickly allow programmer to use GDCM
from a VTK environment.
-Package: libvtkgdcm2-dev
-Section: libdevel
+Package: libvtkgdcm-dev
Architecture: any
-Depends: libvtkgdcm3.0 (= ${binary:Version}), libgdcm2-dev, ${misc:Depends}
+Section: libdevel
+Depends: libvtkgdcm3.0 (= ${binary:Version}),
+ libgdcm-dev,
+ ${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
@@ -138,9 +154,12 @@ Description: Grassroots DICOM VTK development libraries and headers
against libvtkgdcm.
Package: libvtkgdcm-cil
-Section: cli-mono
Architecture: @DEB_MONO_ARCHS@
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libgdcm3.0 (= ${binary:Version})
+Section: cli-mono
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${cli:Depends},
+ libgdcm3.0 (= ${binary:Version})
Suggests: libgdcm-cil
Description: Grassroots DICOM VTK CLI bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -150,11 +169,14 @@ Description: Grassroots DICOM VTK CLI bindings
VTK CLI bindings to the GDCM DICOM library.
Package: python3-vtkgdcm
-Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libvtkgdcm3.0 (= ${binary:Version})
-Provides: ${python:Provides}
+Section: python
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${python3:Depends},
+ libvtkgdcm3.0 (= ${binary:Version})
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
@@ -164,9 +186,10 @@ Description: Grassroots DICOM VTK/Python bindings
Package: libvtkgdcm-tools
Architecture: any
-Section: utils
Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Section: utils
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Suggests: libgdcm-tools
Description: Grassroots DICOM VTK tools and utilities
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -180,7 +203,9 @@ Description: Grassroots DICOM VTK tools and utilities
Package: gdcm-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}, vtk6-doc, doc-base
+Depends: ${misc:Depends},
+ vtk7-doc,
+ doc-base
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
@@ -189,9 +214,11 @@ Description: Grassroots DICOM documentation
This is the documentation for gdcm and vtkgdcm
Package: libgdcm-java
+Architecture: amd64 arm64 armel armhf i386 mips64el mipsel ppc64el s390x alpha ia64 m68k powerpc ppc64 riscv64 sh4 sparc64 x32
Section: java
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${java:Depends}
Suggests: java-virtual-machine
Description: Grassroots DICOM Java bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -202,9 +229,12 @@ Description: Grassroots DICOM Java bindings
GDCM from Java environment.
Package: libvtkgdcm-java
-Section: java
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}, libgdcm3.0 (= ${binary:Version})
+Section: java
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${java:Depends},
+ libgdcm3.0 (= ${binary:Version})
Suggests: libgdcm-java
Description: Grassroots DICOM VTK Java bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -212,4 +242,3 @@ Description: Grassroots DICOM VTK Java bindings
RAW,JPEG (lossy/lossless),J2K,JPEG-LS, RLE and deflated.
.
VTK Java bindings to the GDCM DICOM library.
-
=====================================
debian/copyright
=====================================
@@ -133,7 +133,7 @@ License: BSD-3-clause-alike-Mathieu-Malaterre
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
- .
+ .
1. Redistributions of source code must retain the copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the copyright
@@ -175,7 +175,7 @@ License: BSD-3-clause-alike-Alexander-Chemeris
EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -276,7 +276,7 @@ Copyright: 2002-2014, Universite catholique de Louvain (UCL), Belgium
2005, Herve Drolon, FreeImage Team
2002-2003, Yannick Verschueren
2001-2003, David Janssens
- 2011-2012, Centre National d'Etudes Spatiales (CNES), France
+ 2011-2012, Centre National d'Etudes Spatiales (CNES), France
2012, CS Systemes d'Information, France
License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
=====================================
debian/rules
=====================================
@@ -2,7 +2,7 @@
# export DH_VERBOSE=1
-# results in linking error
+# results in linking error
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
@@ -28,14 +28,19 @@ endif
export LD_LIBRARY_PATH
DEFAULT_JAVA_VERSION=1.8
-ifeq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH),hppa hurd-i386))
- DEFAULT_JAVA_VERSION=1.5
-endif
+ifeq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH),hppa hurd-i386 kfreebsd-i386 kfreebsd-amd64))
+ DEFAULT_JAVA_VERSION=
+endif
+
+ifneq ($(DEFAULT_JAVA_VERSION),)
+CMAKE_EXTRA_FLAGS += -DGDCM_WRAP_JAVA:BOOL=ON \
+ -DGDCM_DEFAULT_JAVA_VERSION:STRING=$(DEFAULT_JAVA_VERSION)
+endif
# set JAVA path on arm, doesn't seem to find it otherwise
ifeq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH),armhf armel arm64 powerpc ppc64el))
export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-$(DEB_BUILD_ARCH)
-endif
+endif
# deduce documentation option (build-indep target)
@@ -65,8 +70,6 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
-DGDCM_WRAP_PYTHON:BOOL=ON \
-DGDCM_WRAP_CSHARP:BOOL=$(DEB_WRAP_CSHARP) \
- -DGDCM_WRAP_JAVA:BOOL=ON \
- -DGDCM_DEFAULT_JAVA_VERSION:STRING=$(DEFAULT_JAVA_VERSION) \
-DGDCM_WRAP_PHP:BOOL=OFF \
-DGDCM_USE_PVRG:BOOL=ON \
-DGDCM_USE_SYSTEM_PVRG:BOOL=ON \
@@ -100,11 +103,11 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
override_dh_auto_configure:
dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
-override_dh_auto_build-indep:
+override_dh_auto_build-indep:
dh_auto_build -- DoxygenDoc vtkgdcmDoxygenDoc
-override_dh_auto_build-arch:
- dh_auto_build
+override_dh_auto_build-arch:
+ dh_auto_build
override_dh_auto_install-arch:
# See #664188
@@ -127,20 +130,20 @@ override_dh_auto_install-arch:
mv debian/tmp/usr/lib/python debian/tmp/$(PYMODDIR)
#mv debian/tmp/usr/lib/_gdcmswig.so* debian/tmp/$(PYMODDIR)/dist-packages/
-ifeq ($(DEB_WRAP_CSHARP), 1)
+ifeq ($(DEB_WRAP_CSHARP), 1)
#Csharp correct file name (Why did it change on most archs, and why not on kFreeBSD?)
test -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgdcmsharpglue.so || \
mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gdcmsharpglue.so debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgdcmsharpglue.so
endif
-override_dh_auto_install-indep:
- DESTDIR=$(CURDIR)/debian/tmp/ cmake --build obj-* --target Utilities/doxygen/install
+override_dh_auto_install-indep:
+ DESTDIR=$(CURDIR)/debian/tmp/ cmake --build obj-* --target Utilities/doxygen/install
#override_dh_auto_install-arch:
# dh_install --list-missing
override_dh_strip_nondeterminism:
- dh_strip_nondeterminism -Xsharp
+ dh_strip_nondeterminism -Xsharp
override_dh_clideps:
ifeq ($(DEB_WRAP_CSHARP), 1)
@@ -149,8 +152,14 @@ endif
# No tests needed for docs
override_dh_auto_test-indep:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ echo "No tests needed for docs"
+endif
override_dh_auto_test-arch:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ echo "Do not run build time tests for this package"
+endif
pkg_doc = gdcm-doc
pkg_exa = gdcm-examples
@@ -164,6 +173,3 @@ override_dh_compress:
debian/control: debian/control.in
sed -e"s/@PYVER@/$(PYVER)/g" -e "s/@DEB_MONO_ARCHS@/$(DEB_MONO_ARCHS)/g" $< > $@
-
-get-orig-source:
- uscan --verbose --force-download --rename
=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,4 @@
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
version=4
-http://sf.net/gdcm/ gdcm-(.+)\.tar\.bz2 debian uupdate
+https://sf.net/gdcm/ gdcm-(.+)\.tar\.bz2 debian uupdate
View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/compare/1f0ea817389967277b7c5e9f4b7152c7d941dd5a...71e1c7d8bd08a080b8c80a8d0952b45bc4ed331a
--
View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/compare/1f0ea817389967277b7c5e9f4b7152c7d941dd5a...71e1c7d8bd08a080b8c80a8d0952b45bc4ed331a
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/20200304/6f5b10b9/attachment-0001.html>
More information about the debian-med-commit
mailing list