[gazebo] 01/02: Fix font file linking (Closes: #766303)

[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 c5af915132260d8f0a4f2acafc444d278af817cf
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Oct 27 22:25:33 2014 +0000

    Fix font file linking (Closes: #766303)
---
 debian/gazebo3-common.links | 2 ++
 debian/rules                | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/gazebo3-common.links b/debian/gazebo3-common.links
index f62929e..2af7c8c 100644
--- a/debian/gazebo3-common.links
+++ b/debian/gazebo3-common.links
@@ -1,2 +1,4 @@
 # Arial is not free. Replace it by ttf-liberation
 /usr/share/fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf usr/share/gazebo-3.0/media/fonts/arial.ttf
+# Use system wise DejavuSans
+/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf usr/share/gazebo-3.0/media/gui/fonts/DejaVuSans.ttf
diff --git a/debian/rules b/debian/rules
index 06ad69b..99f377d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,10 +29,8 @@ override_dh_auto_build-indep:
 override_dh_install:
 	dh_install -- # Install
 
-	# Get rid of fonts already packaged elsewhere.
-	tmp=`ls debian/gazebo3-common/usr/share/gazebo-*/media/gui/fonts/DejaVuSans.ttf` \
-	&& rm $$tmp \
-	&& ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf $$tmp
+        # Get rid of fonts already packaged elsewhere.
+	rm debian/gazebo3-common/usr/share/gazebo-3.0/media/gui/fonts/DejaVuSans.ttf
 
         # Install icon
 	mkdir -p debian/gazebo3/usr/share/icons/hicolor/scalable/apps/

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