From fa761831a22a8a096aa02d7f420740b55ddc865c Mon Sep 17 00:00:00 2001
From: Niklas Yann Wettengel <niyawe@uni-koblenz.de>
Date: Fri, 4 Nov 2016 12:00:16 +0100
Subject: [PATCH] Rebase from 'debian/kinetic/homer_navigation'
---
CHANGELOG.rst | 3 +++
debian/changelog | 37 -------------------------------------
debian/changelog.em | 7 +++++++
debian/compat | 1 -
debian/compat.em | 1 +
debian/control | 12 ------------
debian/control.em | 14 ++++++++++++++
debian/gbp.conf | 3 ---
debian/gbp.conf.em | 3 +++
debian/{rules => rules.em} | 20 ++++++++++----------
package.xml | 2 +-
11 files changed, 39 insertions(+), 64 deletions(-)
delete mode 100644 debian/changelog
create mode 100644 debian/changelog.em
delete mode 100644 debian/compat
create mode 100644 debian/compat.em
delete mode 100644 debian/control
create mode 100644 debian/control.em
delete mode 100644 debian/gbp.conf
create mode 100644 debian/gbp.conf.em
rename debian/{rules => rules.em} (76%)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 53ad70bf..43e43ef9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package homer_navigation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.1.6 (2016-11-04)
+------------------
+
0.1.5 (2016-11-04)
------------------
* fixed dependencies
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index fedbca9e..00000000
--- a/debian/changelog
+++ /dev/null
@@ -1,37 +0,0 @@
-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
new file mode 100644
index 00000000..f2886163
--- /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 f11c82a4..00000000
--- 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 00000000..b7f8528b
--- /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 c94a91d4..00000000
--- a/debian/control
+++ /dev/null
@@ -1,12 +0,0 @@
-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
new file mode 100644
index 00000000..7cbf65a6
--- /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))
+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
deleted file mode 100644
index 59a84236..00000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[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
new file mode 100644
index 00000000..ad24a164
--- /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 d97f2ecb..991c991b 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/kinetic/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/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/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/kinetic" \
- -DCMAKE_PREFIX_PATH="/opt/ros/kinetic"
+ -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/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/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/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/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/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
- dh_shlibdeps -l$(CURDIR)/debian/ros-kinetic-homer-navigation//opt/ros/kinetic/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/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/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 e76263aa..df91397f 100644
--- a/package.xml
+++ b/package.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>homer_navigation</name>
- <version>0.1.5</version>
+ <version>0.1.6</version>
<description>The homer_navigation package</description>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
--
GitLab