From 92fdf22e57c6ec72705cb32a9dba9ac75caa7151 Mon Sep 17 00:00:00 2001
From: Niklas Yann Wettengel <niyawe@uni-koblenz.de>
Date: Thu, 3 Nov 2016 23:50:33 +0100
Subject: [PATCH] Rebase from 'upstream'
---
README.md | 28 +++++++++++++++++++
homer_map_manager/CHANGELOG.rst | 8 ++++++
homer_map_manager/package.xml | 2 +-
homer_mapnav_msgs/CHANGELOG.rst | 8 ++++++
homer_mapnav_msgs/package.xml | 2 +-
homer_mapping/CHANGELOG.rst | 14 ++++++++++
homer_mapping/CMakeLists.txt | 12 +++++++-
homer_mapping/package.xml | 10 ++++++-
.../src/OccupancyMap/OccupancyMap.cpp | 2 +-
homer_nav_libs/CHANGELOG.rst | 10 +++++++
homer_nav_libs/CMakeLists.txt | 2 +-
homer_nav_libs/package.xml | 2 +-
homer_navigation/CHANGELOG.rst | 9 ++++++
homer_navigation/CMakeLists.txt | 2 +-
homer_navigation/package.xml | 2 +-
tracks.yaml | 2 +-
16 files changed, 105 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index 1d289b3f..e6a49ded 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,31 @@
+## homer_mapping (kinetic) - 0.1.2-0
+
+The packages in the `homer_mapping` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_mapping` on `Thu, 03 Nov 2016 21:35:49 -0000`
+
+These packages were released:
+- `homer_map_manager`
+- `homer_mapnav_msgs`
+- `homer_mapping`
+- `homer_nav_libs`
+- `homer_navigation`
+
+Version of package(s) in repository `homer_mapping`:
+
+- upstream repository: git@gitlab.uni-koblenz.de:robbie/homer_mapping.git
+- release repository: unknown
+- rosdistro version: `null`
+- old version: `0.1.1-0`
+- new version: `0.1.2-0`
+
+Versions of tools used:
+
+- bloom version: `0.5.23`
+- catkin_pkg version: `0.2.10`
+- rosdep version: `0.11.5`
+- rosdistro version: `0.5.0`
+- vcstools version: `0.1.39`
+
+
## homer_mapping (kinetic) - 0.1.1-0
The packages in the `homer_mapping` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_mapping` on `Thu, 03 Nov 2016 21:29:57 -0000`
diff --git a/homer_map_manager/CHANGELOG.rst b/homer_map_manager/CHANGELOG.rst
index f6703419..4bfc5313 100644
--- a/homer_map_manager/CHANGELOG.rst
+++ b/homer_map_manager/CHANGELOG.rst
@@ -2,6 +2,14 @@
Changelog for package homer_map_manager
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.1.4 (2016-11-03)
+------------------
+* updated changelog
+* Contributors: Niklas Yann Wettengel
+
+0.1.3 (2016-11-03)
+------------------
+
0.1.2 (2016-11-03)
------------------
diff --git a/homer_map_manager/package.xml b/homer_map_manager/package.xml
index 5f60f1cd..ff649101 100644
--- a/homer_map_manager/package.xml
+++ b/homer_map_manager/package.xml
@@ -1,6 +1,6 @@
<package>
<name>homer_map_manager</name>
- <version>0.1.2</version>
+ <version>0.1.4</version>
<description>
map_manager
</description>
diff --git a/homer_mapnav_msgs/CHANGELOG.rst b/homer_mapnav_msgs/CHANGELOG.rst
index ba507a3d..3d84d4b5 100644
--- a/homer_mapnav_msgs/CHANGELOG.rst
+++ b/homer_mapnav_msgs/CHANGELOG.rst
@@ -2,6 +2,14 @@
Changelog for package homer_mapnav_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.1.4 (2016-11-03)
+------------------
+* updated changelog
+* Contributors: Niklas Yann Wettengel
+
+0.1.3 (2016-11-03)
+------------------
+
0.1.2 (2016-11-03)
------------------
diff --git a/homer_mapnav_msgs/package.xml b/homer_mapnav_msgs/package.xml
index e9f55c1c..c6b38739 100644
--- a/homer_mapnav_msgs/package.xml
+++ b/homer_mapnav_msgs/package.xml
@@ -1,6 +1,6 @@
<package>
<name>homer_mapnav_msgs</name>
- <version>0.1.2</version>
+ <version>0.1.4</version>
<description> homer_mapnav_msgs contains the messages used for mapping and navigation
</description>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
diff --git a/homer_mapping/CHANGELOG.rst b/homer_mapping/CHANGELOG.rst
index 59658505..71759004 100644
--- a/homer_mapping/CHANGELOG.rst
+++ b/homer_mapping/CHANGELOG.rst
@@ -2,6 +2,20 @@
Changelog for package homer_mapping
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.1.4 (2016-11-03)
+------------------
+* updated changelog
+* fixes
+* Contributors: Niklas Yann Wettengel
+
+* fixes
+* Contributors: Niklas Yann Wettengel
+
+0.1.3 (2016-11-03)
+------------------
+* more fixes
+* Contributors: Niklas Yann Wettengel
+
0.1.2 (2016-11-03)
------------------
* install launch files
diff --git a/homer_mapping/CMakeLists.txt b/homer_mapping/CMakeLists.txt
index 0858a86c..d23e0e2f 100644
--- a/homer_mapping/CMakeLists.txt
+++ b/homer_mapping/CMakeLists.txt
@@ -17,6 +17,11 @@ if (OPENMP_FOUND)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
endif()
find_package(tf REQUIRED)
+find_package(Eigen3 REQUIRED)
+
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+find_package(Qt5 REQUIRED COMPONENTS Core Widgets)
+
set(CMAKE_BUILD_TYPE Release)
@@ -24,6 +29,9 @@ set(CMAKE_BUILD_TYPE Release)
include_directories(
include
${catkin_INCLUDE_DIRS}
+ ${EIGEN3_INCLUDE_DIRS}
+ ${Qt5Core_INCLUDE_DIRS}
+ ${Qt5Widgets_INCLUDE_DIRS}
)
catkin_package(
@@ -35,7 +43,7 @@ catkin_package(
nav_msgs
tf
roslib
- LIBRARIES homerOccupancyMap homerParticleFilter
+ LIBRARIES homerOccupancyMap homerParticleFilter
)
add_library(homerOccupancyMap
@@ -47,6 +55,8 @@ target_link_libraries(
homerOccupancyMap
${catkin_LIBRARIES}
${tf_LIBRARIES}
+ ${Qt5Core_LIBRARIES}
+ ${Qt5Widgets_LIBRARIES}
)
set(
ParticleFilter_SRC
diff --git a/homer_mapping/package.xml b/homer_mapping/package.xml
index b32db3c5..c1a47df9 100644
--- a/homer_mapping/package.xml
+++ b/homer_mapping/package.xml
@@ -1,6 +1,6 @@
<package>
<name>homer_mapping</name>
- <version>0.1.2</version>
+ <version>0.1.4</version>
<description>
homer_mapping
@@ -20,6 +20,10 @@
<build_depend>homer_nav_libs</build_depend>
<build_depend>homer_mapnav_msgs</build_depend>
<build_depend>cmake_modules</build_depend>
+ <build_depend>eigen</build_depend>
+ <build_depend>libqt5-core</build_depend>
+ <build_depend>libqt5-gui</build_depend>
+ <build_depend>libqt5-widgets</build_depend>
<run_depend>std_msgs</run_depend>
@@ -30,5 +34,9 @@
<run_depend>roslib</run_depend>
<run_depend>homer_nav_libs</run_depend>
<run_depend>homer_mapnav_msgs</run_depend>
+ <run_depend>eigen</run_depend>
+ <run_depend>libqt5-core</run_depend>
+ <run_depend>libqt5-gui</run_depend>
+ <run_depend>libqt5-widgets</run_depend>
</package>
diff --git a/homer_mapping/src/OccupancyMap/OccupancyMap.cpp b/homer_mapping/src/OccupancyMap/OccupancyMap.cpp
index 5ab3b94a..7318e38a 100644
--- a/homer_mapping/src/OccupancyMap/OccupancyMap.cpp
+++ b/homer_mapping/src/OccupancyMap/OccupancyMap.cpp
@@ -6,7 +6,7 @@
#include <vector>
#include <fstream>
#include <sstream>
-#include <QImage>
+#include <QtGui/QImage>
#include <Eigen/Geometry>
diff --git a/homer_nav_libs/CHANGELOG.rst b/homer_nav_libs/CHANGELOG.rst
index d302abb0..742209cb 100644
--- a/homer_nav_libs/CHANGELOG.rst
+++ b/homer_nav_libs/CHANGELOG.rst
@@ -2,6 +2,16 @@
Changelog for package homer_nav_libs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.1.4 (2016-11-03)
+------------------
+* updated changelog
+* Contributors: Niklas Yann Wettengel
+
+0.1.3 (2016-11-03)
+------------------
+* more fixes
+* Contributors: Niklas Yann Wettengel
+
0.1.2 (2016-11-03)
------------------
diff --git a/homer_nav_libs/CMakeLists.txt b/homer_nav_libs/CMakeLists.txt
index c3682171..4bdc2491 100644
--- a/homer_nav_libs/CMakeLists.txt
+++ b/homer_nav_libs/CMakeLists.txt
@@ -15,7 +15,7 @@ catkin_package(
INCLUDE_DIRS include
LIBRARIES homerExplorer homerMappingMath
CATKIN_DEPENDS roscpp geometry_msgs tf
- DEPENDS Eigen3)
+)
include_directories(
diff --git a/homer_nav_libs/package.xml b/homer_nav_libs/package.xml
index 477629e6..59168f2b 100644
--- a/homer_nav_libs/package.xml
+++ b/homer_nav_libs/package.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>homer_nav_libs</name>
- <version>0.1.2</version>
+ <version>0.1.4</version>
<description>The nav_libs package</description>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
diff --git a/homer_navigation/CHANGELOG.rst b/homer_navigation/CHANGELOG.rst
index d4f55850..ee7e1c25 100644
--- a/homer_navigation/CHANGELOG.rst
+++ b/homer_navigation/CHANGELOG.rst
@@ -2,6 +2,15 @@
Changelog for package homer_navigation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.1.4 (2016-11-03)
+------------------
+* fixes
+* updated changelog
+* Contributors: Niklas Yann Wettengel
+
+0.1.3 (2016-11-03)
+------------------
+
0.1.2 (2016-11-03)
------------------
* install launch files
diff --git a/homer_navigation/CMakeLists.txt b/homer_navigation/CMakeLists.txt
index b15cf091..f68d5b3b 100644
--- a/homer_navigation/CMakeLists.txt
+++ b/homer_navigation/CMakeLists.txt
@@ -33,7 +33,7 @@ catkin_package(
include_directories(
include
${catkin_INCLUDE_DIRS}
- ${Eigen3_INCLUDE_DIRS}
+ ${EIGEN3_INCLUDE_DIRS}
)
add_executable(homer_navigation src/homer_navigation_node.cpp)
diff --git a/homer_navigation/package.xml b/homer_navigation/package.xml
index 3959e0ea..3c9c8637 100644
--- a/homer_navigation/package.xml
+++ b/homer_navigation/package.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>homer_navigation</name>
- <version>0.1.2</version>
+ <version>0.1.4</version>
<description>The homer_navigation package</description>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
diff --git a/tracks.yaml b/tracks.yaml
index 39df21a4..8eb1dbd1 100644
--- a/tracks.yaml
+++ b/tracks.yaml
@@ -13,7 +13,7 @@ tracks:
- git-bloom-generate -y rosrpm --prefix release/:{ros_distro} :{ros_distro} -i
:{release_inc}
devel_branch: master
- last_version: 0.1.1
+ last_version: 0.1.2
name: upstream
patches: null
release_inc: '0'
--
GitLab