[arch-commits] Commit in ttf-inconsolata/trunk (3 files)

[Balló György]

    Date: Wednesday, September 11, 2013 @ 03:28:29
  Author: bgyorgy
Revision: 97029

upgpkg: ttf-inconsolata 20090215-4

- Move OTF file to /usr/share/fonts/OTF (FS#31828)
- Add fontconfig file (FS#32489)

Added:
  ttf-inconsolata/trunk/75-ttf-inconsolata.conf
Modified:
  ttf-inconsolata/trunk/PKGBUILD
  ttf-inconsolata/trunk/ttf-inconsolata.install

-------------------------+
 75-ttf-inconsolata.conf |    1 +
 PKGBUILD                |    7 +++++--
 ttf-inconsolata.install |    9 +++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

Added: 75-ttf-inconsolata.conf
===================================================================
(Binary files differ)

Index: ttf-inconsolata/trunk/75-ttf-inconsolata.conf
===================================================================
--- 75-ttf-inconsolata.conf	2013-09-10 21:06:49 UTC (rev 97028)
+++ 75-ttf-inconsolata.conf	2013-09-11 01:28:29 UTC (rev 97029)

Property changes on: ttf-inconsolata/trunk/75-ttf-inconsolata.conf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/xml
\ No newline at end of property
Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-10 21:06:49 UTC (rev 97028)
+++ PKGBUILD	2013-09-11 01:28:29 UTC (rev 97029)
@@ -3,7 +3,7 @@
 
 pkgname=ttf-inconsolata
 pkgver=20090215
-pkgrel=3
+pkgrel=4
 pkgdesc="Monospace font for pretty code listings and for the terminal"
 arch=('any')
 url="http://levien.com/type/myfonts/inconsolata.html"
@@ -10,12 +10,15 @@
 license=('custom:OFL')
 depends=('fontconfig' 'xorg-font-utils')
 source=('http://levien.com/type/myfonts/Inconsolata.otf'
+	'75-ttf-inconsolata.conf'
 	'OFL.txt')
 install=${pkgname}.install
 md5sums=('0fbe014c1f0fb5e3c71140ff0dc63edf'
+         '36fde7a83dc4f9d76f25242b761b46b8'
          '6ed93967ff0dc6dd9c8d31c17f817a06')
          
 package() {
-  install -Dm644 ${srcdir}/Inconsolata.otf ${pkgdir}/usr/share/fonts/TTF/ttf-inconsolata.otf
+  install -Dm644 ${srcdir}/Inconsolata.otf ${pkgdir}/usr/share/fonts/OTF/Inconsolata.otf
+  install -Dm644 ${srcdir}/75-ttf-inconsolata.conf ${pkgdir}/etc/fonts/conf.avail/75-ttf-inconsolata.conf
   install -Dm644 ${srcdir}/OFL.txt ${pkgdir}/usr/share/licenses/ttf-inconsolata/OFL.txt
 }

Modified: ttf-inconsolata.install
===================================================================
--- ttf-inconsolata.install	2013-09-10 21:06:49 UTC (rev 97028)
+++ ttf-inconsolata.install	2013-09-11 01:28:29 UTC (rev 97029)
@@ -1,13 +1,18 @@
 post_install() {
   echo -n "Updating font cache... "
   fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/TTF
-  mkfontdir /usr/share/fonts/TTF
+  mkfontscale /usr/share/fonts/OTF
+  mkfontdir /usr/share/fonts/OTF
   echo "done."
 }
 
 post_upgrade() {
   post_install
+
+  if [ "$(vercmp 20090215-4 "$2")" -eq 1 ]; then
+    mkfontscale /usr/share/fonts/TTF
+    mkfontdir /usr/share/fonts/TTF
+  fi
 }
 
 post_remove() {