summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD6
2 files changed, 7 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4400f9da0d3b..5ee6abaa49e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Jan 12 10:31:24 UTC 2017
+# Sun Jan 15 00:39:12 UTC 2017
pkgbase = ttf-merriweather
pkgdesc = A typeface that is pleasant to read on screens by Sorkin Type Co
pkgver = 1.583
- pkgrel = 1
+ pkgrel = 2
url = https://fonts.google.com/specimen/Merriweather
install = ttf-merriweather.install
arch = any
@@ -13,6 +13,7 @@ pkgbase = ttf-merriweather
depends = xorg-font-utils
conflicts = ttf-google-fonts-git
conflicts = ttf-google-fonts-opinionated-git
+ conflicts = ttf-merriweather-ib
source = https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-Black.ttf
source = https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-BlackItalic.ttf
source = https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-Bold.ttf
@@ -30,7 +31,7 @@ pkgbase = ttf-merriweather
sha256sums = c2edab6e8962dd88fd4f39d598f77066d9d0c8f213bbc7f4e2abb524b028ed31
sha256sums = e7b49e08cf8ab822490ed067d40a9e06691b94877d56d5ced8384fb5f5571a5b
sha256sums = 4e3867110091c1220b4d370c8ecef935724b59292a4a54a8b63d9d911e01f560
- sha256sums = cc9992063cd0f818e6d754453c43b34907055422b06858b2c7bc82d690a0bccf
+ sha256sums = SKIP
pkgname = ttf-merriweather
diff --git a/PKGBUILD b/PKGBUILD
index e4ca1f8777b1..0883fdc17602 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,13 @@
pkgname=ttf-merriweather
pkgver=1.583
-pkgrel=1
+pkgrel=2
pkgdesc='A typeface that is pleasant to read on screens by Sorkin Type Co'
arch=('any')
url='https://fonts.google.com/specimen/Merriweather'
license=('custom:SIL Open Font License v1.1')
depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
-conflicts=('ttf-google-fonts-git' 'ttf-google-fonts-opinionated-git')
+conflicts=('ttf-google-fonts-git' 'ttf-google-fonts-opinionated-git' 'ttf-merriweather-ib')
install="${pkgname}.install"
source=('https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-Black.ttf'
'https://github.com/google/fonts/raw/master/ofl/merriweather/Merriweather-BlackItalic.ttf'
@@ -27,7 +27,7 @@ sha256sums=('af3e0584567c1c4c65132740df5d4b276d906b74ebe77ec38c0d9bd1db2c10be'
'c2edab6e8962dd88fd4f39d598f77066d9d0c8f213bbc7f4e2abb524b028ed31'
'e7b49e08cf8ab822490ed067d40a9e06691b94877d56d5ced8384fb5f5571a5b'
'4e3867110091c1220b4d370c8ecef935724b59292a4a54a8b63d9d911e01f560'
- 'cc9992063cd0f818e6d754453c43b34907055422b06858b2c7bc82d690a0bccf')
+ 'SKIP')
package() {
install -dm 755 "${pkgdir}/usr/share/fonts/TTF"