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

Bug#774113: unblock: fonts-android/1:4.4.4r2-6



Quoting Ivo De Decker (ivodd@debian.org):

> This looks fine, except for the change in the old changelog entry (I guess
> that was a mistake). Please go ahead and remove the moreinfo tag from this bug
> once the upload is in unstable.

Done, with the following debdiff. Changes from the debdiff in the
unblock request:
- cleaned out the change in the previous changelog entry
- use of mv_conffile in the maintainer script to better cope with
local changes

diff -Nru fonts-android-4.4.4r2/debian/changelog fonts-android-4.4.4r2/debian/changelog
--- fonts-android-4.4.4r2/debian/changelog	2014-12-14 23:32:21.000000000 +0100
+++ fonts-android-4.4.4r2/debian/changelog	2014-12-29 17:17:48.000000000 +0100
@@ -1,3 +1,16 @@
+fonts-android (1:4.4.4r2-6) unstable; urgency=medium
+
+  * Team upload
+
+  [ Vasudev Kamath ]
+  * Increase priority of droid-sans-fallback.conf to 69 to avoid
+    overriding 65-nonlatin.conf.
+    Close: bug#772687, Thanks to Norbert Preining.
+  * Update maintscript to remove 65-droid-sans-fallback.conf during
+    upgrade.
+
+ -- Christian Perrier <bubulle@debian.org>  Sun, 28 Dec 2014 22:36:29 +0100
+
 fonts-android (1:4.4.4r2-5) unstable; urgency=medium
 
   * Fix typo in maintscript, we never built fonts-android binary from this
diff -Nru fonts-android-4.4.4r2/debian/fonts-droid.links fonts-android-4.4.4r2/debian/fonts-droid.links
--- fonts-android-4.4.4r2/debian/fonts-droid.links	2014-12-14 23:29:38.000000000 +0100
+++ fonts-android-4.4.4r2/debian/fonts-droid.links	2014-12-28 22:35:34.000000000 +0100
@@ -1 +1 @@
-etc/fonts/conf.avail/65-droid-sans-fallback.conf   etc/fonts/conf.d/65-droid-sans-fallback.conf
+etc/fonts/conf.avail/69-droid-sans-fallback.conf   etc/fonts/conf.d/69-droid-sans-fallback.conf
diff -Nru fonts-android-4.4.4r2/debian/local/65-droid-sans-fallback.conf fonts-android-4.4.4r2/debian/local/65-droid-sans-fallback.conf
--- fonts-android-4.4.4r2/debian/local/65-droid-sans-fallback.conf	2014-12-14 23:29:38.000000000 +0100
+++ fonts-android-4.4.4r2/debian/local/65-droid-sans-fallback.conf	1970-01-01 01:00:00.000000000 +0100
@@ -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 -Nru fonts-android-4.4.4r2/debian/local/69-droid-sans-fallback.conf fonts-android-4.4.4r2/debian/local/69-droid-sans-fallback.conf
--- fonts-android-4.4.4r2/debian/local/69-droid-sans-fallback.conf	1970-01-01 01:00:00.000000000 +0100
+++ fonts-android-4.4.4r2/debian/local/69-droid-sans-fallback.conf	2014-12-28 22:35:34.000000000 +0100
@@ -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 -Nru fonts-android-4.4.4r2/debian/maintscript fonts-android-4.4.4r2/debian/maintscript
--- fonts-android-4.4.4r2/debian/maintscript	2014-12-14 23:29:38.000000000 +0100
+++ fonts-android-4.4.4r2/debian/maintscript	2014-12-29 17:18:14.000000000 +0100
@@ -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/69-droid-sans-fallback.conf 1:4.4.4r2-6~ fonts-droid

Attachment: signature.asc
Description: Digital signature


Reply to: