summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevin Christensen2016-07-05 08:58:37 -0600
committerDevin Christensen2016-07-05 08:58:37 -0600
commitddd7c1d1ac13d80a8e2a013ad3c6e5d9d1b345b4 (patch)
tree7e5a2970c113e6a9e7bfebc3d8c9e2ef34fbf1e4
parentbdf5ab89f63043235a7335cccb8fefce6f5c99a0 (diff)
downloadaur-ddd7c1d1ac13d80a8e2a013ad3c6e5d9d1b345b4.tar.gz
Remove powerline-fonts conflict
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 3 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ad74a6be24f3..9f4b9a1871d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = terminess-powerline-font-git
pkgdesc = Terminess Powerline
pkgver = r100.a44abd0
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/powerline/fonts
install = terminess-powerline-font-git.install
arch = any
@@ -9,7 +9,6 @@ pkgbase = terminess-powerline-font-git
makedepends = git
depends = fontconfig
depends = xorg-font-utils
- conflicts = powerline-fonts
conflicts = powerline-fonts-git
source = git+https://github.com/powerline/fonts.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 8974099af44e..487fee6d44be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
# Maintainer: Devin Christensen <quixoten at gmail dot com>
pkgname=terminess-powerline-font-git
pkgver=r100.a44abd0
-pkgrel=2
+pkgrel=3
pkgdesc="Terminess Powerline"
arch=('any')
url='https://github.com/powerline/fonts'
license=('custom:SIL Open Font License, Version 1.1')
depends=(fontconfig xorg-font-utils )
makedepends=('git')
-conflicts=(powerline-fonts powerline-fonts-git)
+conflicts=(powerline-fonts-git)
install=$pkgname.install
source=('git+https://github.com/powerline/fonts.git')
md5sums=('SKIP')