Skip to content
Snippets Groups Projects
Commit 96645c30 authored by Niklas Yann Wettengel's avatar Niklas Yann Wettengel
Browse files

Rebase from 'upstream'

parent 49a5f9ed
No related branches found
No related tags found
No related merge requests found
Showing
with 101 additions and 18 deletions
## homer_mapnav (indigo) - 1.0.6-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, 27 Nov 2015 14:33:00 -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.5-0`
- old version: `1.0.5-0`
- new version: `1.0.6-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.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`
......
......@@ -2,6 +2,15 @@
Changelog for package homer_map_manager
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1.0.7 (2015-11-28)
------------------
* updated changelog
* updated catkin_depends
* Contributors: Niklas Yann Wettengel
* updated catkin_depends
* Contributors: Niklas Yann Wettengel
1.0.6 (2015-11-27)
------------------
* removed env HOMER_DIR from CMakeLists.txt
......
......@@ -5,6 +5,15 @@ find_package(catkin REQUIRED COMPONENTS roscpp roslib tf homer_mapnav_msgs homer
find_package( Eigen REQUIRED )
catkin_package(
CATKIN_DEPENDS
roscpp
roslib
tf
homer_mapnav_msgs
homer_nav_libs
)
include_directories(
${catkin_INCLUDE_DIRS}
${EIGEN_INCLUDE_DIRS}
......@@ -13,11 +22,6 @@ include_directories(
add_subdirectory(${PROJECT_SOURCE_DIR}/src/Managers)
add_subdirectory(${PROJECT_SOURCE_DIR}/src/MapIO)
catkin_package(
CATKIN_DEPENDS
roscpp
)
add_executable(map_manager src/map_manager_node.cpp)
target_link_libraries(
......
<package>
<name>homer_map_manager</name>
<version>1.0.6</version>
<version>1.0.7</version>
<description>
map_manager
</description>
......
......@@ -2,6 +2,11 @@
Changelog for package mapnav_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1.0.7 (2015-11-28)
------------------
* updated changelog
* Contributors: Niklas Yann Wettengel
1.0.6 (2015-11-27)
------------------
......
<package>
<name>homer_mapnav_msgs</name>
<version>1.0.6</version>
<version>1.0.7</version>
<description>
mapnav_msgs
......
......@@ -2,6 +2,15 @@
Changelog for package homer_mapping
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1.0.7 (2015-11-28)
------------------
* updated changelog
* updated catkin_depends
* Contributors: Niklas Yann Wettengel
* updated catkin_depends
* Contributors: Niklas Yann Wettengel
1.0.6 (2015-11-27)
------------------
* removed env HOMER_DIR from CMakeLists.txt
......
......@@ -12,6 +12,17 @@ find_package(
roslib
)
catkin_package(
CATKIN_DEPENDS
roscpp
homer_mapnav_msgs
sensor_msgs
nav_msgs
homer_nav_libs
tf
roslib
)
set(CMAKE_BUILD_TYPE Release)
......@@ -19,11 +30,6 @@ include_directories(
${catkin_INCLUDE_DIRS}
)
catkin_package(
CATKIN_DEPENDS
roscpp
)
add_subdirectory(${PROJECT_SOURCE_DIR}/src/OccupancyMap)
add_subdirectory(${PROJECT_SOURCE_DIR}/src/ParticleFilter)
......
<package>
<name>homer_mapping</name>
<version>1.0.6</version>
<version>1.0.7</version>
<description>
homer_mapping
......
......@@ -2,6 +2,12 @@
Changelog for package homer_nav_libs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1.0.7 (2015-11-28)
------------------
* added install()
* updated changelog
* Contributors: Niklas Yann Wettengel
1.0.6 (2015-11-27)
------------------
* added export tags
......
<?xml version="1.0"?>
<package>
<name>homer_nav_libs</name>
<version>1.0.6</version>
<version>1.0.7</version>
<description>The nav_libs package</description>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
......
......@@ -3,3 +3,5 @@ set(Explorer_SRC
)
add_library(Explorer ${Explorer_SRC})
install(TARGETS Explorer DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
......@@ -7,3 +7,5 @@ set(Math_SRC
)
add_library(MappingMath ${Math_SRC})
install(TARGETS MappingMath DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
......@@ -3,3 +3,5 @@ set(SpeedControl_SRC
)
add_library(SpeedControl ${SpeedControl_SRC})
install(TARGETS SpeedControl DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
......@@ -2,6 +2,16 @@
Changelog for package homer_navigation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1.0.7 (2015-11-28)
------------------
* added install()
* updated changelog
* updated catkin_depends
* Contributors: Niklas Yann Wettengel
* updated catkin_depends
* Contributors: Niklas Yann Wettengel
1.0.6 (2015-11-27)
------------------
* removed env HOMER_DIR from CMakeLists.txt
......
......@@ -7,12 +7,13 @@ find_package(catkin REQUIRED COMPONENTS
find_package(Eigen REQUIRED)
set(CMAKE_BUILD_TYPE Release)
catkin_package(
INCLUDE_DIRS include
CATKIN_DEPENDS roscpp roslib nav_msgs sensor_msgs homer_mapnav_msgs homer_nav_libs tf robbie_architecture
)
set(CMAKE_BUILD_TYPE Release)
include_directories(
include
${catkin_INCLUDE_DIRS}
......
<?xml version="1.0"?>
<package>
<name>homer_navigation</name>
<version>1.0.6</version>
<version>1.0.7</version>
<description>The homer_navigation package</description>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
......@@ -31,6 +31,7 @@
<run_depend>sensor_msgs</run_depend>
<run_depend>homer_mapnav_msgs</run_depend>
<run_depend>tf</run_depend>
<run_depend>robbie_architecture</run_depend>
<!-- The export tag contains other, unspecified, tags -->
<export>
<!-- You can specify that this package is a metapackage here: -->
......
......@@ -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.5
last_version: 1.0.6
name: upstream
patches: null
release_inc: '0'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment