diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000000000000000000000000000000000000..fedbca9ed7c508caf713a21f5e7006766723b57e
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,37 @@
+ros-kinetic-homer-navigation (0.1.5-0xenial) xenial; urgency=high
+
+  * fixed dependencies
+  * Contributors: Niklas Yann Wettengel
+
+ -- Viktor Seib <vseib@uni-koblenz.de>  Thu, 03 Nov 2016 23:00:00 -0000
+
+ros-kinetic-homer-navigation (0.1.4-0xenial) xenial; urgency=high
+
+  * fixes
+  * updated changelog
+  * Contributors: Niklas Yann Wettengel
+
+ -- Viktor Seib <vseib@uni-koblenz.de>  Wed, 02 Nov 2016 23:00:00 -0000
+
+ros-kinetic-homer-navigation (0.1.3-0xenial) xenial; urgency=high
+
+
+
+ -- Viktor Seib <vseib@uni-koblenz.de>  Wed, 02 Nov 2016 23:00:00 -0000
+
+ros-kinetic-homer-navigation (0.1.2-0xenial) xenial; urgency=high
+
+  * install launch files
+  * Contributors: Niklas Yann Wettengel
+
+ -- Viktor Seib <vseib@uni-koblenz.de>  Wed, 02 Nov 2016 23:00:00 -0000
+
+ros-kinetic-homer-navigation (0.1.1-0xenial) xenial; urgency=high
+
+  * fixes
+  * initial commit
+  * Contributors: Niklas Yann Wettengel
+
+ -- Viktor Seib <vseib@uni-koblenz.de>  Wed, 02 Nov 2016 23:00:00 -0000
+
+
diff --git a/debian/changelog.em b/debian/changelog.em
deleted file mode 100644
index f288616383fe8f4543f2eb312541c6588cb3d96c..0000000000000000000000000000000000000000
--- a/debian/changelog.em
+++ /dev/null
@@ -1,7 +0,0 @@
-@[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
new file mode 100644
index 0000000000000000000000000000000000000000..f11c82a4cb6cc2e8f3bdf52b5cdeaad4d5bb214e
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
\ No newline at end of file
diff --git a/debian/compat.em b/debian/compat.em
deleted file mode 100644
index b7f8528bffbd06395de8fb99042c25b1448f311a..0000000000000000000000000000000000000000
--- a/debian/compat.em
+++ /dev/null
@@ -1 +0,0 @@
-@(debhelper_version)
\ No newline at end of file
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000000000000000000000000000000000000..c94a91d4293b1df88caacab14e44d2b0a0c1ae60
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,12 @@
+Source: ros-kinetic-homer-navigation
+Section: misc
+Priority: extra
+Maintainer: Viktor Seib <vseib@uni-koblenz.de>
+Build-Depends: debhelper (>= 9.0.0), libeigen3-dev, ros-kinetic-catkin, ros-kinetic-cmake-modules, ros-kinetic-homer-mapnav-msgs, ros-kinetic-homer-nav-libs, ros-kinetic-homer-ptu-msgs, ros-kinetic-homer-robbie-architecture, ros-kinetic-nav-msgs, ros-kinetic-roscpp, ros-kinetic-roslib, ros-kinetic-sensor-msgs, ros-kinetic-std-msgs, ros-kinetic-tf
+Homepage: 
+Standards-Version: 3.9.2
+
+Package: ros-kinetic-homer-navigation
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libeigen3-dev, ros-kinetic-homer-mapnav-msgs, ros-kinetic-homer-nav-libs, ros-kinetic-homer-ptu-msgs, ros-kinetic-homer-robbie-architecture, ros-kinetic-nav-msgs, ros-kinetic-roscpp, ros-kinetic-roslib, ros-kinetic-sensor-msgs, ros-kinetic-std-msgs, ros-kinetic-tf
+Description: The homer_navigation package
diff --git a/debian/control.em b/debian/control.em
deleted file mode 100644
index 7cbf65a6a90b7b5f71439e8067643e802e54f540..0000000000000000000000000000000000000000
--- a/debian/control.em
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: @(Package)
-Section: misc
-Priority: extra
-Maintainer: @(Maintainer)
-Build-Depends: debhelper (>= @(debhelper_version).0.0), @(', '.join(BuildDepends))
-Homepage: @(Homepage)
-Standards-Version: 3.9.2
-
-Package: @(Package)
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, @(', '.join(Depends))
-@[if Conflicts]Conflicts: @(', '.join(Conflicts))@\n@[end if]@
-@[if Replaces]Replaces: @(', '.join(Replaces))@\n@[end if]@
-Description: @(Description)
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000000000000000000000000000000000000..59a84236c97ec6f61940c4fa22c27a7785711037
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[git-buildpackage]
+upstream-tag=release/kinetic/homer_navigation/0.1.5-0
+upstream-tree=tag
diff --git a/debian/gbp.conf.em b/debian/gbp.conf.em
deleted file mode 100644
index ad24a164d06a7971a9dcca990e935fea39b6ce88..0000000000000000000000000000000000000000
--- a/debian/gbp.conf.em
+++ /dev/null
@@ -1,3 +0,0 @@
-[git-buildpackage]
-upstream-tag=@(release_tag)
-upstream-tree=tag
diff --git a/debian/rules.em b/debian/rules
similarity index 76%
rename from debian/rules.em
rename to debian/rules
index 991c991b8775b882ef271fcac740ace8675e7538..d97f2ecbe2e5158f91889dc8000a7cbb14a881cf 100755
--- a/debian/rules.em
+++ b/debian/rules
@@ -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=@(InstallationPrefix)/lib/pkgconfig
+export PKG_CONFIG_PATH=/opt/ros/kinetic/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 "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
+	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
 	dh_auto_configure -- \
 		-DCATKIN_BUILD_BINARY_PACKAGE="1" \
-		-DCMAKE_INSTALL_PREFIX="@(InstallationPrefix)" \
-		-DCMAKE_PREFIX_PATH="@(InstallationPrefix)"
+		-DCMAKE_INSTALL_PREFIX="/opt/ros/kinetic" \
+		-DCMAKE_PREFIX_PATH="/opt/ros/kinetic"
 
 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 && \
+	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/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 "@(InstallationPrefix)/setup.sh" ]; then . "@(InstallationPrefix)/setup.sh"; fi && \
+	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/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/
+	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
+	dh_shlibdeps -l$(CURDIR)/debian/ros-kinetic-homer-navigation//opt/ros/kinetic/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 && \
+	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
 	dh_auto_install