From 423c069c65c8c7ef2982f34b6075834852aef9a7 Mon Sep 17 00:00:00 2001
From: Niklas Yann Wettengel <niyawe@uni-koblenz.de>
Date: Thu, 3 Nov 2016 22:34:39 +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 | 5 +++++
homer_mapping/CMakeLists.txt | 8 ++++++++
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 | 8 ++++++++
homer_navigation/package.xml | 2 +-
tracks.yaml | 25 +++++++++++++++++++++++++
14 files changed, 93 insertions(+), 5 deletions(-)
create mode 100644 tracks.yaml
diff --git a/README.md b/README.md
index 4443d398..1d289b3f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,31 @@
+## 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`
+
+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: `null`
+- new version: `0.1.1-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`
+
+
# mapping
See:
diff --git a/homer_map_manager/CHANGELOG.rst b/homer_map_manager/CHANGELOG.rst
index 755d8597..f6703419 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.2 (2016-11-03)
+------------------
+
0.1.1 (2016-11-03)
------------------
* fixes
diff --git a/homer_map_manager/package.xml b/homer_map_manager/package.xml
index e95da6d5..5f60f1cd 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.1</version>
+ <version>0.1.2</version>
<description>
map_manager
</description>
diff --git a/homer_mapnav_msgs/CHANGELOG.rst b/homer_mapnav_msgs/CHANGELOG.rst
index 324dcbdf..ba507a3d 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.2 (2016-11-03)
+------------------
+
0.1.1 (2016-11-03)
------------------
* fixes
diff --git a/homer_mapnav_msgs/package.xml b/homer_mapnav_msgs/package.xml
index f1c2ef8a..e9f55c1c 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.1</version>
+ <version>0.1.2</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 4b7831ec..59658505 100644
--- a/homer_mapping/CHANGELOG.rst
+++ b/homer_mapping/CHANGELOG.rst
@@ -2,6 +2,11 @@
Changelog for package homer_mapping
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.1.2 (2016-11-03)
+------------------
+* install launch files
+* Contributors: Niklas Yann Wettengel
+
0.1.1 (2016-11-03)
------------------
* fixes
diff --git a/homer_mapping/CMakeLists.txt b/homer_mapping/CMakeLists.txt
index fee377db..0858a86c 100644
--- a/homer_mapping/CMakeLists.txt
+++ b/homer_mapping/CMakeLists.txt
@@ -89,3 +89,11 @@ install(TARGETS homerOccupancyMap homerParticleFilter homer_mapping
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)
+
+install(DIRECTORY launch/
+ DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
+)
+
+install(DIRECTORY config/
+ DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/config
+)
diff --git a/homer_mapping/package.xml b/homer_mapping/package.xml
index bb664fa5..b32db3c5 100644
--- a/homer_mapping/package.xml
+++ b/homer_mapping/package.xml
@@ -1,6 +1,6 @@
<package>
<name>homer_mapping</name>
- <version>0.1.1</version>
+ <version>0.1.2</version>
<description>
homer_mapping
diff --git a/homer_nav_libs/CHANGELOG.rst b/homer_nav_libs/CHANGELOG.rst
index df486cd2..d302abb0 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.2 (2016-11-03)
+------------------
+
0.1.1 (2016-11-03)
------------------
* fixes
diff --git a/homer_nav_libs/package.xml b/homer_nav_libs/package.xml
index 7f2a2eaa..477629e6 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.1</version>
+ <version>0.1.2</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 5c4aae42..d4f55850 100644
--- a/homer_navigation/CHANGELOG.rst
+++ b/homer_navigation/CHANGELOG.rst
@@ -2,6 +2,11 @@
Changelog for package homer_navigation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.1.2 (2016-11-03)
+------------------
+* install launch files
+* Contributors: Niklas Yann Wettengel
+
0.1.1 (2016-11-03)
------------------
* fixes
diff --git a/homer_navigation/CMakeLists.txt b/homer_navigation/CMakeLists.txt
index 94d03307..b15cf091 100644
--- a/homer_navigation/CMakeLists.txt
+++ b/homer_navigation/CMakeLists.txt
@@ -53,3 +53,11 @@ install(TARGETS homer_navigation
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)
+
+install(DIRECTORY launch/
+ DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
+)
+
+install(DIRECTORY config/
+ DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/config
+)
diff --git a/homer_navigation/package.xml b/homer_navigation/package.xml
index 5752245c..3959e0ea 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.1</version>
+ <version>0.1.2</version>
<description>The homer_navigation package</description>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
diff --git a/tracks.yaml b/tracks.yaml
new file mode 100644
index 00000000..39df21a4
--- /dev/null
+++ b/tracks.yaml
@@ -0,0 +1,25 @@
+tracks:
+ kinetic:
+ actions:
+ - bloom-export-upstream :{vcs_local_uri} :{vcs_type} --tag :{release_tag} --display-uri
+ :{vcs_uri} --name :{name} --output-dir :{archive_dir_path}
+ - git-bloom-import-upstream :{archive_path} :{patches} --release-version :{version}
+ --replace
+ - git-bloom-generate -y rosrelease :{ros_distro} --source upstream -i :{release_inc}
+ - git-bloom-generate -y rosdebian --prefix release/:{ros_distro} :{ros_distro}
+ -i :{release_inc} --os-name ubuntu
+ - git-bloom-generate -y rosdebian --prefix release/:{ros_distro} :{ros_distro}
+ -i :{release_inc} --os-name debian --os-not-required
+ - git-bloom-generate -y rosrpm --prefix release/:{ros_distro} :{ros_distro} -i
+ :{release_inc}
+ devel_branch: master
+ last_version: 0.1.1
+ name: upstream
+ patches: null
+ release_inc: '0'
+ release_repo_url: git@gitlab.uni-koblenz.de:robbie/homer_mapping.git
+ release_tag: :{version}
+ ros_distro: kinetic
+ vcs_type: git
+ vcs_uri: git@gitlab.uni-koblenz.de:robbie/homer_mapping.git
+ version: :{auto}
--
GitLab