diff -Nru vtk7-7.1.1+dfsg2/debian/changelog vtk7-7.1.1+dfsg2/debian/changelog --- vtk7-7.1.1+dfsg2/debian/changelog 2019-11-01 08:19:22.000000000 +0000 +++ vtk7-7.1.1+dfsg2/debian/changelog 2019-08-06 20:01:09.000000000 +0000 @@ -1,10 +1,7 @@ -vtk7 (7.1.1+dfsg2-1) unstable; urgency=medium +vtk7 (7.1.1+dfsg2-1~rpi1) bullseye-staging; urgency=medium - * Upload to unstable, Closes: #931944 - - -- Gert Wollny Fri, 01 Nov 2019 09:19:22 +0100 - -vtk7 (7.1.1+dfsg2-1~exp1) experimental; urgency=medium + [ Peter Green ] + * upload changes from salsa to raspbian. [ Nico Schlömer ] * update broken debian/watch @@ -12,13 +9,9 @@ [ Gert Wollny ] * d/*: switch back to use bundled proj4, Closes: #931044 * d/watch: Restrict to v7 - * Update tarball to contain proj4 - * d/p/112: Add support for riscv64, Closes: #924611 - * d/libvtk-jni: install to /usr/lib/jni (Java Policy 2.4), - Closes: #930512 - * d/*: Change soname because of using embedded libproj4 + * New upstream version 7.1.1+dfsg2 - -- Gert Wollny Sun, 25 Aug 2019 22:15:51 +0200 + -- Gert Wollny Tue, 06 Aug 2019 22:01:09 +0200 vtk7 (7.1.1+dfsg1-12) unstable; urgency=medium diff -Nru vtk7-7.1.1+dfsg2/debian/control vtk7-7.1.1+dfsg2/debian/control --- vtk7-7.1.1+dfsg2/debian/control 2019-11-01 08:19:22.000000000 +0000 +++ vtk7-7.1.1+dfsg2/debian/control 2019-08-06 20:01:09.000000000 +0000 @@ -109,7 +109,7 @@ libswscale-dev, libtheora-dev, libtiff-dev, - libvtk7.1p (= ${binary:Version}), + libvtk7.1 (= ${binary:Version}), libvtk7-java (= ${binary:Version}), libx11-dev, libxft-dev, @@ -142,7 +142,7 @@ Architecture: any Section: libdevel Depends: libvtk7-dev (= ${binary:Version}), - libvtk7.1p-qt (= ${binary:Version}), + libvtk7.1-qt (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}, qtbase5-dev, @@ -156,7 +156,7 @@ This package provides the VTK header files required to compile C++ programs that use VTK to do 3D visualisation. Qt files -Package: libvtk7.1p +Package: libvtk7.1 Architecture: any Section: libs Depends: ${misc:Depends}, @@ -174,7 +174,7 @@ This package provides the shared libraries needed to run C++ programs that use VTK. -Package: libvtk7.1p-qt +Package: libvtk7.1-qt Architecture: any Section: libs Depends: ${misc:Depends}, @@ -224,8 +224,8 @@ Package: python3-vtk7 Architecture: any Section: python -Depends: libvtk7.1p (= ${binary:Version}), - libvtk7.1p-qt (= ${binary:Version}) [!armhf !armel], +Depends: libvtk7.1 (= ${binary:Version}), + libvtk7.1-qt (= ${binary:Version}) [!armhf !armel], python3-autobahn, python3-mpi4py, python3-six, @@ -248,8 +248,8 @@ Package: tcl-vtk7 Architecture: any Section: interpreters -Depends: libvtk7.1p (= ${binary:Version}), - libvtk7.1p-qt (= ${binary:Version}) [!armhf !armel], +Depends: libvtk7.1 (= ${binary:Version}), + libvtk7.1-qt (= ${binary:Version}) [!armhf !armel], ${misc:Depends}, ${shlibs:Depends} Suggests: vtk7-doc, @@ -264,7 +264,7 @@ Package: vtk7 Architecture: any Section: interpreters -Depends: libvtk7.1p (= ${binary:Version}), +Depends: libvtk7.1 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Suggests: vtk7-doc, diff -Nru vtk7-7.1.1+dfsg2/debian/copyright vtk7-7.1.1+dfsg2/debian/copyright --- vtk7-7.1.1+dfsg2/debian/copyright 2019-11-01 08:19:22.000000000 +0000 +++ vtk7-7.1.1+dfsg2/debian/copyright 2019-08-06 20:01:09.000000000 +0000 @@ -33,27 +33,8 @@ License: BSD-3-clause Files: ThirdParty/libproj4/* -Copyright: 2000 Frank Warmerdam, - 2003, 2006 Gerald I. Evenden +Copyright: 2003, 2006 Gerald I. Evenden License: MIT - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - . - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. - Files: Accelerators/Dax/* Copyright: 2012 Sandia Corporation, Kitware Inc., diff -Nru vtk7-7.1.1+dfsg2/debian/libvtk7.1.install vtk7-7.1.1+dfsg2/debian/libvtk7.1.install --- vtk7-7.1.1+dfsg2/debian/libvtk7.1.install 1970-01-01 00:00:00.000000000 +0000 +++ vtk7-7.1.1+dfsg2/debian/libvtk7.1.install 2019-08-06 20:01:09.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/*.so.* diff -Nru vtk7-7.1.1+dfsg2/debian/libvtk7.1.lintian-overrides vtk7-7.1.1+dfsg2/debian/libvtk7.1.lintian-overrides --- vtk7-7.1.1+dfsg2/debian/libvtk7.1.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ vtk7-7.1.1+dfsg2/debian/libvtk7.1.lintian-overrides 2019-08-06 20:01:09.000000000 +0000 @@ -0,0 +1,5 @@ +libvtk7.1: package-name-doesnt-match-sonames +libvtk7.1: hardening-no-relro +# Will be discussed with upstream to have an opportunity to set USE_SYSTEM_lib + +libvtk7.1: embedded-library diff -Nru vtk7-7.1.1+dfsg2/debian/libvtk7.1p.install vtk7-7.1.1+dfsg2/debian/libvtk7.1p.install --- vtk7-7.1.1+dfsg2/debian/libvtk7.1p.install 2019-11-01 08:19:22.000000000 +0000 +++ vtk7-7.1.1+dfsg2/debian/libvtk7.1p.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/*.so.* diff -Nru vtk7-7.1.1+dfsg2/debian/libvtk7.1p.lintian-overrides vtk7-7.1.1+dfsg2/debian/libvtk7.1p.lintian-overrides --- vtk7-7.1.1+dfsg2/debian/libvtk7.1p.lintian-overrides 2019-11-01 08:19:22.000000000 +0000 +++ vtk7-7.1.1+dfsg2/debian/libvtk7.1p.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -libvtk7.1p: package-name-doesnt-match-sonames -libvtk7.1p: hardening-no-relro -# Will be discussed with upstream to have an opportunity to set USE_SYSTEM_lib - -libvtk7.1p: embedded-library diff -Nru vtk7-7.1.1+dfsg2/debian/libvtk7.1p-qt.install vtk7-7.1.1+dfsg2/debian/libvtk7.1p-qt.install --- vtk7-7.1.1+dfsg2/debian/libvtk7.1p-qt.install 2019-11-01 08:19:22.000000000 +0000 +++ vtk7-7.1.1+dfsg2/debian/libvtk7.1p-qt.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/*Qt*.so.* diff -Nru vtk7-7.1.1+dfsg2/debian/libvtk7.1p-qt.lintian-overrides vtk7-7.1.1+dfsg2/debian/libvtk7.1p-qt.lintian-overrides --- vtk7-7.1.1+dfsg2/debian/libvtk7.1p-qt.lintian-overrides 2019-11-01 08:19:22.000000000 +0000 +++ vtk7-7.1.1+dfsg2/debian/libvtk7.1p-qt.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -libvtk7.1p-qt: hardening-no-relro -libvtk7.1p-qt: package-name-doesnt-match-sonames - diff -Nru vtk7-7.1.1+dfsg2/debian/libvtk7.1-qt.install vtk7-7.1.1+dfsg2/debian/libvtk7.1-qt.install --- vtk7-7.1.1+dfsg2/debian/libvtk7.1-qt.install 1970-01-01 00:00:00.000000000 +0000 +++ vtk7-7.1.1+dfsg2/debian/libvtk7.1-qt.install 2019-08-06 20:01:09.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/*Qt*.so.* diff -Nru vtk7-7.1.1+dfsg2/debian/libvtk7.1-qt.lintian-overrides vtk7-7.1.1+dfsg2/debian/libvtk7.1-qt.lintian-overrides --- vtk7-7.1.1+dfsg2/debian/libvtk7.1-qt.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ vtk7-7.1.1+dfsg2/debian/libvtk7.1-qt.lintian-overrides 2019-08-06 20:01:09.000000000 +0000 @@ -0,0 +1,3 @@ +libvtk7.1-qt: hardening-no-relro +libvtk7.1-qt: package-name-doesnt-match-sonames + diff -Nru vtk7-7.1.1+dfsg2/debian/libvtk7-jni.install vtk7-7.1.1+dfsg2/debian/libvtk7-jni.install --- vtk7-7.1.1+dfsg2/debian/libvtk7-jni.install 2019-11-01 08:19:22.000000000 +0000 +++ vtk7-7.1.1+dfsg2/debian/libvtk7-jni.install 2019-08-06 20:01:09.000000000 +0000 @@ -1 +1 @@ -usr/lib/*/jni/ /usr/lib/jni/ \ No newline at end of file +usr/lib/*/jni/ \ No newline at end of file diff -Nru vtk7-7.1.1+dfsg2/debian/patches/112_riscv_support.patch vtk7-7.1.1+dfsg2/debian/patches/112_riscv_support.patch --- vtk7-7.1.1+dfsg2/debian/patches/112_riscv_support.patch 2019-11-01 08:19:22.000000000 +0000 +++ vtk7-7.1.1+dfsg2/debian/patches/112_riscv_support.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -Changes taken from https://gitlab.kitware.com/vtk/vtk/blob/master/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h - ---- vtk7-7.1.1+dfsg1.orig/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h -+++ vtk7-7.1.1+dfsg1/Utilities/KWIML/vtkkwiml/include/kwiml/abi.h -@@ -467,6 +467,10 @@ suppression macro KWIML_ABI_NO_VERIFY wa - #elif defined(__XTENSA_EL__) - # define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE - -+/* RISC-V */ -+#elif defined(__riscv) || defined(__riscv__) -+# define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE -+ - /* Unknown CPU */ - #elif !defined(KWIML_ABI_NO_ERROR_ENDIAN) - # error "Byte order of target CPU unknown." diff -Nru vtk7-7.1.1+dfsg2/debian/patches/20_soversion-sharedlib.patch vtk7-7.1.1+dfsg2/debian/patches/20_soversion-sharedlib.patch --- vtk7-7.1.1+dfsg2/debian/patches/20_soversion-sharedlib.patch 2019-11-01 08:19:22.000000000 +0000 +++ vtk7-7.1.1+dfsg2/debian/patches/20_soversion-sharedlib.patch 2019-08-06 20:01:09.000000000 +0000 @@ -7,8 +7,8 @@ if(NOT "${_type}" STREQUAL EXECUTABLE AND NOT VTK_JAVA_INSTALL) - set_property(TARGET ${_name} PROPERTY VERSION 1) - set_property(TARGET ${_name} PROPERTY SOVERSION 1) -+ set_property(TARGET ${_name} PROPERTY VERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}p.${VTK_BUILD_VERSION}) -+ set_property(TARGET ${_name} PROPERTY SOVERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}p) ++ set_property(TARGET ${_name} PROPERTY VERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}) ++ set_property(TARGET ${_name} PROPERTY SOVERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}) endif() if("${_name}" MATCHES "^[Vv][Tt][Kk]") set(_vtk "") diff -Nru vtk7-7.1.1+dfsg2/debian/patches/series vtk7-7.1.1+dfsg2/debian/patches/series --- vtk7-7.1.1+dfsg2/debian/patches/series 2019-11-01 08:19:22.000000000 +0000 +++ vtk7-7.1.1+dfsg2/debian/patches/series 2019-08-06 20:01:09.000000000 +0000 @@ -17,4 +17,3 @@ 109_java-jar-nonjavafiles.patch 110_python-371.patch 111_fix_perl.patch -112_riscv_support.patch diff -Nru vtk7-7.1.1+dfsg2/debian/rules vtk7-7.1.1+dfsg2/debian/rules --- vtk7-7.1.1+dfsg2/debian/rules 2019-11-01 08:19:22.000000000 +0000 +++ vtk7-7.1.1+dfsg2/debian/rules 2019-08-06 20:01:09.000000000 +0000 @@ -139,7 +139,7 @@ override_dh_install-arch: dh_install -a find $(CURDIR)/debian/libvtk7-dev/ -name "*Qt*" -exec rm {} \; - find $(CURDIR)/debian/libvtk7.1p/ -name "*Qt*" -exec rm {} \; + find $(CURDIR)/debian/libvtk7.1/ -name "*Qt*" -exec rm {} \; find $(CURDIR)/debian/libvtk7-dev/usr/include/ -name "Q*" -exec rm {} \; find $(CURDIR)/debian/libvtk7-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \; chmod 755 $(CURDIR)/debian/libvtk7-dev/usr/share/vtk-7.1/doxygen/*.pl