[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Pkg-fonts-devel] Bug#772687: Bug#772687: Bug#772687: fonts-droid: fallback font is installed too early to fontconfig



Hi Christian,

> I'm currently out of time to design the right solution, build and
> upload ,(after asking for a pre-approval to unblock). Yamane-san, any
> chance you can work on this ?

Not tested, just started in git, but here is a shot at moving the
conffile to 61 instead of 65.

I am not sure if 61 is the right place, though.

Norbert

------------------------------------------------------------------------
PREINING, Norbert                               http://www.preining.info
JAIST, Japan                                 TeX Live & Debian Developer
GPG: 0x860CDC13   fp: F7D8 A928 26E3 16A1 9FA0  ACF0 6CAC A448 860C DC13
------------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index b9b7c49..c0f7506 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 fonts-android (1:4.4.4r2-5) UNRELEASED; urgency=medium
 
+  [ Vasudev Kamath ]
   * Fix typo in maintscript, we never built fonts-android binary from this
     source package.
     Closes: bug#772457, Thanks to Niels Thykier.
 
- -- Vasudev Kamath <kamathvasudev@gmail.com>  Sun, 14 Dec 2014 17:17:03 +0530
+  [ Norbert Preining ]
+  * install droid-sans-fallback.conf fontconfig file low in the hierarchy
+    so that it does not override other fonts (Closes: #772687)
+
+ -- Norbert Preining <preining@debian.org>  Sun, 28 Dec 2014 21:35:54 +0900
 
 fonts-android (1:4.4.4r2-4) unstable; urgency=low
 
diff --git a/debian/local/61-droid-sans-fallback.conf b/debian/local/61-droid-sans-fallback.conf
new file mode 100644
index 0000000..9aa0d22
--- /dev/null
+++ b/debian/local/61-droid-sans-fallback.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>Droid Sans Fallback</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>Droid Sans Fallback</family>
+		</prefer>
+	</alias>
+</fontconfig>
diff --git a/debian/local/65-droid-sans-fallback.conf b/debian/local/65-droid-sans-fallback.conf
deleted file mode 100644
index 9aa0d22..0000000
--- a/debian/local/65-droid-sans-fallback.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>Droid Sans Fallback</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>Droid Sans Fallback</family>
-		</prefer>
-	</alias>
-</fontconfig>
diff --git a/debian/maintscript b/debian/maintscript
index 57be57e..064f80a 100644
--- a/debian/maintscript
+++ b/debian/maintscript
@@ -1,3 +1,4 @@
 rm_conffile /etc/fonts/conf.avail/60-droid-sans-mono-fonts.conf 1:4.3-2~ fonts-droid 
 rm_conffile /etc/fonts/conf.avail/59-droid-serif-fonts.conf 1:4.3-2~ fonts-droid
 rm_conffile /etc/fonts/conf.avail/65-droid-sans-fonts.conf 1:4.4.4r2-2~ fonts-droid
+mv_conffile /etc/fonts/conf.avail/65-droid-sans-fallback.conf /etc/fonts/conf.avail/61-droid-sans-fallback.conf 1:4.4.4r2-5~ fonts-droid

Reply to: