From 1136329e451d3f786dd4e93e0ddf8ce1f5a73c36 Mon Sep 17 00:00:00 2001
From: Niklas Yann Wettengel <niyawe@uni-koblenz.de>
Date: Fri, 27 Nov 2015 15:30:16 +0100
Subject: [PATCH] Rebase from 'upstream'
---
README.md | 26 ++++++++++++++++++++++++++
homer_map_manager/CHANGELOG.rst | 5 +++++
homer_map_manager/CMakeLists.txt | 1 -
homer_map_manager/package.xml | 2 +-
homer_mapnav_msgs/CHANGELOG.rst | 3 +++
homer_mapnav_msgs/package.xml | 2 +-
homer_mapping/CHANGELOG.rst | 5 +++++
homer_mapping/CMakeLists.txt | 1 -
homer_mapping/package.xml | 2 +-
homer_nav_libs/CHANGELOG.rst | 7 +++++++
homer_nav_libs/CMakeLists.txt | 1 -
homer_nav_libs/package.xml | 9 ++++++++-
homer_navigation/CHANGELOG.rst | 5 +++++
homer_navigation/CMakeLists.txt | 1 -
homer_navigation/package.xml | 2 +-
tracks.yaml | 2 +-
16 files changed, 64 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index 9d81d06f..6aa979d3 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,29 @@
+## homer_mapnav (indigo) - 1.0.5-0
+
+The packages in the `homer_mapnav` repository were released into the `indigo` distro by running `/usr/bin/bloom-release --rosdistro indigo --track indigo homer_mapnav` on `Tue, 24 Nov 2015 13:28:24 -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_mapnav`:
+- upstream repository: https://gitlab.uni-koblenz.de/robbie/homer_mapnav.git
+- release repository: https://gitlab.uni-koblenz.de/robbie/homer_mapnav.git
+- rosdistro version: `1.0.4-0`
+- old version: `1.0.4-0`
+- new version: `1.0.5-0`
+
+Versions of tools used:
+- bloom version: `0.5.20`
+- catkin_pkg version: `0.2.10`
+- rosdep version: `0.11.4`
+- rosdistro version: `0.4.2`
+- vcstools version: `0.1.38`
+
+
## homer_mapnav (indigo) - 1.0.4-0
The packages in the `homer_mapnav` repository were released into the `indigo` distro by running `/usr/bin/bloom-release --rosdistro indigo --track indigo homer_mapnav` on `Fri, 20 Nov 2015 02:07:32 -0000`
diff --git a/homer_map_manager/CHANGELOG.rst b/homer_map_manager/CHANGELOG.rst
index d093e858..9ecbc79d 100644
--- a/homer_map_manager/CHANGELOG.rst
+++ b/homer_map_manager/CHANGELOG.rst
@@ -2,6 +2,11 @@
Changelog for package homer_map_manager
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.0.6 (2015-11-27)
+------------------
+* removed env HOMER_DIR from CMakeLists.txt
+* Contributors: Niklas Yann Wettengel
+
1.0.5 (2015-11-24)
------------------
diff --git a/homer_map_manager/CMakeLists.txt b/homer_map_manager/CMakeLists.txt
index 51047e8d..fe06aecf 100644
--- a/homer_map_manager/CMakeLists.txt
+++ b/homer_map_manager/CMakeLists.txt
@@ -8,7 +8,6 @@ find_package( Eigen REQUIRED )
include_directories(
${catkin_INCLUDE_DIRS}
${EIGEN_INCLUDE_DIRS}
- $ENV{HOMER_DIR}
)
add_subdirectory(${PROJECT_SOURCE_DIR}/src/Managers)
diff --git a/homer_map_manager/package.xml b/homer_map_manager/package.xml
index 90f19375..6b2f17d6 100644
--- a/homer_map_manager/package.xml
+++ b/homer_map_manager/package.xml
@@ -1,6 +1,6 @@
<package>
<name>homer_map_manager</name>
- <version>1.0.5</version>
+ <version>1.0.6</version>
<description>
map_manager
</description>
diff --git a/homer_mapnav_msgs/CHANGELOG.rst b/homer_mapnav_msgs/CHANGELOG.rst
index aa01d87c..a164dd15 100644
--- a/homer_mapnav_msgs/CHANGELOG.rst
+++ b/homer_mapnav_msgs/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package mapnav_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.0.6 (2015-11-27)
+------------------
+
1.0.5 (2015-11-24)
------------------
diff --git a/homer_mapnav_msgs/package.xml b/homer_mapnav_msgs/package.xml
index fd8e5f27..e727f738 100644
--- a/homer_mapnav_msgs/package.xml
+++ b/homer_mapnav_msgs/package.xml
@@ -1,6 +1,6 @@
<package>
<name>homer_mapnav_msgs</name>
- <version>1.0.5</version>
+ <version>1.0.6</version>
<description>
mapnav_msgs
diff --git a/homer_mapping/CHANGELOG.rst b/homer_mapping/CHANGELOG.rst
index d2f9d729..bec2c04d 100644
--- a/homer_mapping/CHANGELOG.rst
+++ b/homer_mapping/CHANGELOG.rst
@@ -2,6 +2,11 @@
Changelog for package homer_mapping
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.0.6 (2015-11-27)
+------------------
+* removed env HOMER_DIR from CMakeLists.txt
+* Contributors: Niklas Yann Wettengel
+
1.0.5 (2015-11-24)
------------------
diff --git a/homer_mapping/CMakeLists.txt b/homer_mapping/CMakeLists.txt
index 489b7f6a..b794c6fa 100644
--- a/homer_mapping/CMakeLists.txt
+++ b/homer_mapping/CMakeLists.txt
@@ -17,7 +17,6 @@ set(CMAKE_BUILD_TYPE Release)
include_directories(
${catkin_INCLUDE_DIRS}
- $ENV{HOMER_DIR}
)
catkin_package(
diff --git a/homer_mapping/package.xml b/homer_mapping/package.xml
index 20343828..2d53b608 100644
--- a/homer_mapping/package.xml
+++ b/homer_mapping/package.xml
@@ -1,6 +1,6 @@
<package>
<name>homer_mapping</name>
- <version>1.0.5</version>
+ <version>1.0.6</version>
<description>
homer_mapping
diff --git a/homer_nav_libs/CHANGELOG.rst b/homer_nav_libs/CHANGELOG.rst
index 164f1681..9545218b 100644
--- a/homer_nav_libs/CHANGELOG.rst
+++ b/homer_nav_libs/CHANGELOG.rst
@@ -2,6 +2,13 @@
Changelog for package homer_nav_libs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.0.6 (2015-11-27)
+------------------
+* added export tags
+* added eigen as run_depend
+* removed env HOMER_DIR from CMakeLists.txt
+* Contributors: Niklas Yann Wettengel
+
1.0.5 (2015-11-24)
------------------
* added missing files
diff --git a/homer_nav_libs/CMakeLists.txt b/homer_nav_libs/CMakeLists.txt
index cecf3083..1909a3f9 100644
--- a/homer_nav_libs/CMakeLists.txt
+++ b/homer_nav_libs/CMakeLists.txt
@@ -21,7 +21,6 @@ include_directories(
src
${catkin_INCLUDE_DIRS}
${Eigen_INCLUDE_DIRS}
- $ENV{HOMER_DIR}
)
add_subdirectory(src/Explorer)
diff --git a/homer_nav_libs/package.xml b/homer_nav_libs/package.xml
index 4e4479ec..0468e7d8 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>1.0.5</version>
+ <version>1.0.6</version>
<description>The nav_libs package</description>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
@@ -21,5 +21,12 @@
<run_depend>roscpp</run_depend>
<run_depend>geometry_msgs</run_depend>
<run_depend>tf</run_depend>
+ <run_depend>eigen</run_depend>
+
+ <export>
+ <cpp cflags="-I${prefix}/src" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lExplorer"/>
+ <cpp cflags="-I${prefix}/src" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lMappingMath"/>
+ <cpp cflags="-I${prefix}/src" lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lSpeedControl"/>
+ </export>
</package>
diff --git a/homer_navigation/CHANGELOG.rst b/homer_navigation/CHANGELOG.rst
index 5f5aaabd..7d225c0c 100644
--- a/homer_navigation/CHANGELOG.rst
+++ b/homer_navigation/CHANGELOG.rst
@@ -2,6 +2,11 @@
Changelog for package homer_navigation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.0.6 (2015-11-27)
+------------------
+* removed env HOMER_DIR from CMakeLists.txt
+* Contributors: Niklas Yann Wettengel
+
1.0.5 (2015-11-24)
------------------
* added missing files
diff --git a/homer_navigation/CMakeLists.txt b/homer_navigation/CMakeLists.txt
index a18e69a7..e2aac45a 100644
--- a/homer_navigation/CMakeLists.txt
+++ b/homer_navigation/CMakeLists.txt
@@ -17,7 +17,6 @@ include_directories(
include
${catkin_INCLUDE_DIRS}
${Eigen_INCLUDE_DIRS}
- $ENV{HOMER_DIR}
)
add_executable(homer_navigation src/homer_navigation_node.cpp)
diff --git a/homer_navigation/package.xml b/homer_navigation/package.xml
index 453dceab..0c1c0444 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>1.0.5</version>
+ <version>1.0.6</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 35fc5c02..297aea0d 100644
--- a/tracks.yaml
+++ b/tracks.yaml
@@ -11,7 +11,7 @@ tracks:
- git-bloom-generate -y rosrpm --prefix release/:{ros_distro} :{ros_distro} -i
:{release_inc}
devel_branch: null
- last_version: 1.0.4
+ last_version: 1.0.5
name: upstream
patches: null
release_inc: '0'
--
GitLab