[Debian-in-commits] [SCM] fonts-gubbi.git branch, master, updated. upstream/1.0-8-g8c04bb2

[Vasudev Kamath]

The following commit has been merged in the master branch:
commit 0d307c9e9c205a1e2b1463549824ac8ce5f1e545
Author: Vasudev Kamath <kamathvasudev at gmail.com>
Date:   Fri Jan 27 14:44:50 2012 +0530

    fontconfig conf file is renamed to 65-0 priority to override fontconfig 65-nonlatin.conf

diff --git a/debian/65.0-fonts-gubbi.conf b/debian/65-0-fonts-gubbi.conf
similarity index 100%
rename from debian/65.0-fonts-gubbi.conf
rename to debian/65-0-fonts-gubbi.conf
diff --git a/debian/fonts-gubbi.install b/debian/fonts-gubbi.install
index dbc516b..d61e738 100644
--- a/debian/fonts-gubbi.install
+++ b/debian/fonts-gubbi.install
@@ -1,2 +1,2 @@
 ./TTFFiles/Gubbi.ttf usr/share/fonts/truetype/Gubbi/
-./debian/65.0-fonts-gubbi.conf etc/fonts/conf.avail/
+./debian/65-0-fonts-gubbi.conf etc/fonts/conf.avail/
diff --git a/debian/fonts-gubbi.links b/debian/fonts-gubbi.links
index eec36df..f6ee1aa 100644
--- a/debian/fonts-gubbi.links
+++ b/debian/fonts-gubbi.links
@@ -1 +1 @@
-etc/fonts/conf.avail/65.0-fonts-gubbi.conf etc/fonts/conf.d/65.0-fonts-gubbi.conf
+etc/fonts/conf.avail/65-0-fonts-gubbi.conf etc/fonts/conf.d/65-0-fonts-gubbi.conf
diff --git a/debian/fonts-gubbi.preinst b/debian/fonts-gubbi.preinst
index 8281ff4..d8c70c5 100644
--- a/debian/fonts-gubbi.preinst
+++ b/debian/fonts-gubbi.preinst
@@ -19,6 +19,9 @@ case "$1" in
         if [ -d /usr/share/fonts/truetype/fonts-gubbi ]; then
             rm -rf /usr/share/fonts/truetype/fonts-gubbi/
         fi
+        if [ -f /etc/fonts/conf.avail/90-fonts-gubbi.conf ]; then
+            rm -rf /etc/fonts/conf.avail/90-fonts-gubbi.conf
+        fi
     ;;
 
     abort-upgrade)

-- 
fonts-gubbi.git