diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d2f9d72919ef5c1b7e5f57c6a693a4f58fb5b4af..bec2c04d895a766a82bf2e62164b483d72275319 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,11 @@
Changelog for package homer_mapping
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.0.6 (2015-11-27)
+------------------
+* removed env HOMER_DIR from CMakeLists.txt
+* Contributors: Niklas Yann Wettengel
+
1.0.5 (2015-11-24)
------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 489b7f6aed0e6e1c1e9db4ea00f1197f98bab9bd..b794c6fa937822b1db83a71195abce85c0bd2a77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,6 @@ set(CMAKE_BUILD_TYPE Release)
include_directories(
${catkin_INCLUDE_DIRS}
- $ENV{HOMER_DIR}
)
catkin_package(
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 9a1e38e8acae7e0f5b72b9bd0a556c004d845148..0000000000000000000000000000000000000000
--- a/debian/changelog
+++ /dev/null
@@ -1,34 +0,0 @@
-ros-indigo-homer-mapping (1.0.5-0saucy) saucy; urgency=high
-
-
-
- -- Viktor Seib <vseib@uni-koblenz.de> Mon, 23 Nov 2015 23:00:00 -0000
-
-ros-indigo-homer-mapping (1.0.4-0saucy) saucy; urgency=high
-
-
-
- -- Viktor Seib <vseib@uni-koblenz.de> Thu, 19 Nov 2015 23:00:00 -0000
-
-ros-indigo-homer-mapping (1.0.3-0saucy) saucy; urgency=high
-
-
-
- -- Viktor Seib <vseib@uni-koblenz.de> Thu, 19 Nov 2015 23:00:00 -0000
-
-ros-indigo-homer-mapping (1.0.2-0saucy) saucy; urgency=high
-
- * added cmake_modules as build dependency in package.xml
- * added Maintainers
- * Contributors: Niklas Yann Wettengel
-
- -- Viktor Seib <vseib@uni-koblenz.de> Thu, 19 Nov 2015 23:00:00 -0000
-
-ros-indigo-homer-mapping (1.0.1-0saucy) saucy; urgency=high
-
- * init
- * Contributors: Raphael Memmesheimer
-
- -- Viktor Seib <vseib@uni-koblenz.de> Mon, 07 Sep 2015 22:00:00 -0000
-
-
diff --git a/debian/changelog.em b/debian/changelog.em
new file mode 100644
index 0000000000000000000000000000000000000000..f288616383fe8f4543f2eb312541c6588cb3d96c
--- /dev/null
+++ b/debian/changelog.em
@@ -0,0 +1,7 @@
+@[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]
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f11c82a4cb6cc2e8f3bdf52b5cdeaad4d5bb214e..0000000000000000000000000000000000000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
\ No newline at end of file
diff --git a/debian/compat.em b/debian/compat.em
new file mode 100644
index 0000000000000000000000000000000000000000..b7f8528bffbd06395de8fb99042c25b1448f311a
--- /dev/null
+++ b/debian/compat.em
@@ -0,0 +1 @@
+@(debhelper_version)
\ No newline at end of file
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 548be21ac89a271b2dcf5729a48dc0317e986da3..0000000000000000000000000000000000000000
--- a/debian/control
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: ros-indigo-homer-mapping
-Section: misc
-Priority: extra
-Maintainer: Viktor Seib <vseib@uni-koblenz.de>
-Build-Depends: debhelper (>= 9.0.0), ros-indigo-catkin, ros-indigo-cmake-modules, ros-indigo-homer-mapnav-msgs, ros-indigo-homer-nav-libs, ros-indigo-nav-msgs, ros-indigo-roscpp, ros-indigo-roslib, ros-indigo-sensor-msgs, ros-indigo-tf
-Homepage:
-Standards-Version: 3.9.2
-
-Package: ros-indigo-homer-mapping
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ros-indigo-homer-mapnav-msgs, ros-indigo-homer-nav-libs, ros-indigo-nav-msgs, ros-indigo-roscpp, ros-indigo-roslib, ros-indigo-sensor-msgs, ros-indigo-std-msgs, ros-indigo-tf
-Description: homer_mapping
diff --git a/debian/control.em b/debian/control.em
new file mode 100644
index 0000000000000000000000000000000000000000..175af208d9931515177f02e33d74396ca7226cc0
--- /dev/null
+++ b/debian/control.em
@@ -0,0 +1,14 @@
+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)
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index b4c931ee3bd578c8e4d5068c687b46dba8fbaf32..0000000000000000000000000000000000000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[git-buildpackage]
-upstream-tag=release/indigo/homer_mapping/1.0.5-0
-upstream-tree=tag
diff --git a/debian/gbp.conf.em b/debian/gbp.conf.em
new file mode 100644
index 0000000000000000000000000000000000000000..ad24a164d06a7971a9dcca990e935fea39b6ce88
--- /dev/null
+++ b/debian/gbp.conf.em
@@ -0,0 +1,3 @@
+[git-buildpackage]
+upstream-tag=@(release_tag)
+upstream-tree=tag
diff --git a/debian/rules b/debian/rules.em
similarity index 76%
rename from debian/rules
rename to debian/rules.em
index 8b8a598d96b2ac3d40fe99239936b5341469387a..991c991b8775b882ef271fcac740ace8675e7538 100755
--- a/debian/rules
+++ b/debian/rules.em
@@ -14,29 +14,29 @@ export DH_OPTIONS=-v --buildsystem=cmake
# https://code.ros.org/trac/ros/ticket/2977
# https://code.ros.org/trac/ros/ticket/3842
export LDFLAGS=
-export PKG_CONFIG_PATH=/opt/ros/indigo/lib/pkgconfig
+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 $@
+ 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 "/opt/ros/indigo/setup.sh" ]; then . "/opt/ros/indigo/setup.sh"; fi && \
+ if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
dh_auto_configure -- \
-DCATKIN_BUILD_BINARY_PACKAGE="1" \
- -DCMAKE_INSTALL_PREFIX="/opt/ros/indigo" \
- -DCMAKE_PREFIX_PATH="/opt/ros/indigo"
+ -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 "/opt/ros/indigo/setup.sh" ]; then . "/opt/ros/indigo/setup.sh"; fi && \
+ if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
dh_auto_build
override_dh_auto_test:
@@ -44,19 +44,19 @@ override_dh_auto_test:
# 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 "/opt/ros/indigo/setup.sh" ]; then . "/opt/ros/indigo/setup.sh"; fi && \
+ 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 "/opt/ros/indigo/setup.sh" ]; then . "/opt/ros/indigo/setup.sh"; fi && \
- dh_shlibdeps -l$(CURDIR)/debian/ros-indigo-homer-mapping//opt/ros/indigo/lib/
+ 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 "/opt/ros/indigo/setup.sh" ]; then . "/opt/ros/indigo/setup.sh"; fi && \
+ if [ -f "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
dh_auto_install
diff --git a/package.xml b/package.xml
index 203438281dd6a6b51f50769d1565b0b3d8a848c2..2d53b6083ae96fce7891448c702afa4257b08953 100644
--- a/package.xml
+++ b/package.xml
@@ -1,6 +1,6 @@
<package>
<name>homer_mapping</name>
- <version>1.0.5</version>
+ <version>1.0.6</version>
<description>
homer_mapping