Merge branch 'devel' for v1.9.5 release

Author: ahornung

dynamicEDT3D/CMakeLists.txt

@@ -7,7 +7,7 @@ include(GNUInstallDirs)
 # version (e.g. for packaging)
 set(DYNAMICEDT3D_MAJOR_VERSION 1)
 set(DYNAMICEDT3D_MINOR_VERSION 9)
-set(DYNAMICEDT3D_PATCH_VERSION 4)
+set(DYNAMICEDT3D_PATCH_VERSION 5)
 set(DYNAMICEDT3D_VERSION ${DYNAMICEDT3D_MAJOR_VERSION}.${DYNAMICEDT3D_MINOR_VERSION}.${DYNAMICEDT3D_PATCH_VERSION})
 set(DYNAMICEDT3D_SOVERSION ${DYNAMICEDT3D_MAJOR_VERSION}.${DYNAMICEDT3D_MINOR_VERSION})
 

dynamicEDT3D/package.xml

@@ -1,6 +1,6 @@
 <package format="2">
   <name>dynamic_edt_3d</name>
-  <version>1.9.4</version>
+  <version>1.9.5</version>
   <description> The dynamicEDT3D library implements an inrementally updatable Euclidean distance transform (EDT) in 3D. It comes with a wrapper to use the OctoMap 3D representation and hooks into the change detection of the OctoMap library to propagate changes to the EDT.</description>
 
   <author email="[email protected]">Christoph Sprunk</author>

octomap/CHANGELOG.txt

@@ -1,3 +1,7 @@
+v1.9.5: 2020-03-25
+==================
+- octovis: Update ROS dependencies to Qt5
+
 v1.9.4: 2020-03-15
 ==================
 - octovis: Enable Qt5 by default

octomap/CMakeLists.txt

@@ -7,7 +7,7 @@ include(GNUInstallDirs)
 # version (e.g. for packaging)
 set(OCTOMAP_MAJOR_VERSION 1)
 set(OCTOMAP_MINOR_VERSION 9)
-set(OCTOMAP_PATCH_VERSION 4)
+set(OCTOMAP_PATCH_VERSION 5)
 set(OCTOMAP_VERSION ${OCTOMAP_MAJOR_VERSION}.${OCTOMAP_MINOR_VERSION}.${OCTOMAP_PATCH_VERSION})
 set(OCTOMAP_SOVERSION ${OCTOMAP_MAJOR_VERSION}.${OCTOMAP_MINOR_VERSION})
 if(COMMAND cmake_policy)

octomap/package.xml

@@ -1,6 +1,6 @@
 <package format="2">
   <name>octomap</name>
-  <version>1.9.4</version>
+  <version>1.9.5</version>
   <description>The OctoMap library implements a 3D occupancy grid mapping approach, providing data structures and mapping algorithms in C++. The map implementation is based on an octree. See
   http://octomap.github.io for details.</description>
 

octovis/CMakeLists.txt

@@ -7,7 +7,7 @@ include(GNUInstallDirs)
 # # version (e.g. for packaging)
 set(OCTOVIS_MAJOR_VERSION 1)
 set(OCTOVIS_MINOR_VERSION 9)
-set(OCTOVIS_PATCH_VERSION 4)
+set(OCTOVIS_PATCH_VERSION 5)
 set(OCTOVIS_VERSION ${OCTOVIS_MAJOR_VERSION}.${OCTOVIS_MINOR_VERSION}.${OCTOVIS_PATCH_VERSION})
 set(OCTOVIS_SOVERSION ${OCTOVIS_MAJOR_VERSION}.${OCTOVIS_MINOR_VERSION})
 # get rid of a useless warning:

octovis/package.xml

@@ -1,6 +1,6 @@
 <package format="2">
   <name>octovis</name>
-  <version>1.9.4</version>
+  <version>1.9.5</version>
   <description>octovis is visualization tool for the OctoMap library based on Qt and libQGLViewer. See
   http://octomap.github.io for details.</description>
 
@@ -20,12 +20,27 @@
   </export>
 
   <build_depend>octomap</build_depend>
-  <build_depend>libqglviewer-qt4-dev</build_depend>
+
+  <!-- Qt5 -->
+  <build_depend>libqglviewer-dev-qt5</build_depend>
+  <build_depend>libqt5-core</build_depend>
+  <build_depend>libqt5-opengl-dev</build_depend>
+
+  <!-- Qt4 -->
+  <!-- <build_depend>libqglviewer-qt4-dev</build_depend>
   <build_depend>libqt4-dev</build_depend>
-  <build_depend>libqt4-opengl-dev</build_depend>
+  <build_depend>libqt4-opengl-dev</build_depend> -->
 
   <exec_depend>octomap</exec_depend>
-  <exec_depend>libqglviewer-qt4</exec_depend>
+
+  <!-- Qt5 -->
+  <exec_depend>libqglviewer2-qt5</exec_depend>
+  <exec_depend>libqt5-core</exec_depend>
+  <exec_depend>libqt5-gui</exec_depend>
+  <exec_depend>libqt5-opengl</exec_depend>
+
+  <!-- Qt4 -->
+  <!-- <exec_depend>libqglviewer-qt4</exec_depend>
   <exec_depend>libqtgui4</exec_depend>
-  <exec_depend>libqt4-opengl</exec_depend>
+  <exec_depend>libqt4-opengl</exec_depend> -->
 </package>