Skip to content
Snippets Groups Projects
Commit 6bdf9d2a authored by Niklas Yann Wettengel's avatar Niklas Yann Wettengel
Browse files

Rebase from 'debian/indigo/homer_map_manager'

parent 3e7a5144
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 46 additions and 120 deletions
CHANGELOG.rst
+ 5
− 0
View file @ 6bdf9d2a
......@@ -2,6 +2,11 @@
Changelog for package homer_map_manager
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1.0.14 (2015-12-05)
-------------------
* moved header files to include directory
* Contributors: Niklas Yann Wettengel
1.0.13 (2015-12-04)
-------------------
* fixed CMakeLists
......
CMakeLists.txt
+ 5
− 0
View file @ 6bdf9d2a
......@@ -20,9 +20,11 @@ catkin_package(
homer_mapnav_msgs
homer_nav_libs
std_srvs
INCLUDE_DIRS include
)
include_directories(
include
${catkin_INCLUDE_DIRS}
${EIGEN_INCLUDE_DIRS}
)
......@@ -44,3 +46,6 @@ add_dependencies(
${catkin_EXPORTED_TARGETS}
homer_mapnav_msgs_gencpp
)
install(TARGETS map_manager DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
install(DIRECTORY include/homer_map_manager/ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
debian/changelog deleted 100644 → 0
+ 0
− 96
View file @ 3e7a5144
ros-indigo-homer-map-manager (1.0.13-0saucy) saucy; urgency=high
* fixed CMakeLists
* Contributors: Niklas Yann Wettengel
-- Viktor Seib <vseib@uni-koblenz.de> Thu, 03 Dec 2015 23:00:00 -0000
ros-indigo-homer-map-manager (1.0.12-0saucy) saucy; urgency=high
* fixed yaml-cpp saucy error
* Contributors: Niklas Yann Wettengel
-- Viktor Seib <vseib@uni-koblenz.de> Wed, 02 Dec 2015 23:00:00 -0000
ros-indigo-homer-map-manager (1.0.11-0saucy) saucy; urgency=high
* added std_srvs dependency
* Contributors: Niklas Yann Wettengel
-- Viktor Seib <vseib@uni-koblenz.de> Tue, 01 Dec 2015 23:00:00 -0000
ros-indigo-homer-map-manager (1.0.10-0saucy) saucy; urgency=high
* added yaml-cpp dependency
* Contributors: Niklas Yann Wettengel
-- Viktor Seib <vseib@uni-koblenz.de> Tue, 01 Dec 2015 23:00:00 -0000
ros-indigo-homer-map-manager (1.0.9-0saucy) saucy; urgency=high
* added sdl-image dependency
* Contributors: Niklas Yann Wettengel
-- Viktor Seib <vseib@uni-koblenz.de> Mon, 30 Nov 2015 23:00:00 -0000
ros-indigo-homer-map-manager (1.0.8-0saucy) saucy; urgency=high
* added sdl dependency
* Contributors: Niklas Yann Wettengel
-- Viktor Seib <vseib@uni-koblenz.de> Sun, 29 Nov 2015 23:00:00 -0000
ros-indigo-homer-map-manager (1.0.7-0saucy) saucy; urgency=high
* updated changelog
* updated catkin_depends
* Contributors: Niklas Yann Wettengel
* updated catkin_depends
* Contributors: Niklas Yann Wettengel
-- Viktor Seib <vseib@uni-koblenz.de> Fri, 27 Nov 2015 23:00:00 -0000
ros-indigo-homer-map-manager (1.0.6-0saucy) saucy; urgency=high
* 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-map-manager (1.0.5-0saucy) saucy; urgency=high
-- Viktor Seib <vseib@uni-koblenz.de> Mon, 23 Nov 2015 23:00:00 -0000
ros-indigo-homer-map-manager (1.0.4-0saucy) saucy; 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-map-manager (1.0.3-0saucy) saucy; 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-map-manager (1.0.2-0saucy) saucy; urgency=high
* added Maintainers
* added cmake_modules build dependency
* added raphael as maintainer
* Contributors: Niklas Yann Wettengel, Raphael Memmesheimer
-- Viktor Seib <vseib@uni-koblenz.de> Thu, 19 Nov 2015 23:00:00 -0000
ros-indigo-homer-map-manager (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
debian/changelog.em 0 → 100644
+ 7
− 0
View file @ 6bdf9d2a
@[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 deleted 100644 → 0
+ 0
− 1
View file @ 3e7a5144
9
\ No newline at end of file
debian/compat.em 0 → 100644
+ 1
− 0
View file @ 6bdf9d2a
@(debhelper_version)
\ No newline at end of file
debian/control deleted 100644 → 0
+ 0
− 12
View file @ 3e7a5144
Source: ros-indigo-homer-map-manager
Section: misc
Priority: extra
Maintainer: Viktor Seib <vseib@uni-koblenz.de>
Build-Depends: debhelper (>= 9.0.0), libeigen3-dev, libsdl-image1.2-dev, libsdl1.2-dev, libyaml-cpp-dev, ros-indigo-catkin, ros-indigo-cmake-modules, ros-indigo-homer-mapnav-msgs, ros-indigo-homer-nav-libs, ros-indigo-roscpp, ros-indigo-roslib, ros-indigo-std-srvs, ros-indigo-tf
Homepage:
Standards-Version: 3.9.2
Package: ros-indigo-homer-map-manager
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libeigen3-dev, libsdl-image1.2-dev, libsdl1.2-dev, libyaml-cpp-dev, ros-indigo-homer-mapnav-msgs, ros-indigo-homer-nav-libs, ros-indigo-roscpp, ros-indigo-roslib, ros-indigo-std-srvs, ros-indigo-tf
Description: map_manager
debian/control.em 0 → 100644
+ 14
− 0
View file @ 6bdf9d2a
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 → debian/gbp.conf.em
+ 3
− 0
View file @ 6bdf9d2a
[git-buildpackage]
upstream-tag=release/indigo/homer_map_manager/1.0.13-0
upstream-tag=@(release_tag)
upstream-tree=tag
debian/rules → debian/rules.em
+ 10
− 10
View file @ 6bdf9d2a
......@@ -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-map-manager//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
src/MapIO/map_saver.h → include/homer_map_manager/MapIO/map_saver.h
+ 0
− 0
View file @ 6bdf9d2a
File moved
package.xml
+ 1
− 1
View file @ 6bdf9d2a
<package>
<name>homer_map_manager</name>
<version>1.0.13</version>
<version>1.0.14</version>
<description>
map_manager
</description>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment