[med-svn] [Git][med-team/gdcm][master] 21 commits: Update changelog
Gert Wollny
gitlab at salsa.debian.org
Sat Sep 8 11:55:12 BST 2018
Gert Wollny pushed to branch master at Debian Med / gdcm
Commits:
d005b1da by Gert Wollny at 2018-06-30T09:55:24Z
Update changelog
- - - - -
61678534 by Gert Wollny at 2018-06-30T09:56:00Z
Move to vtk7 and python3
- - - - -
d271e555 by Gert Wollny at 2018-06-30T09:56:00Z
Update changelog for upload
- - - - -
f79430b5 by Gert Wollny at 2018-06-30T09:56:00Z
d/python-vtkgdcm Correct install files
- - - - -
d247ec03 by Gert Wollny at 2018-06-30T09:56:00Z
Update changelog for upload to experimental
- - - - -
44fc8445 by Gert Wollny at 2018-06-30T09:56:00Z
d/control: Set minimul version for python3-vtk7
- - - - -
8d888aac by Gert Wollny at 2018-06-30T09:57:09Z
d/changelog: upload to experimental with pyhon3 support
- - - - -
934fa2c3 by Gert Wollny at 2018-06-30T09:59:58Z
change upload version number
- - - - -
eb841da4 by Gert Wollny at 2018-06-30T09:59:58Z
d/p/gdcm-fix-xslt-maxdepth.patch set maxdeph Closes: #901519
- - - - -
7a0e7f41 by Gert Wollny at 2018-06-30T10:01:21Z
Update changelog
- - - - -
f856e96a by Gert Wollny at 2018-06-30T10:03:54Z
Update changelog for upload to experimental
- - - - -
7f3724f6 by Gert Wollny at 2018-06-30T10:05:03Z
Fix experimental version number
- - - - -
4a3b04b4 by Gert Wollny at 2018-06-30T10:05:54Z
d/p/series: Fix merge error
- - - - -
b2a6b562 by Gert Wollny at 2018-06-30T10:09:06Z
Make CI use experimental
- - - - -
f1a67d09 by Gert Wollny at 2018-06-30T12:50:11Z
d/rules: Correct python mod dir
- - - - -
8d577bbf by Gert Wollny at 2018-06-30T15:41:29Z
d/rules: Correct python mod dir
- - - - -
383d9a64 by Gert Wollny at 2018-06-30T16:20:04Z
correct version number
- - - - -
83990918 by Gert Wollny at 2018-08-25T17:12:28Z
Merge branch 'experimental'
- - - - -
fd67e679 by Gert Wollny at 2018-08-25T17:14:48Z
Update changelog
- - - - -
dd4f5d00 by Gert Wollny at 2018-09-08T10:52:30Z
d/control.in: Depend on python3 versions of packages
- - - - -
de0205d6 by Gert Wollny at 2018-09-08T10:54:14Z
Prepare new upload
- - - - -
13 changed files:
- debian/.gitlab-ci.yml
- debian/changelog
- debian/control
- debian/control.in
- debian/patches/03_linkvtkdoc.patch
- + debian/patches/add_cxx11_vtk_defines.patch
- debian/patches/series
- − debian/python-gdcm.install
- − debian/python-vtkgdcm.install
- + debian/python3-gdcm.install
- + debian/python3-vtkgdcm.install
- debian/python-vtkgdcm.lintian-overrides → debian/python3-vtkgdcm.lintian-overrides
- debian/rules
Changes:
=====================================
debian/.gitlab-ci.yml
=====================================
@@ -8,7 +8,7 @@ build:
script:
- git checkout pristine-tar
- git pull
- - git checkout master
+ - git checkout experimental
- git pull
# silence build to not exceed build log size of gitlab-ci
- gbp buildpackage -uc -us 2>&1 >../build.log
=====================================
debian/changelog
=====================================
@@ -1,9 +1,20 @@
-gdcm (2.8.7-1.1) UNRELEASED; urgency=medium
+
+gdcm (2.8.7-2) UNRELEASED; urgency=medium
[ Andreas Tille ]
* Remove myself from Uploaders
+
+ [ Gert Wollny ]
+ * switch to python3 Closes: #906535
+ * d/control.in: Depend on python3 versions of packages
+
+ -- Gert Wollny <gewo at debian.org> Sat, 08 Sep 2018 12:53:00 +0200
+
+gdcm (2.8.7-1python3exp1) experimental; urgency=medium
- -- Andreas Tille <tille at debian.org> Sat, 18 Aug 2018 07:22:27 +0200
+ * Experimental upload with python3 support
+
+ -- Gert Wollny <gewo at debian.org> Sat, 30 Jun 2018 12:02:59 +0200
gdcm (2.8.7-1) unstable; urgency=medium
@@ -13,7 +24,7 @@ gdcm (2.8.7-1) unstable; urgency=medium
-- Gert Wollny <gewo at debian.org> Sat, 30 Jun 2018 11:41:20 +0200
-gdcm (2.8.6-3) unstable; urgency=medium
+gdcm (2.8.6-2) unstable; urgency=medium
* d/p/gdcm-fix-xslt-maxdepth.patch set maxdeph Closes: #901519
* d/control: remove useless python version field
@@ -40,6 +51,20 @@ gdcm (2.8.6-1) unstable; urgency=medium
-- Gert Wollny <gewo at debian.org> Sun, 29 Apr 2018 10:30:49 +0200
+gdcm (2.8.5-1~exp1) experimental; urgency=medium
+
+ * Move to vtk7 and python3
+ * New upstream version 2.8.5
+ * d/gdcm-doc.doc-base: Update version umber in pdf file
+
+ -- Gert Wollny <gewo at debian.org> Tue, 10 Apr 2018 09:04:33 +0200
+
+gdcm (2.8.4-2) unstable; urgency=medium
+
+ * d/rules: update default java version on all archs
+
+ -- Gert Wollny <gewo at debian.org> Mon, 02 Apr 2018 19:12:36 +0200
+
gdcm (2.8.4-1) unstable; urgency=medium
* New upstream version 2.8.4
=====================================
debian/control
=====================================
@@ -10,23 +10,23 @@ Build-Depends: cmake (>= 2.8.9),
default-jdk,
dh-strip-nondeterminism,
dh-python,
- python-all-dev,
+ python3-all-dev,
pvrg-jpeg,
uuid-dev,
libz-dev,
libexpat-dev,
swig3.0,
javahelper,
- libvtk6-dev,
+ libvtk7-dev,
libcharls-dev (>= 1.1.0),
libopenjp2-7-dev,
- libvtk6-java,
+ libvtk7-java,
libxml2-dev,
libjson-c-dev,
libpoppler-private-dev,
libssl-dev,
ninja-build,
- python-vtk6,
+ python3-vtk7 (>= 7.1.1-1~exp4),
castxml,
libsocket++-dev,
libpapyrus3-dev,
@@ -34,7 +34,7 @@ Build-Depends: cmake (>= 2.8.9),
mono-devel (>= 2.10.5) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 ppc64el s390x arm64],
xsltproc,
docbook-xsl-ns
-Build-Depends-Indep: vtk6-doc,
+Build-Depends-Indep: vtk7-doc,
doxygen,
doxygen-latex,
ghostscript,
@@ -99,10 +99,10 @@ Description: Grassroots DICOM CLI bindings
CLI bindings to the GDCM DICOM library. It allows developers to use
GDCM from C# environment.
-Package: python-gdcm
+Package: python3-gdcm
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libgdcm2.8 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libgdcm2.8 (= ${binary:Version})
Provides: ${python:Provides}
Description: Grassroots DICOM Python bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -149,12 +149,12 @@ Description: Grassroots DICOM VTK CLI bindings
.
VTK CLI bindings to the GDCM DICOM library.
-Package: python-vtkgdcm
+Package: python3-vtkgdcm
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvtkgdcm2.8 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libvtkgdcm2.8 (= ${binary:Version})
Provides: ${python:Provides}
-Suggests: python-gdcm
+Suggests: python3-gdcm
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
=====================================
debian/control.in
=====================================
@@ -10,23 +10,23 @@ Build-Depends: cmake (>= 2.8.9),
default-jdk,
dh-strip-nondeterminism,
dh-python,
- python-all-dev,
+ python3-all-dev,
pvrg-jpeg,
uuid-dev,
libz-dev,
libexpat-dev,
swig3.0,
javahelper,
- libvtk6-dev,
+ libvtk7-dev,
libcharls-dev (>= 1.1.0),
libopenjp2-7-dev,
- libvtk6-java,
+ libvtk7-java,
libxml2-dev,
libjson-c-dev,
libpoppler-private-dev,
libssl-dev,
ninja-build,
- python-vtk6,
+ python3-vtk7 (>= 7.1.1-1~exp4),
castxml,
libsocket++-dev,
libpapyrus3-dev,
@@ -34,14 +34,13 @@ Build-Depends: cmake (>= 2.8.9),
mono-devel (>= 2.10.5) [@DEB_MONO_ARCHS@],
xsltproc,
docbook-xsl-ns
-Build-Depends-Indep: vtk6-doc,
+Build-Depends-Indep: vtk7-doc,
doxygen,
doxygen-latex,
ghostscript,
graphviz
Build-Conflicts: libopenjpeg-dev
Standards-Version: 4.1.4
-X-Python-Version: @PYVER@
Vcs-Browser: https://salsa.debian.org/med-team/gdcm
Vcs-Git: https://salsa.debian.org/med-team/gdcm.git
Homepage: http://gdcm.sourceforge.net/
@@ -100,10 +99,10 @@ Description: Grassroots DICOM CLI bindings
CLI bindings to the GDCM DICOM library. It allows developers to use
GDCM from C# environment.
-Package: python-gdcm
+Package: python3-gdcm
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libgdcm2.8 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libgdcm2.8 (= ${binary:Version})
Provides: ${python:Provides}
Description: Grassroots DICOM Python bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -150,12 +149,12 @@ Description: Grassroots DICOM VTK CLI bindings
.
VTK CLI bindings to the GDCM DICOM library.
-Package: python-vtkgdcm
+Package: python3-vtkgdcm
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvtkgdcm2.8 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libvtkgdcm2.8 (= ${binary:Version})
Provides: ${python:Provides}
-Suggests: python-gdcm
+Suggests: python3-gdcm
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
=====================================
debian/patches/03_linkvtkdoc.patch
=====================================
@@ -1,6 +1,5 @@
-Description: Correct use of scripts from vtk6-doc
- In vtk6-doc these scripts are installed compresses. The patch
- takes care of providing uncompressed versions.
+Description: Correct use of scripts from vtk7-doc
+ In vtk7-doc these scripts are installed uncompressed.
In addition the patch changes the vtk doxygen source directory and
incorporates an patch to link to the VTK doc and replace PNG by SVG,
Merged to one patch because they overlap partially.
@@ -25,8 +24,8 @@ Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
- set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk-doc/html")
- elseif(EXISTS "/usr/share/doc/vtk6-doc/doxygen")
- set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk6-doc/doxygen")
-+ if(EXISTS "/usr/share/vtk-6.3/doxygen")
-+ set(DOXYGEN_SOURCE_DIR "/usr/share/vtk-6.3/doxygen")
++ if(EXISTS "/usr/share/vtk-7.1/doxygen")
++ set(DOXYGEN_SOURCE_DIR "/usr/share/vtk-7.1/doxygen")
else()
- message(WARNING "DOXYGEN_SOURCE_DIR need to be set.")
+ message("DOXYGEN_SOURCE_DIR need to be set.")
=====================================
debian/patches/add_cxx11_vtk_defines.patch
=====================================
@@ -0,0 +1,34 @@
+Author: Gert Wollny <gewo at debian.org>
+Description: Add VTK defines for C++11 constructs to the swig interface file
+--- a/Utilities/VTK/vtkgdcm.i
++++ b/Utilities/VTK/vtkgdcm.i
+@@ -31,12 +31,17 @@
+ #endif
+
+ %{
+-//#define VTK_MAJOR_VERSION 6
+-//#define VTK_MINOR_VERSION 2
+-//#define VTK_BUILD_VERSION 0
+-//#define VTK_VERSION "6.2.0"
++//#define VTK_MAJOR_VERSION 7
++//#define VTK_MINOR_VERSION 1
++//#define VTK_BUILD_VERSION 1
++//#define VTK_VERSION "7.1.1"
+ %}
+
++#define VTK_OVERRIDE override
++#define VTK_FINAL final
++#define VTK_DELETE_FUNCTION = delete
++#define VTK_NEWINSTANCE
++#define VTK_LEGACY(X)
+
+ %{
+ // Let's reproduce the stack of include, when one would include vtkSetGet:
+@@ -118,7 +123,6 @@
+ #endif
+
+
+-
+ #define GDCM_EXPORT
+ #define VTK_EXPORT
+ #define VTK_COMMON_EXPORT
=====================================
debian/patches/series
=====================================
@@ -6,5 +6,5 @@ unforce_cxx98.patch
use_swig_add_library_for_csharp.patch
enable_ninja_build.patch
gdcm-fix-xslt-maxdepth.patch
-
fix-vtkjava-build-dir.patch
+add_cxx11_vtk_defines.patch
=====================================
debian/python-gdcm.install deleted
=====================================
@@ -1,3 +0,0 @@
-usr/lib/python*/dist-packages/gdcm.py
-usr/lib/python*/dist-packages/gdcmswig.py
-usr/lib/python*/dist-packages/_gdcmswig.so*
=====================================
debian/python-vtkgdcm.install deleted
=====================================
@@ -1,3 +0,0 @@
-usr/lib/python*/dist-packages/vtkgdcm.py
-usr/lib/python*/dist-packages/libvtkgdcmPython.so*
-usr/lib/*/libvtkgdcmPythonD.so*
=====================================
debian/python3-gdcm.install
=====================================
@@ -0,0 +1,3 @@
+usr/lib/python3*/dist-packages/gdcm.py
+usr/lib/python3*/dist-packages/gdcmswig.py
+usr/lib/python3*/dist-packages/_gdcmswig.so*
=====================================
debian/python3-vtkgdcm.install
=====================================
@@ -0,0 +1,2 @@
+usr/lib/python3*/dist-packages/vtkgdcm*
+usr/lib/*/libvtkgdcmPythonD.so*
=====================================
debian/python-vtkgdcm.lintian-overrides → debian/python3-vtkgdcm.lintian-overrides
=====================================
@@ -1,11 +1,11 @@
#
# This is a C++ library, using symbols files here is quite a challange
#
-python-vtkgdcm: no-symbols-control-file
+python3-vtkgdcm: no-symbols-control-file
# This package provids a helper library for Python bindings
-python-vtkgdcm: package-name-doesnt-match-sonames
+python3-vtkgdcm: package-name-doesnt-match-sonames
# This seems to be needed for the python module
-python-vtkgdcm: non-dev-pkg-with-shlib-symlink
+python3-vtkgdcm: non-dev-pkg-with-shlib-symlink
=====================================
debian/rules
=====================================
@@ -46,11 +46,11 @@ else
endif
%:
- dh $@ $(WITH_CLI) --with python2 --with javahelper --buildsystem=cmake+ninja
+ dh $@ $(WITH_CLI) --with python3 --with javahelper --buildsystem=cmake+ninja
-PYVER := $(shell pyversions -dv)
-PYMODDIR := /usr/lib/$(shell pyversions -r)
-VTKVERS=$(shell apt-cache policy libvtk6-dev | grep "Installed:" | cut -d: -f2 | cut -d' ' -f2 | cut -d- -f1 | cut -d. -f1-2)
+PYVER := $(shell py3versions -dv)
+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)
# GDCM_DOCUMENTATION:BOOL=ON is required to build man page (build target)
# Need to make sure to build using the same vtk/python version:
@@ -94,7 +94,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
-DGDCM_NO_VTKJAVA_LIBS_LINKING:BOOL=ON \
-DGDCM_INSTALL_LIB_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \
-DGDCM_USE_VTK:BOOL=ON \
- -DVTK_JAVA_JAR=/usr/share/java/vtk6.jar
+ -DVTK_JAVA_JAR=/usr/share/java/vtk7.jar
override_dh_auto_configure:
View it on GitLab: https://salsa.debian.org/med-team/gdcm/compare/1f311020b18255b1037ff49275703664abfe0e85...de0205d6a828d913586bbe37837eb6de005ef6b4
--
View it on GitLab: https://salsa.debian.org/med-team/gdcm/compare/1f311020b18255b1037ff49275703664abfe0e85...de0205d6a828d913586bbe37837eb6de005ef6b4
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/20180908/1ef33389/attachment-0001.html>
More information about the debian-med-commit
mailing list