summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Crerar2017-11-04 20:10:13 -0400
committerAndrew Crerar2017-11-04 20:10:13 -0400
commit025d81fc0de7e73941be06c52a57a97029a63032 (patch)
tree40f0b5f9df88bb0ea4d987832bd27901498de65b
parent51764ef1349a8a8093f411677333d09cb58bb46f (diff)
downloadaur-025d81fc0de7e73941be06c52a57a97029a63032.tar.gz
Updating conflicts and provides to include ttf-ubuntu-font-family
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
2 files changed, 7 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7dbf9701fa8e..d6a71d9b9a5b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ttf-google-fonts-git
pkgdesc = TrueType fonts from the Google Fonts project (git version)
pkgver = r1206.2e2caa23
- pkgrel = 1
+ pkgrel = 2
epoch = 1
url = https://github.com/google/fonts
arch = any
@@ -47,6 +47,7 @@ pkgbase = ttf-google-fonts-git
provides = ttf-source-sans-pro-ibx
provides = ttf-ubuntu-font-family-ib
provides = ttf-vollkorn-ibx
+ provides = ttf-ubuntu-font-family
conflicts = adobe-source-code-pro-fonts
conflicts = adobe-source-sans-pro-fonts
conflicts = jsmath-fonts
@@ -81,6 +82,7 @@ pkgbase = ttf-google-fonts-git
conflicts = ttf-ubuntu-font-family-ib
conflicts = ttf-vollkorn-ibx
conflicts = ttf-arabeyes-fonts
+ conflicts = ttf-ubuntu-font-family
source = git+https://github.com/google/fonts.git
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 993b79357e6e..c21256b7320f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
pkgname=ttf-google-fonts-git
pkgver=r1206.2e2caa23
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc="TrueType fonts from the Google Fonts project (git version)"
arch=(any)
@@ -28,7 +28,8 @@ conflicts=(adobe-source-code-pro-fonts adobe-source-sans-pro-fonts jsmath-fonts
ttf-merriweather-sans ttf-nova ttf-opensans ttf-oswald ttf-oxygen
ttf-oxygen-git ttf-pt-fonts ttf-quintessential ttf-roboto ttf-roboto-mono
ttf-signika ttf-sil-fonts ttf-source-code-pro-ibx ttf-source-sans-pro-ibx
- ttf-ubuntu-font-family-ib ttf-vollkorn-ibx ttf-arabeyes-fonts)
+ ttf-ubuntu-font-family-ib ttf-vollkorn-ibx ttf-arabeyes-fonts
+ ttf-ubuntu-font-family)
provides=(adobe-source-code-pro-fonts adobe-source-sans-pro-fonts jsmath-fonts
lohit-fonts ttf-andika ttf-anonymous-pro ttf-cardo ttf-comfortaa
ttf-croscore ttf-fira-mono ttf-fira-sans ttf-inconsolata ttf-lato
@@ -36,7 +37,7 @@ provides=(adobe-source-code-pro-fonts adobe-source-sans-pro-fonts jsmath-fonts
ttf-merriweather-sans ttf-nova ttf-opensans ttf-oswald ttf-oxygen
ttf-oxygen-git ttf-pt-fonts ttf-quintessential ttf-roboto ttf-roboto-mono
ttf-signika ttf-sil-fonts ttf-source-code-pro-ibx ttf-source-sans-pro-ibx
- ttf-ubuntu-font-family-ib ttf-vollkorn-ibx)
+ ttf-ubuntu-font-family-ib ttf-vollkorn-ibx ttf-ubuntu-font-family)
source=("git+${url}.git")
sha512sums=('SKIP')