Rebase from 'debian/indigo/homer_mapping'

CHANGELOG.rst

@@ -2,6 +2,11 @@
 Changelog for package homer_mapping
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.0.8 (2015-11-30)
+------------------
+* added qt4 build dependency
+* Contributors: Niklas Yann Wettengel
+
 1.0.7 (2015-11-28)
 ------------------
 * updated changelog

debian/changelog

-ros-indigo-homer-mapping (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-mapping (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-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
-
-

debian/changelog.em

+@[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

-9
\ No newline at end of file

debian/compat.em

+@(debhelper_version)
\ No newline at end of file

debian/control

-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

debian/control.em

+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

 [git-buildpackage]
-upstream-tag=release/indigo/homer_mapping/1.0.7-0
+upstream-tag=@(release_tag)
 upstream-tree=tag

debian/rules → 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

package.xml

 <package>
 	<name>homer_mapping</name>
-	<version>1.0.7</version>
+	<version>1.0.8</version>
 	<description>
 
 		homer_mapping
@@ -22,8 +22,10 @@
 	<build_depend>roslib</build_depend>
 	<build_depend>homer_nav_libs</build_depend>
 	<build_depend>cmake_modules</build_depend>
-
 	<build_depend>homer_mapnav_msgs</build_depend>
+	<build_depend>libqt4</build_depend>
+	<build_depend>libqt4-dev</build_depend>
+	<build_depend>libqtgui4</build_depend>
 
 
 	<run_depend>std_msgs</run_depend>
@@ -33,6 +35,9 @@
 	<run_depend>tf</run_depend>
 	<run_depend>roslib</run_depend>  
 	<run_depend>homer_nav_libs</run_depend>
+	<run_depend>libqt4</run_depend>
+	<run_depend>libqt4-dev</run_depend>
+	<run_depend>libqtgui4</run_depend>
 
 	<run_depend>homer_mapnav_msgs</run_depend>
 </package>