[med-svn] [Git][med-team/fast][master] 2 commits: Favour ttf-ubuntu-font-family over the one in assets

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / fast


Commits:
bffb0654 by Shayan Doust at 2019-08-31T04:39:38Z
Favour ttf-ubuntu-font-family over the one in assets

- - - - -
29226a9e by Shayan Doust at 2019-08-31T04:41:19Z
Add ubuntu font family to control & remove font dir from libfast-data

- - - - -


3 changed files:

- debian/control
- debian/libfast-data.install
- debian/patches/modify_assets_location.patch


Changes:

=====================================
debian/control
=====================================
@@ -83,7 +83,8 @@ Package: libfast-data
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: libfast,
-            libfast-examples
+            libfast-examples,
+	    ttf-ubuntu-font-family
 Description: public data for "FAST" Heterogeneous Medical Image Computing
  An open-source cross-platform framework with the main goal of making it
  easier to do processing and visualization of medical images on


=====================================
debian/libfast-data.install
=====================================
@@ -1,3 +1,2 @@
 debian/missing-sources/FAST_Test_Data.xz usr/lib/fast
-doc/fonts usr/share/doc/fast/assets
 doc/images usr/share/doc/fast/assets


=====================================
debian/patches/modify_assets_location.patch
=====================================
@@ -1,7 +1,7 @@
 Index: fast/source/FAST/Config.cpp
 ===================================================================
---- fast.orig/source/FAST/Config.cpp	2019-08-31 03:52:37.422447649 +0100
-+++ fast/source/FAST/Config.cpp	2019-08-31 03:53:13.398310010 +0100
+--- fast.orig/source/FAST/Config.cpp	2019-08-31 05:16:29.263196520 +0100
++++ fast/source/FAST/Config.cpp	2019-08-31 05:16:29.259196536 +0100
 @@ -78,7 +78,7 @@
  			mTestDataPath = getPath() + "../data/";
  			mKernelSourcePath = getPath() + "../source/FAST/";
@@ -20,3 +20,19 @@ Index: fast/source/FAST/Config.cpp
  			mPipelinePath = getPath() + "../pipelines/";
  			loadConfiguration();
  		}
+Index: fast/source/FAST/Visualization/Window.cpp
+===================================================================
+--- fast.orig/source/FAST/Visualization/Window.cpp	2019-08-31 00:17:50.187752432 +0100
++++ fast/source/FAST/Visualization/Window.cpp	2019-08-31 05:18:33.434721458 +0100
+@@ -121,9 +121,9 @@
+         QApplication::setWindowIcon(QIcon((Config::getDocumentationPath() + "images/fast_icon.png").c_str()));
+ 
+         // Add all fonts in fonts folder
+-        for(auto&& filename : getDirectoryList(join(Config::getDocumentationPath(), "fonts"))) {
++        for(auto&& filename : getDirectoryList(join("/usr/share/fonts/truetype", "ubuntu"))) {
+             if(filename.substr(filename.size()-4) == ".ttf") {
+-                QFontDatabase::addApplicationFont(join(Config::getDocumentationPath(), "fonts", filename).c_str());
++                QFontDatabase::addApplicationFont(join(Config::getDocumentationPath(), "ubuntu", filename).c_str());
+             }
+         }
+     } else {



View it on GitLab: https://salsa.debian.org/med-team/fast/compare/b2cb5556721f48f9d99c629bf6c203e35421222f...29226a9eddc75357bd8ee2e865a694353864791e

-- 
View it on GitLab: https://salsa.debian.org/med-team/fast/compare/b2cb5556721f48f9d99c629bf6c203e35421222f...29226a9eddc75357bd8ee2e865a694353864791e
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190831/52b0ba1b/attachment-0001.html>