diff options
| -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:33:47 UTC 2017 +# Thu Jan 12 10:31:24 UTC 2017 pkgbase = ttf-merriweather pkgdesc = A typeface that is pleasant to read on screens by Sorkin Type Co pkgver = 1.583 @@ -12,6 +12,7 @@ pkgbase = ttf-merriweather 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/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 @@ -8,7 +8,7 @@ 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') +conflicts=('ttf-google-fonts-git' 'ttf-google-fonts-opinionated-git') 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' |