[gazebo] 02/05: Fix problems found in lintian with rules file

[Jose Luis Rivero]

This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository gazebo.

commit 034dea394204271f2004e017f41511844d024f64
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Jun 23 22:53:21 2014 +0000

    Fix problems found in lintian with rules file
---
 debian/rules | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/debian/rules b/debian/rules
index 9483d59..93e34e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,5 @@
 #!/usr/bin/make -f
 
-# Hardening flags.
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
-
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-
-# Duplicate flags as CMake is ignoring CPPFLAGS.
-CFLAGS+=$(CPPFLAGS)
-CXXFLAGS+=$(CPPFLAGS)
-
 .PHONY: override_dh_auto_configure	\
 	override_dh_auto_build-indep	\
 	override_dh_install		\
@@ -21,7 +9,9 @@ CXXFLAGS+=$(CPPFLAGS)
 override_dh_auto_configure:
 	dh_auto_configure -- \
                 -DENABLE_TESTS_COMPILATION:BOOL=False \
-                -DCMAKE_BUILD_TYPE=RelWithDebInfo
+		-DUSE_HOST_CFLAGS:BOOL=False \
+		-DUSE_UPSTREAM_CFLAGS:BOOL=False \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo
 
 # override_dh_auto_build-indep:
 #	dh_auto_build -- doc # Generate Doxygen HTML documentation.
@@ -34,6 +24,10 @@ override_dh_install:
 	&& rm $$tmp \
 	&& ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf $$tmp
 
+	# Arial is not free. Replace it by ttf-liberation
+	tmp=`ls debian/gazebo3-common/usr/share/gazebo-*/media/fonts/arial.ttf` \
+	&& rm $$tmp \
+	&& ln -s /usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf $$tmp
 
 override_dh_strip:
 	dh_strip -a --dbg-package=libgazebo3-dbg
@@ -42,4 +36,4 @@ override_dh_auto_test:
 	true
 
 %:
-	dh $@ --parallel
+	dh $@ --parallel --buildsystem=cmake

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gazebo.git