summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTyler Swagar2017-01-10 18:36:52 -0800
committerTyler Swagar2017-01-10 18:36:52 -0800
commit99c7190a311bd333715db93a0654bbc9ac17aee4 (patch)
treed4f1a8b59d30c2e350fbd225a5dbbf750a4da072
parent94dfdac0c60e9ca07ed95f3c391b5462ba3a0192 (diff)
downloadaur-99c7190a311bd333715db93a0654bbc9ac17aee4.tar.gz
Add conflict with ttf-google-fonts-git
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD1
2 files changed, 3 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 688ddfc06dc..16870fdc992 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon Jan 9 22:47:29 UTC 2017
+# Wed Jan 11 02:36:05 UTC 2017
pkgbase = ttf-merriweather-sans
pkgdesc = A sans-serif typeface that is pleasant to read on screens by Sorkin Type Co
pkgver = 1.006
@@ -11,6 +11,7 @@ pkgbase = ttf-merriweather-sans
depends = fontconfig
depends = xorg-fonts-encodings
depends = xorg-font-utils
+ conflicts = ttf-google-fonts-git
source = https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-Bold.ttf
source = https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-BoldItalic.ttf
source = https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-ExtraBold.ttf
diff --git a/PKGBUILD b/PKGBUILD
index 7af8859d266..ee0d8b0a111 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,6 +8,7 @@ arch=('any')
url='https://fonts.google.com/specimen/Merriweather+Sans'
license=('custom:SIL Open Font License v1.1')
depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
+conflicts=('ttf-google-fonts-git')
install="${pkgname}.install"
source=('https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-Bold.ttf'
'https://github.com/google/fonts/raw/master/ofl/merriweathersans/MerriweatherSans-BoldItalic.ttf'