Rebase from 'release/indigo/homer_mapping'

CHANGELOG.rst

@@ -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

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)
 

debian/changelog.em

-@[for change_version, change_date, changelog, main_name, main_email in changelogs]@(Package) (@(change_version)-@(DebianInc)@(Distribution)) @(Distribution); urgency=high
-
-@(changelog)
-
- -- @(main_name) <@(main_email)>  @(change_date)
-
-@[end for]

debian/compat.em

-@(debhelper_version)
\ No newline at end of file

debian/control.em

-Source: @(Package)
-Section: misc
-Priority: extra
-Maintainer: @(Maintainer)
-Build-Depends: debhelper (>= @(debhelper_version).0.0), @(', '.join(BuildDepends))
-@[if Conflicts]Conflicts: @(', '.join(Conflicts))@\n@[end if]@
-@[if Replaces]Replaces: @(', '.join(Replaces))@\n@[end if]@
-Homepage: @(Homepage)
-Standards-Version: 3.9.2
-
-Package: @(Package)
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, @(', '.join(Depends))
-Description: @(Description)

debian/gbp.conf.em

-[git-buildpackage]
-upstream-tag=@(release_tag)
-upstream-tree=tag

debian/rules.em

-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-export DH_OPTIONS=-v --buildsystem=cmake
-# TODO: remove the LDFLAGS override.  It's here to avoid esoteric problems
-# of this sort:
-#  https://code.ros.org/trac/ros/ticket/2977
-#  https://code.ros.org/trac/ros/ticket/3842
-export LDFLAGS=
-export PKG_CONFIG_PATH=@(InstallationPrefix)/lib/pkgconfig
-# Explicitly enable -DNDEBUG, see:
-# 	https://github.com/ros-infrastructure/bloom/issues/327
-export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG
-
-%:
-	dh  $@@
-
-override_dh_auto_configure:
-	# In case we're installing to a non-standard location, look for a setup.sh
-	# in the install tree that was dropped by catkin, and source it.  It will
-	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
-	dh_auto_configure -- \
-		-DCATKIN_BUILD_BINARY_PACKAGE="1" \
-		-DCMAKE_INSTALL_PREFIX="@(InstallationPrefix)" \
-		-DCMAKE_PREFIX_PATH="@(InstallationPrefix)"
-
-override_dh_auto_build:
-	# In case we're installing to a non-standard location, look for a setup.sh
-	# in the install tree that was dropped by catkin, and source it.  It will
-	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
-	dh_auto_build
-
-override_dh_auto_test:
-	# In case we're installing to a non-standard location, look for a setup.sh
-	# in the install tree that was dropped by catkin, and source it.  It will
-	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	echo -- Running tests. Even if one of them fails the build is not canceled.
-	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
-	dh_auto_test || true
-
-override_dh_shlibdeps:
-	# In case we're installing to a non-standard location, look for a setup.sh
-	# in the install tree that was dropped by catkin, and source it.  It will
-	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
-	dh_shlibdeps -l$(CURDIR)/debian/@(Package)/@(InstallationPrefix)/lib/
-
-override_dh_auto_install:
-	# In case we're installing to a non-standard location, look for a setup.sh
-	# in the install tree that was dropped by catkin, and source it.  It will
-	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
-	dh_auto_install

debian/source/format

-3.0 (quilt)
\ No newline at end of file

package.xml

 <package>
 	<name>homer_mapping</name>
-	<version>1.0.6</version>
+	<version>1.0.7</version>
 	<description>
 
 		homer_mapping