From fceaf84579a1f5c68803e60eed1db9e1f261347e Mon Sep 17 00:00:00 2001
From: Niklas Yann Wettengel <niyawe@uni-koblenz.de>
Date: Wed, 2 Dec 2015 11:45:37 +0100
Subject: [PATCH] Rebase from 'upstream'
---
README.md | 26 +++++++++++++++++++
homer_map_manager/CHANGELOG.rst | 5 ++++
homer_map_manager/CMakeLists.txt | 3 ++-
homer_map_manager/package.xml | 4 ++-
homer_mapnav_msgs/CHANGELOG.rst | 3 +++
homer_mapnav_msgs/package.xml | 2 +-
homer_mapping/CHANGELOG.rst | 6 +++++
homer_mapping/CMakeLists.txt | 2 --
homer_mapping/package.xml | 2 +-
.../src/ParticleFilter/CMakeLists.txt | 2 +-
homer_nav_libs/CHANGELOG.rst | 3 +++
homer_nav_libs/package.xml | 2 +-
homer_navigation/CHANGELOG.rst | 3 +++
homer_navigation/package.xml | 2 +-
tracks.yaml | 2 +-
15 files changed, 57 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index 4081e35f..84fbe5a4 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,29 @@
+## homer_mapnav (indigo) - 1.0.10-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, 01 Dec 2015 23:59:02 -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.9-0`
+- old version: `1.0.9-0`
+- new version: `1.0.10-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.9-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, 01 Dec 2015 17:52:28 -0000`
diff --git a/homer_map_manager/CHANGELOG.rst b/homer_map_manager/CHANGELOG.rst
index f01099e4..6c54e90a 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.11 (2015-12-02)
+-------------------
+* added std_srvs dependency
+* Contributors: Niklas Yann Wettengel
+
1.0.10 (2015-12-02)
-------------------
* added yaml-cpp dependency
diff --git a/homer_map_manager/CMakeLists.txt b/homer_map_manager/CMakeLists.txt
index c8269a56..6b3b07b1 100644
--- a/homer_map_manager/CMakeLists.txt
+++ b/homer_map_manager/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.3)
project(homer_map_manager)
-find_package(catkin REQUIRED COMPONENTS roscpp roslib tf homer_mapnav_msgs homer_nav_libs cmake_modules)
+find_package(catkin REQUIRED COMPONENTS roscpp roslib tf homer_mapnav_msgs homer_nav_libs std_srvs cmake_modules)
find_package( Eigen REQUIRED )
@@ -12,6 +12,7 @@ catkin_package(
tf
homer_mapnav_msgs
homer_nav_libs
+ std_srvs
)
include_directories(
diff --git a/homer_map_manager/package.xml b/homer_map_manager/package.xml
index fc673640..cde8463f 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.10</version>
+ <version>1.0.11</version>
<description>
map_manager
</description>
@@ -23,6 +23,7 @@
<build_depend>sdl</build_depend>
<build_depend>sdl-image</build_depend>
<build_depend>yaml-cpp</build_depend>
+ <build_depend>std_srvs</build_depend>
<run_depend>roscpp</run_depend>
<run_depend>roslib</run_depend>
@@ -33,6 +34,7 @@
<run_depend>sdl</run_depend>
<run_depend>sdl-image</run_depend>
<run_depend>yaml-cpp</run_depend>
+ <run_depend>std_srvs</run_depend>
</package>
diff --git a/homer_mapnav_msgs/CHANGELOG.rst b/homer_mapnav_msgs/CHANGELOG.rst
index a11c746b..0701f2d2 100644
--- a/homer_mapnav_msgs/CHANGELOG.rst
+++ b/homer_mapnav_msgs/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package mapnav_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.0.11 (2015-12-02)
+-------------------
+
1.0.10 (2015-12-02)
-------------------
diff --git a/homer_mapnav_msgs/package.xml b/homer_mapnav_msgs/package.xml
index b4845341..e669921f 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.10</version>
+ <version>1.0.11</version>
<description>
mapnav_msgs
diff --git a/homer_mapping/CHANGELOG.rst b/homer_mapping/CHANGELOG.rst
index 4f1d9f17..59caf0fd 100644
--- a/homer_mapping/CHANGELOG.rst
+++ b/homer_mapping/CHANGELOG.rst
@@ -2,6 +2,12 @@
Changelog for package homer_mapping
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.0.11 (2015-12-02)
+-------------------
+* added std_srvs dependency
+* fixed libraries
+* Contributors: Niklas Yann Wettengel
+
1.0.10 (2015-12-02)
-------------------
diff --git a/homer_mapping/CMakeLists.txt b/homer_mapping/CMakeLists.txt
index 23ce4fa7..b0b71008 100644
--- a/homer_mapping/CMakeLists.txt
+++ b/homer_mapping/CMakeLists.txt
@@ -38,10 +38,8 @@ add_executable(homer_mapping src/slam_node.cpp)
target_link_libraries(
homer_mapping
${catkin_LIBRARIES}
- MappingMath
ParticleFilter
OccupancyMap
- Explorer
)
add_dependencies(
diff --git a/homer_mapping/package.xml b/homer_mapping/package.xml
index 75497839..8b06810c 100644
--- a/homer_mapping/package.xml
+++ b/homer_mapping/package.xml
@@ -1,6 +1,6 @@
<package>
<name>homer_mapping</name>
- <version>1.0.10</version>
+ <version>1.0.11</version>
<description>
homer_mapping
diff --git a/homer_mapping/src/ParticleFilter/CMakeLists.txt b/homer_mapping/src/ParticleFilter/CMakeLists.txt
index d96f7175..b144c3d0 100644
--- a/homer_mapping/src/ParticleFilter/CMakeLists.txt
+++ b/homer_mapping/src/ParticleFilter/CMakeLists.txt
@@ -14,5 +14,5 @@ add_library(
target_link_libraries(
ParticleFilter
OccupancyMap
- MappingMath
+ ${homer_nav_libs_LIBRARIES}
)
diff --git a/homer_nav_libs/CHANGELOG.rst b/homer_nav_libs/CHANGELOG.rst
index 2233c50c..d1e43a0c 100644
--- a/homer_nav_libs/CHANGELOG.rst
+++ b/homer_nav_libs/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package homer_nav_libs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.0.11 (2015-12-02)
+-------------------
+
1.0.10 (2015-12-02)
-------------------
* fixed install()
diff --git a/homer_nav_libs/package.xml b/homer_nav_libs/package.xml
index 02eed3e0..40114772 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.10</version>
+ <version>1.0.11</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 4a61cd9b..37ba899b 100644
--- a/homer_navigation/CHANGELOG.rst
+++ b/homer_navigation/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package homer_navigation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.0.11 (2015-12-02)
+-------------------
+
1.0.10 (2015-12-02)
-------------------
diff --git a/homer_navigation/package.xml b/homer_navigation/package.xml
index eebdd151..3526b914 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.10</version>
+ <version>1.0.11</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 8d4acd80..3ec3f7ab 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.9
+ last_version: 1.0.10
name: upstream
patches: null
release_inc: '0'
--
GitLab