Rebase from 'upstream'

README.md

+## homer_mapnav (indigo) - 1.0.13-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, 04 Dec 2015 12:50:49 -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.12-0`
+- old version: `1.0.12-0`
+- new version: `1.0.13-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.12-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 `Thu, 03 Dec 2015 20:55:14 -0000`

homer_map_manager/CHANGELOG.rst

@@ -2,6 +2,11 @@
 Changelog for package homer_map_manager
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.0.14 (2015-12-05)
+-------------------
+* moved header files to include directory
+* Contributors: Niklas Yann Wettengel
+
 1.0.13 (2015-12-04)
 -------------------
 * fixed CMakeLists

homer_map_manager/CMakeLists.txt

@@ -20,9 +20,11 @@ catkin_package(
 		homer_mapnav_msgs
 		homer_nav_libs
 		std_srvs
+	INCLUDE_DIRS include
 )
 
 include_directories(
+	include
 	${catkin_INCLUDE_DIRS}
 	${EIGEN_INCLUDE_DIRS}
 )
@@ -44,3 +46,6 @@ add_dependencies(
 		${catkin_EXPORTED_TARGETS}
 		homer_mapnav_msgs_gencpp
 )
+
+install(TARGETS map_manager DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+install(DIRECTORY include/homer_map_manager/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})

homer_map_manager/package.xml

 <package>
   <name>homer_map_manager</name>
-  <version>1.0.13</version>
+  <version>1.0.14</version>
   <description>
      map_manager
   </description>

homer_map_manager/src/Managers/CMakeLists.txt

@@ -3,3 +3,5 @@ set(Managers_SRC MapManager.cpp MaskingManager.cpp PoiManager.cpp RoiManager.cpp
 add_library(Managers ${Managers_SRC})
 target_link_libraries(Managers image_io)
 add_dependencies(Managers homer_mapnav_msgs_gencpp)
+
+install(TARGETS Managers DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})

homer_map_manager/src/Managers/MapManager.cpp

@@ -4,12 +4,12 @@
 #include <string>
 #include <vector>
 
-#include "MapManager.h"
+#include <homer_map_manager/Managers/MapManager.h>
 
 #include <nav_msgs/OccupancyGrid.h>
 #include <homer_mapnav_msgs/ModifyMap.h>
 #include <homer_mapnav_msgs/MapLayers.h>
-#include <tools/tools.h>
+#include <homer_nav_libs/tools/tools.h>
 
 
 MapManager::MapManager(ros::NodeHandle* nh)

homer_map_manager/src/Managers/MaskingManager.cpp

-#include "MaskingManager.h"
+#include <homer_map_manager/Managers/MaskingManager.h>
 
-#include "ros/ros.h"
+#include <ros/ros.h>
 
 #include <homer_mapnav_msgs/ModifyMap.h>
 

homer_map_manager/src/Managers/PoiManager.cpp

-#include "PoiManager.h"
+#include <homer_map_manager/Managers/PoiManager.h>
 
 #include <sstream>
 
-#include "homer_mapnav_msgs/PointsOfInterest.h"
+#include <homer_mapnav_msgs/PointsOfInterest.h>
 
 #include <ros/ros.h>
 

homer_map_manager/src/Managers/RoiManager.cpp

 #include <sstream>
 
-#include "homer_mapnav_msgs/RegionsOfInterest.h"
+#include <homer_mapnav_msgs/RegionsOfInterest.h>
 
-#include "RoiManager.h"
+#include <homer_map_manager/Managers/RoiManager.h>
 
 RoiManager::RoiManager(ros::NodeHandle *nh)
 {

homer_map_manager/src/MapIO/CMakeLists.txt

 add_library(image_io image_loader.cpp map_saver.cpp map_loader.cpp)
 target_link_libraries(image_io SDL SDL_image yaml-cpp)
 add_dependencies(image_io homer_mapnav_msgs_gencpp)
+install(TARGETS image_io DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})

homer_map_manager/src/MapIO/image_loader.cpp

@@ -42,7 +42,7 @@
 // We use SDL_image to load the image from disk
 #include <SDL/SDL_image.h>
 
-#include "image_loader.h"
+#include <homer_map_manager/MapIO/image_loader.h>
 #include <tf/tf.h>
 
 // compute linear index for given map coords