[med-svn] r20269 - in trunk/packages/gdcm/trunk/debian: . patches source
Gert Wollny
gert-guest at moszumanska.debian.org
Sat Oct 17 13:22:20 UTC 2015
Author: gert-guest
Date: 2015-10-17 13:22:20 +0000 (Sat, 17 Oct 2015)
New Revision: 20269
Added:
trunk/packages/gdcm/trunk/debian/gdcm-doc.lintian-overrides
trunk/packages/gdcm/trunk/debian/libgdcm2.6.docs
trunk/packages/gdcm/trunk/debian/libgdcm2.6.install
trunk/packages/gdcm/trunk/debian/libgdcm2.6.lintian-overrides
trunk/packages/gdcm/trunk/debian/libvtkgdcm.lintian-override
trunk/packages/gdcm/trunk/debian/libvtkgdcm2.6.install
trunk/packages/gdcm/trunk/debian/libvtkgdcm2.6.lintian-overrides
trunk/packages/gdcm/trunk/debian/patches/add-csharp-keyfile-from-commandline.patch
trunk/packages/gdcm/trunk/debian/patches/enable-vtk6-bindings.patch
trunk/packages/gdcm/trunk/debian/patches/vtkgdcm-sharp-siging.patch
trunk/packages/gdcm/trunk/debian/source/lintian-overrides
Removed:
trunk/packages/gdcm/trunk/debian/libgdcm2.4.docs
trunk/packages/gdcm/trunk/debian/libgdcm2.4.install
trunk/packages/gdcm/trunk/debian/libgdcm2.4.lintian-overrides
trunk/packages/gdcm/trunk/debian/libvtkgdcm2.4.install
Modified:
trunk/packages/gdcm/trunk/debian/changelog
trunk/packages/gdcm/trunk/debian/control
trunk/packages/gdcm/trunk/debian/control.in
trunk/packages/gdcm/trunk/debian/copyright
trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base
trunk/packages/gdcm/trunk/debian/gdcm-doc.docs
trunk/packages/gdcm/trunk/debian/gdcm-doc.install
trunk/packages/gdcm/trunk/debian/libgdcm-cil.install
trunk/packages/gdcm/trunk/debian/libgdcm-cil.installcligac
trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install
trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.installcligac
trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch
trunk/packages/gdcm/trunk/debian/patches/linkvtkdoc.patch
trunk/packages/gdcm/trunk/debian/patches/series
trunk/packages/gdcm/trunk/debian/patches/toplevelskip.patch
trunk/packages/gdcm/trunk/debian/python-vtkgdcm.lintian-overrides
trunk/packages/gdcm/trunk/debian/rules
Log:
merge prepare-2.6 to main branch
Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/changelog 2015-10-17 13:22:20 UTC (rev 20269)
@@ -1,8 +1,27 @@
-gdcm (2.4.4-5) UNRELEASED; urgency=medium
+gdcm (2.6.0-1) UNRELEASED; urgency=medium
+ [Gert Wollny]
+ * new upstream version. Closes: #797738
+ * Apply patch provided by Mathieu (see below) Closes: #797673
+ * d/* update all files to use 2.6 instead of 2.4
+ * Transition to use vtk6, Related: #798164
+ * remove java bindings because they depend on libvtk*-java but
+ vtk6 currently doesn't provide these bindings
+ * Add patch enable-vtk6-bindings.patch to correct bindings for VTK6
+ * Add patch linkvtkdoc.patch to use compressed vtk6-doc helpers
+ Related: #751395, #751412
+ * Add patches to properly sign C# files
+ * d/copyright Remove license for Utilities/charls because it is not
+ there
+ * add dependency on dh-python, Closes: #797655
+
+ [Mathieu Malaterre]
+ * Do not use activiz.net anymore
+
+ [Andreas Tille]
* Switched to Sébastien Jodogne's correct e-mail
- -- Andreas Tille <tille at debian.org> Fri, 07 Aug 2015 10:45:58 +0200
+ -- Gert Wollny <gw.fossdev at gmail.com> Fri, 16 Oct 2015 18:21:58 +0200
gdcm (2.4.4-4) unstable; urgency=medium
Modified: trunk/packages/gdcm/trunk/debian/control
===================================================================
--- trunk/packages/gdcm/trunk/debian/control 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/control 2015-10-17 13:22:20 UTC (rev 20269)
@@ -4,24 +4,45 @@
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Andreas Tille <tille at debian.org>,
Steve M. Robbins <smr at debian.org>,
- Sébastien Jodogne <s.jodogne at gmail.com>
-Build-Depends: debhelper (>= 9), python-all-dev, libvtk-java, pvrg-jpeg,
- uuid-dev, libz-dev, libexpat-dev, doxygen,
- swig (>= 2.0.7), cmake (>= 2.8.9), libvtk5-dev, libcharls-dev, javahelper,
- libopenjpeg-dev, default-jdk, php5-dev, php5-cli, libxml2-dev, libjson-c-dev,
- libpoppler-private-dev, libssl-dev, python-vtk, castxml, libsocket++-dev, libpapyrus3-dev,
- libactiviz.net-cil [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x],
- mummy [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x],
- cli-common-dev (>= 0.8~) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x],
- mono-devel (>= 2.10.5) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x]
-Build-Depends-Indep: vtk-doc, doxygen-latex, ghostscript, graphviz
+ Sébastien Jodogne <s.jodogne at gmail.com>,
+ Gert Wollny <gw.fossdev at gmail.com>
+Build-Depends: debhelper (>= 9),
+ dh-strip-nondeterminism,
+ dh-python,
+ python-all-dev,
+ pvrg-jpeg,
+ uuid-dev,
+ libz-dev,
+ libexpat-dev,
+ doxygen,
+ swig3.0,
+ cmake (>= 2.8.9),
+ libvtk6-dev,
+ libcharls-dev,
+ libopenjpeg-dev,
+ php5-dev,
+ php5-cli,
+ libxml2-dev,
+ libjson-c-dev,
+ libpoppler-private-dev,
+ libssl-dev,
+ python-vtk6,
+ castxml,
+ libsocket++-dev,
+ libpapyrus3-dev,
+ cli-common-dev (>= 0.9) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x],
+ mono-devel (>= 2.10.5) [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x]
+Build-Depends-Indep: vtk6-doc,
+ doxygen-latex,
+ ghostscript,
+ graphviz
Standards-Version: 3.9.6
X-Python-Version: 2.7
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/gdcm/trunk/
Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/gdcm/trunk/
Homepage: http://gdcm.sourceforge.net/
-Package: libgdcm2.4
+Package: libgdcm2.6
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -53,7 +74,7 @@
Package: libgdcm2-dev
Section: libdevel
Architecture: any
-Depends: libgdcm2.4 (= ${binary:Version}), ${misc:Depends}
+Depends: libgdcm2.6 (= ${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
@@ -63,12 +84,12 @@
GDCM, but are needed to build plugins or programs that link against
libgdcm.
-Package: libgdcm2.4-dbg
+Package: libgdcm2.6-dbg
Architecture: any
Section: debug
Priority: extra
Multi-Arch: same
-Depends: libgdcm2.4 (= ${binary:Version}), ${misc:Depends}
+Depends: libgdcm2.6 (= ${binary:Version}), ${misc:Depends}
Description: Grassroots DICOM runtime libraries, debug version
Grassroots DiCoM is a C++ library for DICOM medical files. It is
automatically wrapped to python/C#/Java (using swig). It supports
@@ -101,23 +122,10 @@
PHP5 bindings to the GDCM DICOM library. It allows developers to use
GDCM from PHP5 environment.
-Package: libgdcm-java
-Section: java
-Architecture: any
-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
- 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.
-
Package: python-gdcm
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libgdcm2.4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libgdcm2.6 (= ${binary:Version})
Provides: ${python:Provides}
Description: Grassroots DICOM Python bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -126,7 +134,7 @@
.
Python bindings to the GDCM DICOM library.
-Package: libvtkgdcm2.4
+Package: libvtkgdcm2.6
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -142,7 +150,7 @@
Package: libvtkgdcm2-dev
Section: libdevel
Architecture: any
-Depends: libvtkgdcm2.4 (= ${binary:Version}), libgdcm2-dev, ${misc:Depends}
+Depends: libvtkgdcm2.6 (= ${binary:Version}), libgdcm2-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
@@ -155,7 +163,7 @@
Package: libvtkgdcm-cil
Section: cli-mono
Architecture: amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 s390x
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libgdcm2.4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libgdcm2.6 (= ${binary:Version})
Suggests: libgdcm-cil
Description: Grassroots DICOM VTK CLI bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -167,7 +175,7 @@
Package: php5-vtkgdcm
Section: php
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, libgdcm2.4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, libgdcm2.6 (= ${binary:Version})
Suggests: php-gdcm
Description: Grassroots DICOM VTK PHP bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -176,22 +184,10 @@
.
VTK PHP bindings to the GDCM DICOM library.
-Package: libvtkgdcm-java
-Section: java
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}, libgdcm2.4 (= ${binary:Version})
-Suggests: libgdcm-java
-Description: Grassroots DICOM VTK 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.
- .
- VTK Java bindings to the GDCM DICOM library.
-
Package: python-vtkgdcm
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvtkgdcm2.4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvtkgdcm2.6 (= ${binary:Version})
Provides: ${python:Provides}
Suggests: python-gdcm
Description: Grassroots DICOM VTK/Python bindings
Modified: trunk/packages/gdcm/trunk/debian/control.in
===================================================================
--- trunk/packages/gdcm/trunk/debian/control.in 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/control.in 2015-10-17 13:22:20 UTC (rev 20269)
@@ -4,24 +4,45 @@
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Andreas Tille <tille at debian.org>,
Steve M. Robbins <smr at debian.org>,
- Sébastien Jodogne <s.jodogne at gmail.com>
-Build-Depends: debhelper (>= 9), python-all-dev, libvtk-java, pvrg-jpeg,
- uuid-dev, libz-dev, libexpat-dev, doxygen,
- swig (>= 2.0.7), cmake (>= 2.8.9), libvtk5-dev, libcharls-dev, javahelper,
- libopenjpeg-dev, default-jdk, php5-dev, php5-cli, libxml2-dev, libjson-c-dev,
- libpoppler-private-dev, libssl-dev, python-vtk, castxml, libsocket++-dev, libpapyrus3-dev,
- libactiviz.net-cil [@DEB_MONO_ARCHS@],
- mummy [@DEB_MONO_ARCHS@],
- cli-common-dev (>= 0.8~) [@DEB_MONO_ARCHS@],
- mono-devel (>= 2.10.5) [@DEB_MONO_ARCHS@]
-Build-Depends-Indep: vtk-doc, doxygen-latex, ghostscript, graphviz
+ Sébastien Jodogne <s.jodogne at gmail.com>,
+ Gert Wollny <gw.fossdev at gmail.com>
+Build-Depends: debhelper (>= 9),
+ dh-strip-nondeterminism,
+ dh-python,
+ python-all-dev,
+ pvrg-jpeg,
+ uuid-dev,
+ libz-dev,
+ libexpat-dev,
+ doxygen,
+ swig3.0,
+ cmake (>= 2.8.9),
+ libvtk6-dev,
+ libcharls-dev,
+ libopenjpeg-dev,
+ php5-dev,
+ php5-cli,
+ libxml2-dev,
+ libjson-c-dev,
+ libpoppler-private-dev,
+ libssl-dev,
+ python-vtk6,
+ castxml,
+ libsocket++-dev,
+ libpapyrus3-dev,
+ cli-common-dev (>= 0.9) [@DEB_MONO_ARCHS@],
+ mono-devel (>= 2.10.5) [@DEB_MONO_ARCHS@]
+Build-Depends-Indep: vtk6-doc,
+ doxygen-latex,
+ ghostscript,
+ graphviz
Standards-Version: 3.9.6
X-Python-Version: @PYVER@
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/gdcm/trunk/
Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/gdcm/trunk/
Homepage: http://gdcm.sourceforge.net/
-Package: libgdcm2.4
+Package: libgdcm2.6
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -53,7 +74,7 @@
Package: libgdcm2-dev
Section: libdevel
Architecture: any
-Depends: libgdcm2.4 (= ${binary:Version}), ${misc:Depends}
+Depends: libgdcm2.6 (= ${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
@@ -63,12 +84,12 @@
GDCM, but are needed to build plugins or programs that link against
libgdcm.
-Package: libgdcm2.4-dbg
+Package: libgdcm2.6-dbg
Architecture: any
Section: debug
Priority: extra
Multi-Arch: same
-Depends: libgdcm2.4 (= ${binary:Version}), ${misc:Depends}
+Depends: libgdcm2.6 (= ${binary:Version}), ${misc:Depends}
Description: Grassroots DICOM runtime libraries, debug version
Grassroots DiCoM is a C++ library for DICOM medical files. It is
automatically wrapped to python/C#/Java (using swig). It supports
@@ -101,23 +122,10 @@
PHP5 bindings to the GDCM DICOM library. It allows developers to use
GDCM from PHP5 environment.
-Package: libgdcm-java
-Section: java
-Architecture: any
-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
- 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.
-
Package: python-gdcm
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libgdcm2.4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libgdcm2.6 (= ${binary:Version})
Provides: ${python:Provides}
Description: Grassroots DICOM Python bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -126,7 +134,7 @@
.
Python bindings to the GDCM DICOM library.
-Package: libvtkgdcm2.4
+Package: libvtkgdcm2.6
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -142,7 +150,7 @@
Package: libvtkgdcm2-dev
Section: libdevel
Architecture: any
-Depends: libvtkgdcm2.4 (= ${binary:Version}), libgdcm2-dev, ${misc:Depends}
+Depends: libvtkgdcm2.6 (= ${binary:Version}), libgdcm2-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
@@ -155,7 +163,7 @@
Package: libvtkgdcm-cil
Section: cli-mono
Architecture: @DEB_MONO_ARCHS@
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libgdcm2.4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, libgdcm2.6 (= ${binary:Version})
Suggests: libgdcm-cil
Description: Grassroots DICOM VTK CLI bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -167,7 +175,7 @@
Package: php5-vtkgdcm
Section: php
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, libgdcm2.4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, libgdcm2.6 (= ${binary:Version})
Suggests: php-gdcm
Description: Grassroots DICOM VTK PHP bindings
Grassroots DiCoM is a C++ library for DICOM medical files. It is
@@ -176,22 +184,10 @@
.
VTK PHP bindings to the GDCM DICOM library.
-Package: libvtkgdcm-java
-Section: java
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}, libgdcm2.4 (= ${binary:Version})
-Suggests: libgdcm-java
-Description: Grassroots DICOM VTK 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.
- .
- VTK Java bindings to the GDCM DICOM library.
-
Package: python-vtkgdcm
Section: python
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvtkgdcm2.4 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvtkgdcm2.6 (= ${binary:Version})
Provides: ${python:Provides}
Suggests: python-gdcm
Description: Grassroots DICOM VTK/Python bindings
Modified: trunk/packages/gdcm/trunk/debian/copyright
===================================================================
--- trunk/packages/gdcm/trunk/debian/copyright 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/copyright 2015-10-17 13:22:20 UTC (rev 20269)
@@ -33,7 +33,6 @@
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.
-
Files: Source/MessageExchangeDefinition/gdcmARTIMTimer.cxx
Source/MessageExchangeDefinition/gdcmARTIMTimer.h
Source/MessageExchangeDefinition/gdcmBaseCompositeMessage.h
@@ -93,10 +92,6 @@
Copyright: Insight Software Consortium
License: Apache
-License: Apache
- On Debian GNU/Linux system you can find the complete text of the
- Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
-
Files: CMake/*.cmake
Copyright: 2006-2011 Mathieu Malaterre <mathieu.malaterre at gmail.com>
License: BSD-3-clause
@@ -124,24 +119,8 @@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Files: Utilities/gdcmjpeg/*
-Copyright: 1994-2004, OFFIS
-License: public-domain
- THIS SOFTWARE IS MADE AVAILABLE, AS IS, AND OFFIS MAKES NO WARRANTY
- REGARDING THE SOFTWARE, ITS PERFORMANCE, ITS MERCHANTABILITY OR
- FITNESS FOR ANY PARTICULAR USE, FREEDOM FROM ANY COMPUTER DISEASES OR
- ITS CONFORMITY TO ANY SPECIFICATION. THE ENTIRE RISK AS TO QUALITY AND
- PERFORMANCE OF THE SOFTWARE IS WITH THE USER.
- .
- Copyright of the software and supporting documentation is, unless
- otherwise stated, owned by OFFIS, and free access is hereby granted as
- a license to use this software, copy this software and prepare
- derivative works based upon this software. However, any distribution
- of this software source code or supporting documentation or derivative
- works (source code and supporting documentation) must include the
- three paragraphs of this copyright notice.
-
-Files: Utilities/gdcmjpeg/*
Copyright: 1991-1998, Thomas G. Lane.
+ 1991-1998, Thomas G. Lane.
License: BSD-3-clause
Permission is hereby granted to use, copy, modify, and distribute this
software (or portions thereof) for any purpose, without fee, subject to these
@@ -240,11 +219,14 @@
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
-
-Files: Utilities/gdcmopenjpeg/*
-Copyright: 2001-2002, David Janssens
- 2003, Yannick Verschueren
- 2003, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
+Files: Utilities/gdcmopenjpeg-v*/*
+Copyright: Copyright (c) 2002-2007, Communications and Remote Sensing Laboratory,
+ Universite catholique de Louvain (UCL), Belgium
+ 2002-2007, Professor Benoit Macq
+ 2001-2003, David Janssens
+ 2002-2003, Yannick Verschueren
+ 2003-2007, Francois-Olivier Devaux and Antonin Descampe
+ 2005, Herve Drolon, FreeImage Team
License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -267,34 +249,6 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-Files: Utilities/charls/*
-Copyright: 2007-2009, Jan de Vaan
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- .
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- .
- * Neither the name of my employer, nor the names of its contributors may be
- used to endorse or promote products derived from this software without
- specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS 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, 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.
-
Files: Utilities/gdcmuuid/*
Copyright: 1996, 1997 Theodore Ts'o.
License: BSD-3-clause
@@ -324,7 +278,6 @@
USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.
-
Files: Utilities/gdcmzlib/*
Copyright: 1995-2005 Jean-loup Gailly and Mark Adler
License: Zlib
@@ -442,3 +395,7 @@
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+
+License: Apache
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'.
Modified: trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.doc-base 2015-10-17 13:22:20 UTC (rev 20269)
@@ -9,4 +9,4 @@
Files: /usr/share/doc/gdcm-doc/html/*
Format: PDF
-Files: /usr/share/doc/gdcm-doc/gdcm-2.4.4.pdf
+Files: /usr/share/doc/gdcm-doc/gdcm-2.6.0.pdf
Modified: trunk/packages/gdcm/trunk/debian/gdcm-doc.docs
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.docs 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.docs 2015-10-17 13:22:20 UTC (rev 20269)
@@ -1,2 +1,2 @@
usr/share/doc/gdcm-*/html/
-usr/share/doc/gdcm-*/gdcm-2.4.4.pdf
+usr/share/doc/gdcm-*/gdcm-2*.pdf
Modified: trunk/packages/gdcm/trunk/debian/gdcm-doc.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.install 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.install 2015-10-17 13:22:20 UTC (rev 20269)
@@ -1,2 +1,2 @@
usr/share/doc/gdcm-*/html/
-usr/share/doc/gdcm-*/gdcm-2.4.4.pdf
+usr/share/doc/gdcm-*/gdcm-2*.pdf
Copied: trunk/packages/gdcm/trunk/debian/gdcm-doc.lintian-overrides (from rev 20268, trunk/packages/gdcm/prepare-2.6/debian/gdcm-doc.lintian-overrides)
===================================================================
--- trunk/packages/gdcm/trunk/debian/gdcm-doc.lintian-overrides (rev 0)
+++ trunk/packages/gdcm/trunk/debian/gdcm-doc.lintian-overrides 2015-10-17 13:22:20 UTC (rev 20269)
@@ -0,0 +1,5 @@
+# The embedded jquery.js is generated by Doxygen and can not be replaced
+# by the one provided by libjs-jquery.
+# For a racionale please see src::Doxygen/debian/README.jquery.
+
+gdcm-doc binary: embedded-javascript-library
Modified: trunk/packages/gdcm/trunk/debian/libgdcm-cil.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm-cil.install 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/libgdcm-cil.install 2015-10-17 13:22:20 UTC (rev 20269)
@@ -1,2 +1,2 @@
-usr/lib/*/gdcm-sharp.dll usr/lib/cli/gdcm-sharp-2.4
-usr/lib/*/libgdcmsharpglue.so usr/lib/cli/gdcm-sharp-2.4
+usr/lib/*/gdcm-sharp.dll usr/lib/cli/gdcm-sharp-2.6
+usr/lib/*/libgdcmsharpglue.so usr/lib/cli/gdcm-sharp-2.6
Modified: trunk/packages/gdcm/trunk/debian/libgdcm-cil.installcligac
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm-cil.installcligac 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/libgdcm-cil.installcligac 2015-10-17 13:22:20 UTC (rev 20269)
@@ -1 +1 @@
-/usr/lib/cli/gdcm-sharp-2.4/gdcm-sharp.dll
+/usr/lib/cli/gdcm-sharp-2.6/gdcm-sharp.dll
Deleted: trunk/packages/gdcm/trunk/debian/libgdcm2.4.docs
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2.4.docs 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2.4.docs 2015-10-17 13:22:20 UTC (rev 20269)
@@ -1 +0,0 @@
-README.txt
Deleted: trunk/packages/gdcm/trunk/debian/libgdcm2.4.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2.4.install 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2.4.install 2015-10-17 13:22:20 UTC (rev 20269)
@@ -1,2 +0,0 @@
-usr/lib/*/libgdcm*.so.*
-usr/share/gdcm-2.*/XML
Deleted: trunk/packages/gdcm/trunk/debian/libgdcm2.4.lintian-overrides
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2.4.lintian-overrides 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2.4.lintian-overrides 2015-10-17 13:22:20 UTC (rev 20269)
@@ -1 +0,0 @@
-libgdcm2.4: package-name-doesnt-match-sonames
Copied: trunk/packages/gdcm/trunk/debian/libgdcm2.6.docs (from rev 20268, trunk/packages/gdcm/prepare-2.6/debian/libgdcm2.6.docs)
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2.6.docs (rev 0)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2.6.docs 2015-10-17 13:22:20 UTC (rev 20269)
@@ -0,0 +1 @@
+README.txt
Copied: trunk/packages/gdcm/trunk/debian/libgdcm2.6.install (from rev 20268, trunk/packages/gdcm/prepare-2.6/debian/libgdcm2.6.install)
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2.6.install (rev 0)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2.6.install 2015-10-17 13:22:20 UTC (rev 20269)
@@ -0,0 +1,2 @@
+usr/lib/*/libgdcm*.so.*
+usr/share/gdcm-2.*/XML
Copied: trunk/packages/gdcm/trunk/debian/libgdcm2.6.lintian-overrides (from rev 20268, trunk/packages/gdcm/prepare-2.6/debian/libgdcm2.6.lintian-overrides)
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm2.6.lintian-overrides (rev 0)
+++ trunk/packages/gdcm/trunk/debian/libgdcm2.6.lintian-overrides 2015-10-17 13:22:20 UTC (rev 20269)
@@ -0,0 +1,7 @@
+# this is a multi-lib library package
+#
+libgdcm2.6: package-name-doesnt-match-sonames
+
+# This is a C++ library, using symbols files here is quite a challange
+libgdcm2.6: no-symbols-control-file
+
Modified: trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.install 2015-10-17 13:22:20 UTC (rev 20269)
@@ -1,2 +1,2 @@
-usr/lib/*/Kitware.VTK.GDCM.dll usr/lib/cli/vtkgdcm-sharp-2.4
-usr/lib/*/libKitware.VTK.vtkgdcm.Unmanaged.so usr/lib/cli/vtkgdcm-sharp-2.4
+usr/lib/*/vtkgdcm-sharp.dll usr/lib/cli/vtkgdcm-sharp-2.6
+usr/lib/*/libvtkgdcmsharpglue.so usr/lib/cli/vtkgdcm-sharp-2.6
Modified: trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.installcligac
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.installcligac 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm-cil.installcligac 2015-10-17 13:22:20 UTC (rev 20269)
@@ -1 +1 @@
-/usr/lib/cli/vtkgdcm-sharp-2.4/Kitware.VTK.GDCM.dll
+/usr/lib/cli/vtkgdcm-sharp-2.6/vtkgdcm-sharp.dll
Copied: trunk/packages/gdcm/trunk/debian/libvtkgdcm.lintian-override (from rev 20268, trunk/packages/gdcm/prepare-2.6/debian/libvtkgdcm.lintian-override)
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm.lintian-override (rev 0)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm.lintian-override 2015-10-17 13:22:20 UTC (rev 20269)
@@ -0,0 +1,2 @@
+# This is a C++ library, using symbols files here is quite a challange
+libvtkgdcm2.6: no-symbols-control-file
Deleted: trunk/packages/gdcm/trunk/debian/libvtkgdcm2.4.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm2.4.install 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm2.4.install 2015-10-17 13:22:20 UTC (rev 20269)
@@ -1 +0,0 @@
-usr/lib/*/libvtkgdcm.so.*
Copied: trunk/packages/gdcm/trunk/debian/libvtkgdcm2.6.install (from rev 20268, trunk/packages/gdcm/prepare-2.6/debian/libvtkgdcm2.6.install)
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm2.6.install (rev 0)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm2.6.install 2015-10-17 13:22:20 UTC (rev 20269)
@@ -0,0 +1 @@
+usr/lib/*/libvtkgdcm.so.*
Copied: trunk/packages/gdcm/trunk/debian/libvtkgdcm2.6.lintian-overrides (from rev 20268, trunk/packages/gdcm/prepare-2.6/debian/libvtkgdcm2.6.lintian-overrides)
===================================================================
--- trunk/packages/gdcm/trunk/debian/libvtkgdcm2.6.lintian-overrides (rev 0)
+++ trunk/packages/gdcm/trunk/debian/libvtkgdcm2.6.lintian-overrides 2015-10-17 13:22:20 UTC (rev 20269)
@@ -0,0 +1,4 @@
+
+# C++ library, Symbols files are really difficult here
+libvtkgdcm2.6: no-symbols-control-file
+
Copied: trunk/packages/gdcm/trunk/debian/patches/add-csharp-keyfile-from-commandline.patch (from rev 20268, trunk/packages/gdcm/prepare-2.6/debian/patches/add-csharp-keyfile-from-commandline.patch)
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/add-csharp-keyfile-from-commandline.patch (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/add-csharp-keyfile-from-commandline.patch 2015-10-17 13:22:20 UTC (rev 20269)
@@ -0,0 +1,36 @@
+Description: Correct the key handling for the gdcm-sharp module
+ This patch moves the addign of the key to the command line and
+ adds the signing of the module after it is build.
+Author: Gert Wollny <gw.fossdev at gmail.com>
+
+diff -ru gdcm-2.6.0.old/Wrapping/Csharp/AssemblyInfo.cs.in gdcm-2.6.0/Wrapping/Csharp/AssemblyInfo.cs.in
+--- gdcm-2.6.0.old/Wrapping/Csharp/AssemblyInfo.cs.in 2015-09-03 16:42:12.000000000 +0200
++++ gdcm-2.6.0/Wrapping/Csharp/AssemblyInfo.cs.in 2015-10-17 10:59:49.764531268 +0200
+@@ -70,7 +70,7 @@
+ // This is not required, if you don't want signing let these attributes like they're.
+ [assembly: AssemblyDelaySign(false)]
+ // http://msdn.microsoft.com/en-us/library/6f05ezxy(VS.80).aspx
+-[assembly: AssemblyKeyFile("key.snk")]
++//[assembly: AssemblyKeyFile("key.snk")]
+ //[assembly: AssemblyKeyFile("")]
+ //[assembly: AssemblyKeyName("GDCM Key")]
+ //[assembly: AssemblyKeyName("")]
+Nur in gdcm-2.6.0/Wrapping/Csharp/: AssemblyInfo.cs.in~.
+diff -ru gdcm-2.6.0.old/Wrapping/Csharp/CMakeLists.txt gdcm-2.6.0/Wrapping/Csharp/CMakeLists.txt
+--- gdcm-2.6.0.old/Wrapping/Csharp/CMakeLists.txt 2015-09-03 16:42:12.000000000 +0200
++++ gdcm-2.6.0/Wrapping/Csharp/CMakeLists.txt 2015-10-17 10:59:37.408588478 +0200
+@@ -69,11 +69,12 @@
+
+ add_custom_command(
+ OUTPUT ${GDCM_LIBRARY_DIR}/gdcm-sharp.dll
+- COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/doc:${GDCM_LIBRARY_DIR}/gdcm-sharp.dll.xml" "/out:${GDCM_LIBRARY_DIR}/gdcm-sharp.dll" "*.cs"
++ COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/doc:${GDCM_LIBRARY_DIR}/gdcm-sharp.dll.xml" "/out:${GDCM_LIBRARY_DIR}/gdcm-sharp.dll" "*.cs" "/keyfile:key.snk"
++ COMMAND "/usr/bin/sn" "-R" "${GDCM_LIBRARY_DIR}/gdcm-sharp.dll" "${CMAKE_CURRENT_SOURCE_DIR}/key.snk"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS "${swig_generated_file_fullname}"
+ ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
+- COMMENT "csc *.cs"
++ COMMENT "csc *.cs"
+ )
+
+ if(BUILD_EXAMPLES)
Copied: trunk/packages/gdcm/trunk/debian/patches/enable-vtk6-bindings.patch (from rev 20268, trunk/packages/gdcm/prepare-2.6/debian/patches/enable-vtk6-bindings.patch)
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/enable-vtk6-bindings.patch (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/enable-vtk6-bindings.patch 2015-10-17 13:22:20 UTC (rev 20269)
@@ -0,0 +1,78 @@
+Description: Correct bindings for use with VTK6
+ Add VTK6 export defines and remove some vtk-python libraries
+ that no longer exist from the link command
+Author: Gert Wollny <gw.fossdev at gmail.com>
+
+diff -ru gdcm-2.6.0.old/Utilities/VTK/CMakeLists.txt gdcm-2.6.0/Utilities/VTK/CMakeLists.txt
+--- gdcm-2.6.0.old/Utilities/VTK/CMakeLists.txt 2015-09-03 16:42:12.000000000 +0200
++++ gdcm-2.6.0/Utilities/VTK/CMakeLists.txt 2015-10-16 17:28:48.000000000 +0200
+@@ -740,9 +740,9 @@
+ # do not set the version on the Python module:
+ #set_target_properties(${VTKGDCM_NAME}Python PROPERTIES ${GDCM_LIBRARY_PROPERTIES})
+ target_link_libraries(${VTKGDCM_NAME}PythonD ${VTKGDCM_NAME} ${PYTHON_LIBRARY})
+- foreach(c ${vtkgdcm_LIBS} vtkFiltering)
+- target_link_libraries(${VTKGDCM_NAME}PythonD ${c}Python${DEXTENSION})
+- endforeach()
++# foreach(c ${vtkgdcm_LIBS} vtkFiltering)
++# target_link_libraries(${VTKGDCM_NAME}PythonD ${c}Python${DEXTENSION})
++# endforeach()
+ if(TARGET vtkPythonCore)
+ target_link_libraries(${VTKGDCM_NAME}PythonD vtkPythonCore)
+ endif()
+diff -ru gdcm-2.6.0.old/Utilities/VTK/vtkgdcm.i gdcm-2.6.0/Utilities/VTK/vtkgdcm.i
+--- gdcm-2.6.0.old/Utilities/VTK/vtkgdcm.i 2015-09-03 16:42:12.000000000 +0200
++++ gdcm-2.6.0/Utilities/VTK/vtkgdcm.i 2015-10-16 17:42:20.541502614 +0200
+@@ -31,10 +31,10 @@
+ #endif
+
+ %{
+-//#define VTK_MAJOR_VERSION 5
+-//#define VTK_MINOR_VERSION 4
++//#define VTK_MAJOR_VERSION 6
++//#define VTK_MINOR_VERSION 2
+ //#define VTK_BUILD_VERSION 0
+-//#define VTK_VERSION "5.4.0"
++//#define VTK_VERSION "6.2.0"
+ %}
+
+
+@@ -101,17 +101,24 @@
+ //using My.Own.Namespace;
+ //%}
+
+-#ifdef USEACTIVIZ
++#if defined( USEACTIVIZ ) || defined (SWIGCSHARP)
+ %typemap(csimports) SWIGTYPE %{
+ // I need to duplicate those also:
+ using System;
+ using System.Runtime.InteropServices;
++%}
++#endif
++
++#if defined( USEACTIVIZ )
++%typemap(csimports) SWIGTYPE %{
+ // my special import:
+ using Kitware.VTK;
+ //using Kitware.mummy.Runtime;
+ %}
+ #endif
+
++
++
+ #define GDCM_EXPORT
+ #define VTK_EXPORT
+ #define VTK_COMMON_EXPORT
+@@ -119,6 +126,13 @@
+ #define VTK_IO_EXPORT
+ #define VTK_IMAGING_EXPORT
+ #define VTK_RENDERING_EXPORT
++#define VTKCOMMONCORE_EXPORT
++#define VTKCOMMONMATH_EXPORT
++#define VTKIOIMAGE_EXPORT
++#define VTKCOMMONDATAMODEL_EXPORT
++#define VTKCOMMONEXECUTIONMODEL_EXPORT
++#define VTKRENDERINGCORE_EXPORT
++#define VTKIMAGINGCORE_EXPORT
+
+
+ // FIXME. Including #include vtkSetGet would not work on siwg 1.3.33 ...
Modified: trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/patches/fixhurd.patch 2015-10-17 13:22:20 UTC (rev 20269)
@@ -35,21 +35,8 @@
#ifdef _WIN32
Index: gdcm-2.4.1/Utilities/socketxx/socket++/sockstream.h
===================================================================
---- gdcm-2.4.1.orig/Utilities/socketxx/socket++/sockstream.h 2013-12-09 18:22:40.000000000 +0100
-+++ gdcm-2.4.1/Utilities/socketxx/socket++/sockstream.h 2013-12-10 09:15:48.378563355 +0100
-@@ -163,7 +163,7 @@
- msg_peek = MSG_PEEK,
- msg_dontroute = MSG_DONTROUTE
-
--#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
-+#if !(defined(__FreeBSD__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
- ,msg_maxiovlen = MSG_MAXIOVLEN
- #endif
- };
-Index: gdcm-2.4.1/Utilities/socketxx/socket++/local.h
-===================================================================
---- gdcm-2.4.1.orig/Utilities/socketxx/socket++/local.h 2013-12-09 18:22:40.000000000 +0100
-+++ gdcm-2.4.1/Utilities/socketxx/socket++/local.h 2013-12-10 09:15:48.378563355 +0100
+--- gdcm-2.6.0.old/Utilities/socketxx/socket++/local.h 2015-09-03 16:42:12.000000000 +0200
++++ gdcm-2.6.0/Utilities/socketxx/socket++/local.h 2015-10-16 14:20:06.073470902 +0200
@@ -97,7 +97,7 @@
// extern "C" int gethostname (char* hostname, size_t len);
// the above breaks on some old MacOSX system where prototype is:
@@ -59,3 +46,16 @@
extern char* SYS_SIGLIST [];
#endif
#endif
+Index: gdcm-2.4.1/Utilities/socketxx/socket++/local.h
+===================================================================
+--- gdcm-2.6.0.old/Utilities/socketxx/socket++/sockstream.h 2015-09-03 16:42:12.000000000 +0200
++++ gdcm-2.6.0/Utilities/socketxx/socket++/sockstream.h 2015-10-16 14:18:20.516146044 +0200
+@@ -163,7 +163,7 @@
+ msg_peek = MSG_PEEK,
+ msg_dontroute = MSG_DONTROUTE
+
+-#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__EMSCRIPTEN__))
++#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__EMSCRIPTEN__) )
+ ,msg_maxiovlen = MSG_MAXIOVLEN
+ #endif
+ };
Modified: trunk/packages/gdcm/trunk/debian/patches/linkvtkdoc.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/linkvtkdoc.patch 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/patches/linkvtkdoc.patch 2015-10-17 13:22:20 UTC (rev 20269)
@@ -1,24 +1,15 @@
-Description: link to vtk doc
- Also prefer SVG output to reduce package size
-Author: Mathieu Malaterre <malat at debian.org>
+Description: Correct use of scripts from vtk6-doc
+ In vtk6-doc these scripts are installed compresses. The patch
+ takes care of providing uncompressed versions.
+ 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.
+Author: Gert Wollny <gw.fossdev at gmail.com>, Mathieu Malaterre <malat at debian.org>
-Index: gdcm-2.4.4/Utilities/doxygen/vtk/doxyfile.in
-===================================================================
---- gdcm-2.4.4.orig/Utilities/doxygen/vtk/doxyfile.in 2014-09-24 09:40:10.000000000 +0200
-+++ gdcm-2.4.4/Utilities/doxygen/vtk/doxyfile.in 2014-09-24 10:17:58.526433733 +0200
-@@ -23,6 +23,7 @@
- HAVE_DOT = YES
- #HAVE_DOT = NO
- DOT_PATH = "@DOT_PATH@"
-+DOT_IMAGE_FORMAT = svg
- CLASS_GRAPH = YES
- COLLABORATION_GRAPH = YES
- TEMPLATE_RELATIONS = YES
-Index: gdcm-2.4.4/Utilities/doxygen/doxyfile.in
-===================================================================
---- gdcm-2.4.4.orig/Utilities/doxygen/doxyfile.in 2014-09-24 09:40:10.000000000 +0200
-+++ gdcm-2.4.4/Utilities/doxygen/doxyfile.in 2014-09-24 10:17:58.530433733 +0200
-@@ -1737,7 +1737,7 @@
+diff -ru gdcm-2.6.0.old/Utilities/doxygen/doxyfile.in gdcm-2.6.0/Utilities/doxygen/doxyfile.in
+--- gdcm-2.6.0.old/Utilities/doxygen/doxyfile.in 2015-09-03 16:42:12.000000000 +0200
++++ gdcm-2.6.0/Utilities/doxygen/doxyfile.in 2015-10-16 16:32:10.000000000 +0200
+@@ -1738,7 +1738,7 @@
# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
# visible in IE 9+ (other browsers do not have this requirement).
@@ -27,10 +18,9 @@
# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
# enable generation of interactive SVG images that allow zooming and panning.
-Index: gdcm-2.4.4/Utilities/doxygen/vtk/CMakeLists.txt
-===================================================================
---- gdcm-2.4.4.orig/Utilities/doxygen/vtk/CMakeLists.txt 2014-09-24 09:40:10.000000000 +0200
-+++ gdcm-2.4.4/Utilities/doxygen/vtk/CMakeLists.txt 2014-09-24 10:17:58.530433733 +0200
+diff -ru gdcm-2.6.0.old/Utilities/doxygen/vtk/CMakeLists.txt gdcm-2.6.0/Utilities/doxygen/vtk/CMakeLists.txt
+--- gdcm-2.6.0.old/Utilities/doxygen/vtk/CMakeLists.txt 2015-09-03 16:42:12.000000000 +0200
++++ gdcm-2.6.0/Utilities/doxygen/vtk/CMakeLists.txt 2015-10-16 17:06:34.550679081 +0200
@@ -22,7 +22,7 @@
set (QT_TAG_FILE "${CMAKE_CURRENT_BINARY_DIR}/Qt.tag")
endif ()
@@ -40,6 +30,15 @@
set(DOCUMENTATION_HTML_TARZ ON)
set(DOXYGEN_PROJECT_NAME "vtkgdcm")
if(VTK_SOURCE_DIR)
+@@ -31,7 +31,7 @@
+ set(DOXYGEN_SOURCE_DIR "${VTK_SOURCE_DIR}/Utilities/Doxygen")
+ else()
+ # sudo apt-get install vtk-doc
+- set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk-doc/html/")
++ set(DOXYGEN_SOURCE_DIR "/usr/share/doc/vtk6-doc/doxygen/")
+ endif()
+ set(DOXYGEN_PROJECT_SOURCE_DIR "${vtkgdcm_SOURCE_DIR}")
+ set(VTK_DOXYGEN_HOME "${vtkgdcm_SOURCE_DIR}/VTK/Utilities/Doxygen")
@@ -89,7 +89,7 @@
get_filename_component(DOT_PATH ${DOT} PATH)
endif()
@@ -58,3 +57,69 @@
${BASH}
${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh)
+diff -ru gdcm-2.6.0.old/Utilities/doxygen/vtk/doc_makeall.sh.in gdcm-2.6.0/Utilities/doxygen/vtk/doc_makeall.sh.in
+--- gdcm-2.6.0.old/Utilities/doxygen/vtk/doc_makeall.sh.in 2015-09-03 16:42:12.000000000 +0200
++++ gdcm-2.6.0/Utilities/doxygen/vtk/doc_makeall.sh.in 2015-10-16 17:20:10.811973984 +0200
+@@ -169,12 +169,12 @@
+ # Convert the VTK headers to the Doxygen format.
+ echo "Convert the VTK headers to the Doxygen format."
+ if test "x$PERL_PROG" != "xNOTFOUND" ; then
+- $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl" \
++ gzip -cd "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl.gz" | $PERL_PROG - \
+ --to "$INTERMEDIATE_DOX_DIR" \
+ --relativeto "@DOXYGEN_SOURCE_LOCATIONS_DIR@" \
+ @DOXYGEN_SOURCE_LOCATIONS@ || echoexit "Problem converting VTK headers"
+ if test "x at DOXYGEN_BINARY_LOCATIONS_DIR@" != "x"; then
+- $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl" \
++ gzip -cd "$PATH_TO_VTK_DOX_SCRIPTS/doc_header2doxygen.pl.gz" | $PERL_PROG - \
+ --to "$INTERMEDIATE_DOX_DIR" \
+ --relativeto "@DOXYGEN_BINARY_LOCATIONS_DIR@" \
+ @DOXYGEN_BINARY_LOCATIONS@ || echoexit "Problem converting VTK headers"
+@@ -186,13 +186,16 @@
+ # Build the full-text index.
+ echo "Build the full-text index."
+ if test "x$PERL_PROG" != "xNOTFOUND" ; then
+- $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.pl" \
++ gzip -dc "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.stop.gz" > doc_index.stop
++
++ gzip -dc "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.pl.gz" | $PERL_PROG - \
+ --project "$PROJECT_NAME" \
+- --stop "$PATH_TO_VTK_DOX_SCRIPTS/doc_index.stop" \
++ --stop "doc_index.stop" \
+ --store "doc_""$PROJECT_NAME""_index.dox" \
+ --to "$INTERMEDIATE_DOX_DIR" \
+ @DOXYGEN_SOURCE_LOCATIONS@ \
+ @DOXYGEN_BINARY_LOCATIONS@ || echoexit "Problem building full-text index"
++ rm -f doc_index.stop
+ fi
+ echo "Build the full-text index - done"
+
+@@ -201,7 +204,7 @@
+ # # demos that use that class.
+
+ # if test "x$PERL_PROG" != "xNOTFOUND" ; then
+-# $PERL_PROG $PATH_TO_VTK_DOX_SCRIPTS/doc_class2example.pl \
++# gzip -dc $PATH_TO_VTK_DOX_SCRIPTS/doc_class2example.pl | $PERL_PROG - \
+ # --datamatch "\W((VTK|ParaView)_DATA_ROOT|(VTK|MedVIP)Data|(vtk)?GetDataRoot|ExpandDataFileName)\W" \
+ # --dataicon "paper-clip.gif" \
+ # --dirmatch "^demos$" \
+@@ -246,7 +249,7 @@
+ # Clean the HTML pages to remove the path to the intermediate Doxygen dir.
+
+ if test "x$PERL_PROG" != "xNOTFOUND" ; then
+- $PERL_PROG "$PATH_TO_VTK_DOX_SCRIPTS/doc_rmpath.pl" \
++ gzip -dc "$PATH_TO_VTK_DOX_SCRIPTS/doc_rmpath.pl.gz" | $PERL_PROG - \
+ --to "$INTERMEDIATE_DOX_DIR" \
+ --html "$OUTPUT_DIRECTORY/html" || echoexit "Problem cleaning HTML pages"
+ fi
+diff -ru gdcm-2.6.0.old/Utilities/doxygen/vtk/doxyfile.in gdcm-2.6.0/Utilities/doxygen/vtk/doxyfile.in
+--- gdcm-2.6.0.old/Utilities/doxygen/vtk/doxyfile.in 2015-09-03 16:42:12.000000000 +0200
++++ gdcm-2.6.0/Utilities/doxygen/vtk/doxyfile.in 2015-10-16 16:32:10.000000000 +0200
+@@ -23,6 +23,7 @@
+ HAVE_DOT = YES
+ #HAVE_DOT = NO
+ DOT_PATH = "@DOT_PATH@"
++DOT_IMAGE_FORMAT = svg
+ CLASS_GRAPH = YES
+ COLLABORATION_GRAPH = YES
+ TEMPLATE_RELATIONS = YES
Modified: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/patches/series 2015-10-17 13:22:20 UTC (rev 20269)
@@ -2,4 +2,6 @@
fixhurd.patch
linkvtkdoc.patch
multiarch.patch
-castxml.patch
+enable-vtk6-bindings.patch
+add-csharp-keyfile-from-commandline.patch
+vtkgdcm-sharp-siging.patch
Modified: trunk/packages/gdcm/trunk/debian/patches/toplevelskip.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/toplevelskip.patch 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/patches/toplevelskip.patch 2015-10-17 13:22:20 UTC (rev 20269)
@@ -5,16 +5,18 @@
Index: gdcm-2.4.3/CMakeLists.txt
===================================================================
---- gdcm-2.4.3.orig/CMakeLists.txt 2014-07-26 17:19:49.000000000 +0200
-+++ gdcm-2.4.3/CMakeLists.txt 2014-07-29 15:13:50.822079829 +0200
-@@ -35,8 +35,8 @@
- get_filename_component(PARENTDIR ${GDCM_BINARY_DIR} PATH)
- string(COMPARE EQUAL "${GDCM_SOURCE_DIR}" "${PARENTDIR}" INSOURCESUBDIR)
- if(INSOURCE OR INSOURCESUBDIR)
-- message(FATAL_ERROR "GDCM requires an out of source Build. "
-- "Please create a separate binary directory and run CMake there.")
-+ # message(FATAL_ERROR "GDCM requires an out of source Build. "
-+ # "Please create a separate binary directory and run CMake there.")
+--- gdcm-2.6.0.old/CMakeLists.txt 2015-09-03 16:42:12.000000000 +0200
++++ gdcm-2.6.0/CMakeLists.txt 2015-10-16 14:10:37.474589397 +0200
+@@ -36,9 +36,9 @@
+ get_filename_component(PARENTDIR ${GDCM_BINARY_DIR} PATH)
+ string(COMPARE EQUAL "${GDCM_SOURCE_DIR}" "${PARENTDIR}" INSOURCESUBDIR)
+ if(INSOURCE OR INSOURCESUBDIR)
+- message(FATAL_ERROR "GDCM requires an out of source Build. "
+- "Please create a separate binary directory and run CMake there. "
+- "Or explicitly define GDCM_ALLOW_INSOURCE_BUILD")
++# message(FATAL_ERROR "GDCM requires an out of source Build. "
++# "Please create a separate binary directory and run CMake there. "
++# "Or explicitly define GDCM_ALLOW_INSOURCE_BUILD")
+ endif()
endif()
-
#----------------------------------------------------------------------------
Copied: trunk/packages/gdcm/trunk/debian/patches/vtkgdcm-sharp-siging.patch (from rev 20268, trunk/packages/gdcm/prepare-2.6/debian/patches/vtkgdcm-sharp-siging.patch)
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/vtkgdcm-sharp-siging.patch (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/vtkgdcm-sharp-siging.patch 2015-10-17 13:22:20 UTC (rev 20269)
@@ -0,0 +1,28 @@
+Description: Correct the key handling for the vtkgdcm-sharp module
+ This patch moves the addign of the key to the command line and
+ adds the signing of the module after it is build.
+Author: Gert Wollny <gw.fossdev at gmail.com>
+
+diff -ru gdcm-2.6.0.old/Utilities/VTK/AssemblyInfo.cs.in gdcm-2.6.0/Utilities/VTK/AssemblyInfo.cs.in
+--- gdcm-2.6.0.old/Utilities/VTK/AssemblyInfo.cs.in 2015-09-03 16:42:12.000000000 +0200
++++ gdcm-2.6.0/Utilities/VTK/AssemblyInfo.cs.in 2015-10-17 11:10:53.112614510 +0200
+@@ -69,5 +69,5 @@
+ // .NET Framework documentation for more information about signing.
+ // This is not required, if you don't want signing let these attributes like they're.
+ [assembly: AssemblyDelaySign(false)]
+-[assembly: AssemblyKeyFile("key.snk")]
++//[assembly: AssemblyKeyFile("key.snk")]
+ //[assembly: AssemblyKeyName("")]
+diff -ru gdcm-2.6.0.old/Utilities/VTK/CMakeLists.txt gdcm-2.6.0/Utilities/VTK/CMakeLists.txt
+--- gdcm-2.6.0.old/Utilities/VTK/CMakeLists.txt 2015-09-03 16:42:12.000000000 +0200
++++ gdcm-2.6.0/Utilities/VTK/CMakeLists.txt 2015-10-17 11:10:55.356721743 +0200
+@@ -598,7 +598,8 @@
+
+ add_custom_command(
+ OUTPUT ${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll
+- COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "*.cs"
++ COMMAND ${CMAKE_CSHARP_COMPILER} ARGS "/t:library" "/out:${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "/keyfile:key.snk" "*.cs"
++ COMMAND "/usr/bin/sn" "-R" "${GDCM_LIBRARY_DIR}/vtkgdcm-sharp.dll" "key.snk"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS "${swig_generated_file_fullname}"
+ ${CMAKE_CURRENT_BINARY_DIR}/AssemblyInfo.cs
Modified: trunk/packages/gdcm/trunk/debian/python-vtkgdcm.lintian-overrides
===================================================================
--- trunk/packages/gdcm/trunk/debian/python-vtkgdcm.lintian-overrides 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/python-vtkgdcm.lintian-overrides 2015-10-17 13:22:20 UTC (rev 20269)
@@ -1,2 +1,11 @@
+#
+# This is a C++ library, using symbols files here is quite a challange
+#
+python-vtkgdcm: no-symbols-control-file
+
+
+# This package provids a helper library for Python bindings
python-vtkgdcm: package-name-doesnt-match-sonames
+
+# This seems to be needed for the python module
python-vtkgdcm: non-dev-pkg-with-shlib-symlink
Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules 2015-10-17 12:27:36 UTC (rev 20268)
+++ trunk/packages/gdcm/trunk/debian/rules 2015-10-17 13:22:20 UTC (rev 20269)
@@ -12,19 +12,19 @@
PHP_EX=$(shell /usr/bin/php-config5 --extension-dir)
# required for DEB_MONO_ARCHS (debian/control.in)
--include /usr/share/mono/mono-archs.make
+#-include /usr/share/mono/mono-archs.make
# Mono is not available for all Debian architectures.
-ifeq ($(shell dh_listpackages | grep -q cil && echo yes),yes)
-WITH_CLI = --with cli
-DEB_WRAP_CSHARP = 1
+#ifeq ($(shell dh_listpackages | grep -q cil && echo yes),yes)
+#WITH_CLI = --with cli
+#DEB_WRAP_CSHARP = 1
# dpkg-shlibdeps needs to know where is libKitware.mummy.Runtime.Unmanaged.so
-LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):/usr/lib/cli/Kitware.mummy.Runtime-1.0
-else
+#LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):/usr/lib/cli/Kitware.mummy.Runtime-1.0
+#else
WITH_CLI =
DEB_WRAP_CSHARP = 0
-endif
-export LD_LIBRARY_PATH
+#endif
+#export LD_LIBRARY_PATH
# deduce documentation option (build-indep target)
ifeq "" "$(filter %-doc,$(shell dh_listpackages))"
@@ -34,11 +34,11 @@
endif
%:
- dh $@ $(WITH_CLI) --with python2 --with javahelper --parallel
+ dh $@ $(WITH_CLI) --with python2 --parallel
PYVER := $(shell pyversions -dv)
PYMODDIR := /usr/lib/$(shell pyversions -r)
-VTKVERS=$(shell apt-cache policy libvtk5-dev | grep "Installed:" | cut -d: -f2 | cut -d' ' -f2 | cut -d- -f1 | cut -d. -f1-2)
+VTKVERS=$(shell apt-cache policy libvtk6-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:
@@ -53,7 +53,7 @@
-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
-DGDCM_WRAP_PYTHON:BOOL=ON \
-DGDCM_WRAP_CSHARP:BOOL=$(DEB_WRAP_CSHARP) \
- -DGDCM_WRAP_JAVA:BOOL=ON \
+ -DGDCM_WRAP_JAVA:BOOL=OFF \
-DGDCM_WRAP_PHP:BOOL=ON \
-DGDCM_USE_PVRG:BOOL=ON \
-DGDCM_USE_SYSTEM_PVRG:BOOL=ON \
@@ -69,7 +69,7 @@
-DGDCM_USE_SYSTEM_LIBXML2:BOOL=ON \
-DGDCM_USE_SYSTEM_JSON:BOOL=ON \
-DGDCM_USE_PARAVIEW:BOOL=OFF \
- -DGDCM_USE_ACTIVIZ:BOOL=ON \
+ -DGDCM_USE_ACTIVIZ:BOOL=OFF \
-DGDCM_USE_SYSTEM_PAPYRUS3:BOOL=ON \
-DGDCM_USE_SYSTEM_SOCKETXX:BOOL=ON \
-DPython_ADDITIONAL_VERSIONS:STRING=$(PYVER) \
@@ -89,9 +89,9 @@
override_dh_auto_install:
# See #664188
- sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-2.4/GDCMTargets-*.cmake
+ sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-2.6/GDCMTargets-*.cmake
# See #711214
- sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-2.4/GDCMTargets.cmake
+ sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/$(DEB_HOST_MULTIARCH)/gdcm-2.6/GDCMTargets.cmake
dh_auto_install
# PHP
mkdir -p debian/tmp/$(PHP_EX)
@@ -107,8 +107,11 @@
#mv debian/tmp/usr/lib/_gdcmswig.so* debian/tmp/$(PYMODDIR)/dist-packages/
override_dh_strip:
- dh_strip --dbg-package=libgdcm2.4-dbg
+ dh_strip --dbg-package=libgdcm2.6-dbg
+override_dh_strip_nondeterminism:
+ dh_strip_nondeterminism -Xsharp
+
override_dh_clideps:
ifeq ($(DEB_WRAP_CSHARP), 1)
dh_clideps
Copied: trunk/packages/gdcm/trunk/debian/source/lintian-overrides (from rev 20268, trunk/packages/gdcm/prepare-2.6/debian/source/lintian-overrides)
===================================================================
--- trunk/packages/gdcm/trunk/debian/source/lintian-overrides (rev 0)
+++ trunk/packages/gdcm/trunk/debian/source/lintian-overrides 2015-10-17 13:22:20 UTC (rev 20269)
@@ -0,0 +1,5 @@
+# it is not quite clear why this is a warning, see #779676
+# So for now we turn it off.
+gdcm: dep5-copyright-license-name-not-unique
+
+
More information about the debian-med-commit
mailing list