summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevin Christensen2016-01-25 07:34:04 -0700
committerDevin Christensen2016-01-25 07:34:04 -0700
commitfc0133d0afa108505081b8ae16291c71e070808e (patch)
tree552a59f61f25fb86e65d42325750d97cbf788290
parent36f9fe77951158e00d5dd461a7ff551f221e960f (diff)
downloadaur-fc0133d0afa108505081b8ae16291c71e070808e.tar.gz
Add conflict with ttf-hack
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 627702b7efb..aca65171311 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ttf-hack-powerline-git
pkgdesc = Hack for Powerline
pkgver = r100.a44abd0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/powerline/fonts
install = ttf-hack-powerline-git.install
arch = any
@@ -12,6 +12,7 @@ pkgbase = ttf-hack-powerline-git
depends = xorg-font-utils
conflicts = powerline-fonts
conflicts = powerline-fonts-git
+ conflicts = ttf-hack
source = git+https://github.com/powerline/fonts.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 9f2254c1dd0..80d67daee69 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
# Maintainer: Devin Christensen <quixoten at gmail dot com>
pkgname=ttf-hack-powerline-git
pkgver=r100.a44abd0
-pkgrel=1
+pkgrel=2
pkgdesc="Hack for Powerline"
arch=('any')
url=('https://github.com/powerline/fonts')
license=('custom:SIL OFL, v1.1' 'custom:Bitstream License')
depends=(fontconfig xorg-font-utils )
makedepends=('git')
-conflicts=(powerline-fonts powerline-fonts-git)
+conflicts=(powerline-fonts powerline-fonts-git ttf-hack)
install=$pkgname.install
source=('git+https://github.com/powerline/fonts.git')
md5sums=('SKIP')