summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 16870fdc992..083f8cb68ea 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Wed Jan 11 02:36:05 UTC 2017
+# Thu Jan 12 10:33:13 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
@@ -12,6 +12,7 @@ pkgbase = ttf-merriweather-sans
depends = xorg-fonts-encodings
depends = xorg-font-utils
conflicts = ttf-google-fonts-git
+ conflicts = ttf-google-fonts-opinionated-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 ee0d8b0a111..9f43743610c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +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')
+conflicts=('ttf-google-fonts-git' 'ttf-google-fonts-opinionated-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'