diff options
| author | Tyler Swagar | 2017-01-12 02:33:46 -0800 |
|---|---|---|
| committer | Tyler Swagar | 2017-01-12 02:33:46 -0800 |
| commit | 3016860227f716c26dea81e54ac6048ff77bb889 (patch) | |
| tree | e66c4ab3b5b5d5829174253cbc6414491cd97417 | |
| parent | 99c7190a311bd333715db93a0654bbc9ac17aee4 (diff) | |
| download | aur-3016860227f716c26dea81e54ac6048ff77bb889.tar.gz | |
Add conflict with ttf-google-fonts-opinionated-git
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | PKGBUILD | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -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 @@ -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' |