From f104f9215a7c2f6b5d5330bc7b9a4227ffb40770 Mon Sep 17 00:00:00 2001
From: Niklas Yann Wettengel <niyawe@uni-koblenz.de>
Date: Sat, 28 Nov 2015 23:56:11 +0100
Subject: [PATCH] Rebase from 'debian/indigo/homer_nav_libs'
---
CHANGELOG.rst | 6 +++++
debian/changelog | 48 ---------------------------------
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 +-
src/Explorer/CMakeLists.txt | 2 ++
src/Math/CMakeLists.txt | 2 ++
src/SpeedControl/CMakeLists.txt | 2 ++
14 files changed, 48 insertions(+), 75 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 9545218b..c0a2f374 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,12 @@
Changelog for package homer_nav_libs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.0.7 (2015-11-28)
+------------------
+* added install()
+* updated changelog
+* Contributors: Niklas Yann Wettengel
+
1.0.6 (2015-11-27)
------------------
* added export tags
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index fa3bae57..00000000
--- a/debian/changelog
+++ /dev/null
@@ -1,48 +0,0 @@
-ros-indigo-homer-nav-libs (1.0.6-0trusty) trusty; urgency=high
-
- * added export tags
- * added eigen as run_depend
- * removed env HOMER_DIR from CMakeLists.txt
- * Contributors: Niklas Yann Wettengel
-
- -- Viktor Seib <vseib@uni-koblenz.de> Thu, 26 Nov 2015 23:00:00 -0000
-
-ros-indigo-homer-nav-libs (1.0.5-0trusty) trusty; urgency=high
-
- * added missing files
- * Contributors: Niklas Yann Wettengel
-
- -- Viktor Seib <vseib@uni-koblenz.de> Mon, 23 Nov 2015 23:00:00 -0000
-
-ros-indigo-homer-nav-libs (1.0.4-0trusty) trusty; urgency=high
-
- * changed build dependency from libeigen3-dev to eigen
- * Contributors: Niklas Yann Wettengel
-
- -- Viktor Seib <vseib@uni-koblenz.de> Thu, 19 Nov 2015 23:00:00 -0000
-
-ros-indigo-homer-nav-libs (1.0.3-0trusty) trusty; urgency=high
-
- * added libeigen3-dev build dependency
- * Contributors: Niklas Yann Wettengel
-
- -- Viktor Seib <vseib@uni-koblenz.de> Thu, 19 Nov 2015 23:00:00 -0000
-
-ros-indigo-homer-nav-libs (1.0.2-0trusty) trusty; urgency=high
-
- * added cmake_modules as build dependency in package.xml
- * added Maintainers
- * removed components
- * Raphael as maintainer added
- * Contributors: Niklas Yann Wettengel, Raphael Memmesheimer
-
- -- Viktor Seib <vseib@uni-koblenz.de> Thu, 19 Nov 2015 23:00:00 -0000
-
-ros-indigo-homer-nav-libs (1.0.1-0trusty) trusty; 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 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 61e2717f..00000000
--- a/debian/control
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: ros-indigo-homer-nav-libs
-Section: misc
-Priority: extra
-Maintainer: Viktor Seib <vseib@uni-koblenz.de>
-Build-Depends: debhelper (>= 9.0.0), libeigen3-dev, ros-indigo-catkin, ros-indigo-cmake-modules, ros-indigo-geometry-msgs, ros-indigo-roscpp, ros-indigo-tf
-Homepage:
-Standards-Version: 3.9.2
-
-Package: ros-indigo-homer-nav-libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libeigen3-dev, ros-indigo-geometry-msgs, ros-indigo-roscpp, ros-indigo-tf
-Description: The nav_libs package
diff --git a/debian/control.em b/debian/control.em
new file mode 100644
index 00000000..175af208
--- /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 337791bc..00000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[git-buildpackage]
-upstream-tag=release/indigo/homer_nav_libs/1.0.6-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 2ea0e8ee..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/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-nav-libs//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 0468e7d8..32538e87 100644
--- a/package.xml
+++ b/package.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>homer_nav_libs</name>
- <version>1.0.6</version>
+ <version>1.0.7</version>
<description>The nav_libs package</description>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
diff --git a/src/Explorer/CMakeLists.txt b/src/Explorer/CMakeLists.txt
index 4c5aee03..0a223eb6 100644
--- a/src/Explorer/CMakeLists.txt
+++ b/src/Explorer/CMakeLists.txt
@@ -3,3 +3,5 @@ set(Explorer_SRC
)
add_library(Explorer ${Explorer_SRC})
+
+install(TARGETS Explorer DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
diff --git a/src/Math/CMakeLists.txt b/src/Math/CMakeLists.txt
index b9f092ea..050f702a 100644
--- a/src/Math/CMakeLists.txt
+++ b/src/Math/CMakeLists.txt
@@ -7,3 +7,5 @@ set(Math_SRC
)
add_library(MappingMath ${Math_SRC})
+
+install(TARGETS MappingMath DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
diff --git a/src/SpeedControl/CMakeLists.txt b/src/SpeedControl/CMakeLists.txt
index 154b60eb..d0cbcb8f 100644
--- a/src/SpeedControl/CMakeLists.txt
+++ b/src/SpeedControl/CMakeLists.txt
@@ -3,3 +3,5 @@ set(SpeedControl_SRC
)
add_library(SpeedControl ${SpeedControl_SRC})
+
+install(TARGETS SpeedControl DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
--
GitLab