debian/changelog

+camitk (4.1.2-2) UNRELEASED; urgency=medium
+
+  * VTK7 compatibility. Closes: #909120
+  * Avoid double delete (patch from Bernhard Übelacker)
+  * update d/control: multiarch, debphelper and compat
+
+ -- Emmanuel Promayon <Emmanuel.Promayon@univ-grenoble-alpes.fr>  Tue, 23 Oct 2018 10:19:39 +0200
+
 camitk (4.1.2-1) unstable; urgency=medium
 
   * New upstream version 4.1.2

debian/compat

-10
+11

debian/control

@@ -4,10 +4,10 @@ Uploaders: Andreas Tille <tille@debian.org>,
            Emmanuel Promayon <Emmanuel.Promayon@univ-grenoble-alpes.fr>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11),
                cmake,
-               libvtk6-dev,
-               libvtk6-qt-dev,
+               libvtk7-dev,
+               libvtk7-qt-dev,
                qtbase5-dev,
                libqt5xmlpatterns5-dev,
                libqt5opengl5-dev,
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 10),
                xauth,
                doxygen,
                graphviz
-Standards-Version: 4.1.5
+Standards-Version: 4.2.1
 Vcs-Browser: https://salsa.debian.org/med-team/camitk
 Vcs-Git: https://salsa.debian.org/med-team/camitk.git
 Homepage: https://camitk.imag.fr/
@@ -45,8 +45,10 @@ Architecture: any
 Depends: libcamitk4 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Replaces: libcamitk3, libcamitk4 (<< 4.1.2)
-Breaks: libcamitk3, libcamitk4 (<< 4.1.2)
+Breaks: libcamitk3,
+        libcamitk4 (<< 4.1.2)
+Replaces: libcamitk3,
+          libcamitk4 (<< 4.1.2)
 Description: Computer Assisted Medical Intervention Tool Kit - config
  Helps researchers and clinicians to easily and rapidly collaborate in
  order to prototype CAMI applications, that feature medical images,
@@ -62,8 +64,8 @@ Depends: libcamitk4 (= ${binary:Version}),
          camitk-config,
          libqtpropertybrowser-dev,
          cmake,
-         libvtk6-dev,
-         libvtk6-qt-dev,
+         libvtk7-dev,
+         libvtk7-qt-dev,
          qtbase5-dev,
          libqt5xmlpatterns5-dev,
          libqt5opengl5-dev,
@@ -92,6 +94,7 @@ Description: Computer Assisted Medical Intervention Tool Kit - development
 
 Package: libcamitk4-data
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends}
 Description: Computer Assisted Medical Intervention Tool Kit - data
@@ -103,6 +106,7 @@ Description: Computer Assisted Medical Intervention Tool Kit - data
 
 Package: libcamitk4-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends}
 Description: Computer Assisted Medical Intervention Tool Kit - documentation
@@ -166,8 +170,7 @@ Package: libqtpropertybrowser-dev
 Architecture: any
 Section: libdevel
 Depends: libqtpropertybrowser4 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
+         ${misc:Depends}
 Breaks: libqtpropertybrowser3-dev
 Replaces: libqtpropertybrowser3-dev
 Description: Qt Property Browser Library - development

debian/patches/0010-Make-loop-safe-for-removal-of-elements.patch

+From 52f172e553ebddf068b8e35601da5eefd295cf3d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bernhard=20=C3=9Cbelacker?= <bernhardu@mailbox.org>
+Date: Thu, 20 Sep 2018 17:42:14 +0200
+Subject: [PATCH] Make loop safe for removal of elements.
+
+Bug-Debian: https://bugs.debian.org/909120
+Forwarded: no
+Last-Update: 2018-09-20
+
+---
+ modeling/libraries/pml/MultiComponent.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/modeling/libraries/pml/MultiComponent.cpp b/modeling/libraries/pml/MultiComponent.cpp
+index 5a3a9ab..3f32d7b 100644
+--- a/modeling/libraries/pml/MultiComponent.cpp
++++ b/modeling/libraries/pml/MultiComponent.cpp
+@@ -46,8 +46,10 @@ MultiComponent::~MultiComponent() {
+ 
+ // ------------------ deleteAllSubComponents ---------------------
+ void MultiComponent::deleteAllSubComponents() {
+-    for (auto& component : components) {
+-        delete component;
++    auto component = components.begin();
++    while (component != components.end()) {
++        delete *component;
++        component = components.begin();
+     }
+     components.clear();
+ }
+-- 
+2.18.0
+

debian/patches/series

@@ -3,3 +3,5 @@
 0003-FIXED-warning-from-dpkg-about-no-newline.patch
 0004-FIXED-monitorgui-lib-should-not-depends-on-camitk-co.patch
 0005-FIXED-config-test-needs-to-ignore-stderr.patch
+0010-Make-loop-safe-for-removal-of-elements.patch
+0100-vtk7-compatibility.patch