[Pkg-fonts-devel] Bug#789696: Install fallback .conf file in Ubuntu only
Patch attached.
--
Gunnar Hjalmarsson
https://launchpad.net/~gunnarhj
diff -Nru fonts-android.orig/debian/changelog fonts-android/debian/changelog
--- fonts-android.orig/debian/changelog 2014-12-29 17:17:48.000000000 +0100
+++ fonts-android/debian/changelog 2015-06-23 17:07:05.074773322 +0200
@@ -1,3 +1,13 @@
+fonts-android (1:4.4.4r2-7) UNRELEASED; urgency=medium
+
+ * Rename 69-droid-sans-fallback.conf back to
+ 65-droid-sans-fallback.conf and install it in Ubuntu only.
+ Closes: bug#789696
+ * Drop monospace section in 65-droid-sans-fallback.conf.
+ Closes: bug#787149
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com> Tue, 23 Jun 2015 17:07:00 +0200
+
fonts-android (1:4.4.4r2-6) unstable; urgency=medium
* Team upload
diff -Nru fonts-android.orig/debian/fonts-droid.install fonts-android/debian/fonts-droid.install
--- fonts-android.orig/debian/fonts-droid.install 2014-09-20 12:51:42.000000000 +0200
+++ fonts-android/debian/fonts-droid.install 2015-06-23 12:12:14.135838904 +0200
@@ -1,2 +1 @@
Droid*.ttf usr/share/fonts/truetype/droid
-debian/local/*.conf etc/fonts/conf.avail
diff -Nru fonts-android.orig/debian/fonts-droid.links fonts-android/debian/fonts-droid.links
--- fonts-android.orig/debian/fonts-droid.links 2014-12-28 22:35:34.000000000 +0100
+++ fonts-android/debian/fonts-droid.links 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-etc/fonts/conf.avail/69-droid-sans-fallback.conf etc/fonts/conf.d/69-droid-sans-fallback.conf
diff -Nru fonts-android.orig/debian/local/65-droid-sans-fallback.conf fonts-android/debian/local/65-droid-sans-fallback.conf
--- fonts-android.orig/debian/local/65-droid-sans-fallback.conf 1970-01-01 01:00:00.000000000 +0100
+++ fonts-android/debian/local/65-droid-sans-fallback.conf 2015-06-23 17:03:18.412478301 +0200
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+ <alias>
+ <family>sans-serif</family>
+ <prefer>
+ <family>Droid Sans Fallback</family>
+ </prefer>
+ </alias>
+</fontconfig>
diff -Nru fonts-android.orig/debian/local/69-droid-sans-fallback.conf fonts-android/debian/local/69-droid-sans-fallback.conf
--- fonts-android.orig/debian/local/69-droid-sans-fallback.conf 2014-12-28 22:35:34.000000000 +0100
+++ fonts-android/debian/local/69-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.orig/debian/maintscript fonts-android/debian/maintscript
--- fonts-android.orig/debian/maintscript 2014-12-29 17:18:14.000000000 +0100
+++ fonts-android/debian/maintscript 2015-06-23 12:24:32.749099612 +0200
@@ -2,3 +2,4 @@
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
+rm_conffile /etc/fonts/conf.avail/69-droid-sans-fallback.conf 1:4.4.4r2-7~ fonts-droid
diff -Nru fonts-android.orig/debian/rules fonts-android/debian/rules
--- fonts-android.orig/debian/rules 2014-10-18 10:13:13.000000000 +0200
+++ fonts-android/debian/rules 2015-06-23 13:23:23.810999383 +0200
@@ -13,4 +13,11 @@
mv fonts/truetype/droid/$$f \
fonts-droid/truetype/$$f || true ; \
done
+ if dpkg-vendor --is ubuntu; then \
+ install -m 644 -D debian/local/65-droid-sans-fallback.conf \
+ debian/fonts-droid/etc/fonts/conf.avail/65-droid-sans-fallback.conf ; \
+ mkdir -p debian/fonts-droid/etc/fonts/conf.d ; \
+ ln -s ../conf.avail/65-droid-sans-fallback.conf \
+ debian/fonts-droid/etc/fonts/conf.d/65-droid-sans-fallback.conf ; \
+ fi
Reply to: