summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTyler Swagar2017-01-12 02:29:59 -0800
committerTyler Swagar2017-01-12 02:29:59 -0800
commitafb06a5a70c93a004b7bb1b9856a3181fcdb3934 (patch)
treea0f2164ffb19783983ff86f2c3c1cd4d1f998cc3
parenteba8cd2b47205ad73de09b30233a3e8a63f40fbe (diff)
downloadaur-afb06a5a70c93a004b7bb1b9856a3181fcdb3934.tar.gz
Add conflict with ttf-google-fonts-opinionated-git
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 44c0804ca0af..793717cf828b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Wed Jan 11 02:31:12 UTC 2017
+# Thu Jan 12 10:29:11 UTC 2017
pkgbase = ttf-quintessential
pkgdesc = Calligraphic typeface from Google by Brian J. Bonislawsky
pkgver = 1.001
@@ -12,6 +12,7 @@ pkgbase = ttf-quintessential
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/quintessential/Quintessential-Regular.ttf
source = https://github.com/google/fonts/raw/master/ofl/quintessential/OFL.txt
sha256sums = 73d192f10dbfc716214aae282afb93036f12415d16adc9d6d0e981f34d829d32
diff --git a/PKGBUILD b/PKGBUILD
index d66c4a509ac6..8bdf2f79299c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ arch=('any')
url='https://fonts.google.com/specimen/Quintessential'
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/quintessential/Quintessential-Regular.ttf'
'https://github.com/google/fonts/raw/master/ofl/quintessential/OFL.txt')