[SCM] blender/master.experimental: debian/patches/: patchset updated for font issue

[mfv at users.alioth.debian.org]

The following commit has been merged in the master.experimental branch:
commit 58f6a7abac6651af1cef80529ed68be6e0af0a80
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Sat Nov 21 21:26:55 2015 +0100

    debian/patches/: patchset updated for font issue
    
    - #0006 renamed to 0006-look_for_dejavu_ttf_with_fontconfig.patch
      with the usage of DejaVu fonts instead of Droid
    
    Closes: #804678

diff --git a/debian/patches/0006-look_for_droid_ttf_with_fontconfig.patch b/debian/patches/0006-look_for_dejavu_ttf_with_fontconfig.patch
similarity index 95%
rename from debian/patches/0006-look_for_droid_ttf_with_fontconfig.patch
rename to debian/patches/0006-look_for_dejavu_ttf_with_fontconfig.patch
index 75cda7b..5acc689 100644
--- a/debian/patches/0006-look_for_droid_ttf_with_fontconfig.patch
+++ b/debian/patches/0006-look_for_dejavu_ttf_with_fontconfig.patch
@@ -1,10 +1,10 @@
 From: "Matteo F. Vescovi" <mfv at debian.org>
-Date: Fri, 23 Oct 2015 21:42:19 +0200
-Subject: look_for_droid_ttf_with_fontconfig
+Date: Sat, 21 Nov 2015 21:16:38 +0100
+Subject: look_for_dejavu_ttf_with_fontconfig
 
-* Remove bad installation of fonts directory into locales.
 * Avoid using the droid font shipped with upstream source
-  and use fontconfig to get it.
+  and use fontconfig to get Dajavu instead.
+* Remove bad installation of fonts directory into locales.
 ---
  CMakeLists.txt                                 | 11 ++++++
  build_files/cmake/Modules/FindFontconfig.cmake | 48 ++++++++++++++++++++++++++
@@ -150,7 +150,7 @@ index 36ad6fe..19d2bab 100644
  	add_definitions(-DWITH_PYTHON)
  	list(APPEND INC
 diff --git a/source/blender/blenfont/intern/blf_font_i18n.c b/source/blender/blenfont/intern/blf_font_i18n.c
-index b6ff7ed..2165995 100644
+index b6ff7ed..a208fde 100644
 --- a/source/blender/blenfont/intern/blf_font_i18n.c
 +++ b/source/blender/blenfont/intern/blf_font_i18n.c
 @@ -45,10 +45,14 @@
@@ -176,7 +176,7 @@ index b6ff7ed..2165995 100644
 +#ifdef WITH_FONTCONFIG
 +		FcFontSet *fontset = NULL;
 +		FcValue v;
-+		FcPattern *pattern = FcPatternBuild (0, FC_FAMILY, FcTypeString, "Droid Sans", FC_STYLE, FcTypeString, "Regular", (char *) 0);
++		FcPattern *pattern = FcPatternBuild (0, FC_FAMILY, FcTypeString, "Dejavu Sans", FC_STYLE, FcTypeString, "Regular", (char *) 0);
 +		fontset = FcFontList(0,pattern,0);
 +		if (fontset->nfont > 0) {
 +			// Get the file of the first font in the fontset that match pattern
@@ -188,7 +188,7 @@ index b6ff7ed..2165995 100644
 +			);
 +		}
 +		else {
-+			printf("%s: 'Droid Sans Regular' font not found with fontconfig\n", __func__);
++			printf("%s: 'Dejavu Sans' font not found with fontconfig\n", __func__);
 +		}
 +#else
  		const char * const fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts");
@@ -209,7 +209,7 @@ index b6ff7ed..2165995 100644
 +#ifdef WITH_FONTCONFIG
 +		FcFontSet *fontset = NULL;
 +		FcValue v;
-+		FcPattern *pattern = FcPatternBuild (0, FC_FAMILY, FcTypeString, "Droid Sans Mono", FC_STYLE, FcTypeString, "Regular", (char *) 0);
++		FcPattern *pattern = FcPatternBuild (0, FC_FAMILY, FcTypeString, "Dejavu Sans Mono", FC_STYLE, FcTypeString, "Regular", (char *) 0);
 +		fontset = FcFontList(0,pattern,0);
 +		if (fontset->nfont > 0) {
 +			// Get the file of the first font in the fontset that match pattern
@@ -221,7 +221,7 @@ index b6ff7ed..2165995 100644
 +			);
 +		}
 +		else {
-+			printf("%s: 'Droid Sans Mono' font not found with fontconfig\n", __func__);
++			printf("%s: 'Dejavu Sans Mono' font not found with fontconfig\n", __func__);
 +		}
 +#else
  		const char *fontpath = BKE_appdir_folder_id(BLENDER_DATAFILES, "fonts");
diff --git a/debian/patches/series b/debian/patches/series
index dc6bfbd..8d30bbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,4 @@
 0003-locales_directory_install.patch
 0004-update_manpages.patch
 0005-do_not_use_version_number_in_system_path.patch
-0006-look_for_droid_ttf_with_fontconfig.patch
+0006-look_for_dejavu_ttf_with_fontconfig.patch

-- 
blender packaging