From c8275800ffc1f038e70a82787dea3a3e761e47f9 Mon Sep 17 00:00:00 2001 From: Niklas Yann Wettengel <niyawe@uni-koblenz.de> Date: Fri, 4 Nov 2016 00:30:16 +0100 Subject: [PATCH] Rebase from 'upstream' --- README.md | 28 ++++++++++++++++++++++++++++ homer_map_manager/CHANGELOG.rst | 3 +++ homer_map_manager/package.xml | 2 +- homer_mapnav_msgs/CHANGELOG.rst | 3 +++ homer_mapnav_msgs/package.xml | 2 +- homer_mapping/CHANGELOG.rst | 3 +++ homer_mapping/package.xml | 2 +- homer_nav_libs/CHANGELOG.rst | 3 +++ homer_nav_libs/package.xml | 2 +- homer_navigation/CHANGELOG.rst | 5 +++++ homer_navigation/CMakeLists.txt | 1 + homer_navigation/package.xml | 5 ++++- tracks.yaml | 2 +- 13 files changed, 55 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index e6a49ded..0b7104af 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,31 @@ +## homer_mapping (kinetic) - 0.1.4-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 22:52:01 -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: git@gitlab.uni-koblenz.de:robbie/homer_mapping.git +- rosdistro version: `0.1.2-0` +- old version: `0.1.2-0` +- new version: `0.1.4-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.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` diff --git a/homer_map_manager/CHANGELOG.rst b/homer_map_manager/CHANGELOG.rst index 4bfc5313..18211e6f 100644 --- a/homer_map_manager/CHANGELOG.rst +++ b/homer_map_manager/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package homer_map_manager ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.5 (2016-11-04) +------------------ + 0.1.4 (2016-11-03) ------------------ * updated changelog diff --git a/homer_map_manager/package.xml b/homer_map_manager/package.xml index ff649101..5842a750 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.4</version> + <version>0.1.5</version> <description> map_manager </description> diff --git a/homer_mapnav_msgs/CHANGELOG.rst b/homer_mapnav_msgs/CHANGELOG.rst index 3d84d4b5..333001d9 100644 --- a/homer_mapnav_msgs/CHANGELOG.rst +++ b/homer_mapnav_msgs/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package homer_mapnav_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.5 (2016-11-04) +------------------ + 0.1.4 (2016-11-03) ------------------ * updated changelog diff --git a/homer_mapnav_msgs/package.xml b/homer_mapnav_msgs/package.xml index c6b38739..72a2bf5d 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.4</version> + <version>0.1.5</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 71759004..f4b7f71d 100644 --- a/homer_mapping/CHANGELOG.rst +++ b/homer_mapping/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package homer_mapping ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.5 (2016-11-04) +------------------ + 0.1.4 (2016-11-03) ------------------ * updated changelog diff --git a/homer_mapping/package.xml b/homer_mapping/package.xml index c1a47df9..abd2c295 100644 --- a/homer_mapping/package.xml +++ b/homer_mapping/package.xml @@ -1,6 +1,6 @@ <package> <name>homer_mapping</name> - <version>0.1.4</version> + <version>0.1.5</version> <description> homer_mapping diff --git a/homer_nav_libs/CHANGELOG.rst b/homer_nav_libs/CHANGELOG.rst index 742209cb..0c670636 100644 --- a/homer_nav_libs/CHANGELOG.rst +++ b/homer_nav_libs/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package homer_nav_libs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.5 (2016-11-04) +------------------ + 0.1.4 (2016-11-03) ------------------ * updated changelog diff --git a/homer_nav_libs/package.xml b/homer_nav_libs/package.xml index 59168f2b..387b0d0c 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.4</version> + <version>0.1.5</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 ee7e1c25..53ad70bf 100644 --- a/homer_navigation/CHANGELOG.rst +++ b/homer_navigation/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package homer_navigation ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.1.5 (2016-11-04) +------------------ +* fixed dependencies +* Contributors: Niklas Yann Wettengel + 0.1.4 (2016-11-03) ------------------ * fixes diff --git a/homer_navigation/CMakeLists.txt b/homer_navigation/CMakeLists.txt index f68d5b3b..0d5bda2d 100644 --- a/homer_navigation/CMakeLists.txt +++ b/homer_navigation/CMakeLists.txt @@ -11,6 +11,7 @@ find_package(catkin REQUIRED COMPONENTS homer_nav_libs tf cmake_modules + homer_ptu_msgs ) find_package(Eigen3 REQUIRED) diff --git a/homer_navigation/package.xml b/homer_navigation/package.xml index 3c9c8637..e76263aa 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.4</version> + <version>0.1.5</version> <description>The homer_navigation package</description> <maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer> @@ -22,6 +22,7 @@ <build_depend>tf</build_depend> <build_depend>cmake_modules</build_depend> <build_depend>eigen</build_depend> + <build_depend>homer_ptu_msgs</build_depend> <run_depend>roscpp</run_depend> <run_depend>roslib</run_depend> @@ -32,5 +33,7 @@ <run_depend>homer_mapnav_msgs</run_depend> <run_depend>std_msgs</run_depend> <run_depend>tf</run_depend> + <run_depend>eigen</run_depend> + <run_depend>homer_ptu_msgs</run_depend> </package> diff --git a/tracks.yaml b/tracks.yaml index 8eb1dbd1..b102c87a 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.2 + last_version: 0.1.4 name: upstream patches: null release_inc: '0' -- GitLab