[ros-rviz] 02/02: Replace Arial font completely

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository ros-rviz.

commit 51620df47fbdbf6c5b239f24ccb854aa7328c0e4
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Jan 17 12:16:42 2016 +0100

    Replace Arial font completely
---
 debian/control                                     |  2 +-
 .../0003-Replace-Arial-by-generic-Font.patch       | 55 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rviz.links                                  |  1 +
 4 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index e4b629f..7cd1cdd 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Description: 3D visualization tool for Robot OS.
 Package: rviz
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, fonts-liberation
 Description: 3D visualization tool for Robot OS.
  This package is part of Robot OS (ROS). This package contains 
  the rviz program.
diff --git a/debian/patches/0003-Replace-Arial-by-generic-Font.patch b/debian/patches/0003-Replace-Arial-by-generic-Font.patch
new file mode 100644
index 0000000..fc3df08
--- /dev/null
+++ b/debian/patches/0003-Replace-Arial-by-generic-Font.patch
@@ -0,0 +1,55 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Sun, 17 Jan 2016 12:13:27 +0100
+Subject: Replace Arial by generic Font
+
+Also make LiberationSans-Regular.ttf the default (not included).
+---
+ ogre_media/fonts/{arial.fontdef => font.fontdef} | 4 ++--
+ src/rviz/default_plugin/tf_display.cpp           | 2 +-
+ src/rviz/ogre_helpers/movable_text.h             | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+ rename ogre_media/fonts/{arial.fontdef => font.fontdef} (52%)
+
+diff --git a/ogre_media/fonts/arial.fontdef b/ogre_media/fonts/font.fontdef
+similarity index 52%
+rename from ogre_media/fonts/arial.fontdef
+rename to ogre_media/fonts/font.fontdef
+index 651dd24..94497d7 100644
+--- a/ogre_media/fonts/arial.fontdef
++++ b/ogre_media/fonts/font.fontdef
+@@ -1,7 +1,7 @@
+-Arial
++Font
+ {
+   type truetype
+-  source arial.ttf
++  source LiberationSans-Regular.ttf
+   size 18
+   resolution 96
+ }
+diff --git a/src/rviz/default_plugin/tf_display.cpp b/src/rviz/default_plugin/tf_display.cpp
+index 89a39fc..b8a7163 100644
+--- a/src/rviz/default_plugin/tf_display.cpp
++++ b/src/rviz/default_plugin/tf_display.cpp
+@@ -414,7 +414,7 @@ FrameInfo* TFDisplay::createFrame(const std::string& frame)
+   info->selection_handler_.reset( new FrameSelectionHandler( info, this, context_ ));
+   info->selection_handler_->addTrackedObjects( info->axes_->getSceneNode() );
+ 
+-  info->name_text_ = new MovableText( frame, "Arial", 0.1 );
++  info->name_text_ = new MovableText( frame, "Font", 0.1 );
+   info->name_text_->setTextAlignment(MovableText::H_CENTER, MovableText::V_BELOW);
+   info->name_node_ = names_node_->createChildSceneNode();
+   info->name_node_->attachObject( info->name_text_ );
+diff --git a/src/rviz/ogre_helpers/movable_text.h b/src/rviz/ogre_helpers/movable_text.h
+index 8e5ed49..677fbab 100644
+--- a/src/rviz/ogre_helpers/movable_text.h
++++ b/src/rviz/ogre_helpers/movable_text.h
+@@ -107,7 +107,7 @@ protected:
+ 
+   /******************************** public methods ******************************/
+ public:
+-  MovableText(const Ogre::String &caption, const Ogre::String &fontName = "Arial", Ogre::Real charHeight = 1.0,
++  MovableText(const Ogre::String &caption, const Ogre::String &fontName = "Font", Ogre::Real charHeight = 1.0,
+       const Ogre::ColourValue &color = Ogre::ColourValue::White);
+   virtual ~MovableText();
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3d50bea..dbc3c0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Add-Debian-specific-SOVERSION.patch
 0002-Remove-default_plugin-from-exported-libraries.patch
+0003-Replace-Arial-by-generic-Font.patch
diff --git a/debian/rviz.links b/debian/rviz.links
index ed93749..07188c2 100644
--- a/debian/rviz.links
+++ b/debian/rviz.links
@@ -1,2 +1,3 @@
 # for rosrun rviz rviz compability
 /usr/bin/rviz /usr/share/rviz/rviz
+/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf /usr/share/rviz/ogre_media/fonts/LiberationSans-Regular.ttf

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