summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevin Christensen2015-12-27 11:24:40 -0700
committerDevin Christensen2015-12-27 11:26:41 -0700
commit25a3b1738596512ec9299e492b29cd0e66a2f148 (patch)
tree0ea0419824404376e3c13df8074165c10e38d8ce
parent8a13eb25c930b17867ed629f73773b9d3d01ac73 (diff)
downloadaur-25a3b1738596512ec9299e492b29cd0e66a2f148.tar.gz
Update conflicts
-rw-r--r--.SRCINFO27
-rw-r--r--PKGBUILD25
2 files changed, 32 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0a39cf290475..e1c0feb893e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sun Dec 27 18:26:38 UTC 2015
pkgbase = powerline-fonts-git
pkgdesc = Powerline fonts for X11 and the console
- pkgver = r98.6ac4c01
+ pkgver = r100.a44abd0
pkgrel = 1
url = https://github.com/powerline/fonts
install = powerline-fonts-git.install
@@ -9,31 +11,36 @@ pkgbase = powerline-fonts-git
makedepends = git
depends = fontconfig
depends = xorg-font-utils
+ conflicts = monaco-powerline-font-git
conflicts = otf-droid-sans-mono-powerline-git
+ conflicts = otf-droidsansmono-powerline-git
+ conflicts = otf-fura-mono-powerline-git
conflicts = otf-inconsolata-dz-powerline-git
conflicts = otf-inconsolata-g-powerline-git
conflicts = otf-inconsolata-powerline-git
conflicts = otf-meslo-powerline-git
conflicts = otf-sauce-code-powerline-git
- conflicts = powerline-fonts
- conflicts = terminess-powerline-font-git
- conflicts = ttf-anonymice-powerline-git
- conflicts = ttf-dejavu-sans-mono-powerline-git
- conflicts = ttf-literation-mono-powerline-git
- conflicts = ttf-monofur-powerline-git
- conflicts = ttf-ubuntu-mono-derivative-powerline-git
- conflicts = monaco-powerline-font-git
- conflicts = otf-droidsansmono-powerline-git
conflicts = otf-source-code-pro-powerline-git
+ conflicts = powerline-fonts
conflicts = source-code-pro-fonts-powerline
conflicts = terminess-powerline-font
+ conflicts = terminess-powerline-font-git
+ conflicts = ttf-anonymice-powerline-git
conflicts = ttf-anonymous-pro-powerline
conflicts = ttf-anonymous-pro-powerline-git
+ conflicts = ttf-dejavu-sans-mono-powerline-git
conflicts = ttf-dejavusansmono-powerline-git
+ conflicts = ttf-droid-sans-mono-dotted-powerline-git
+ conflicts = ttf-droid-sans-mono-slashed-powerline-git
+ conflicts = ttf-hack-powerline-git
conflicts = ttf-inconsolata-dz-powerline
conflicts = ttf-liberation-mono-powerline-git
+ conflicts = ttf-literation-mono-powerline-git
conflicts = ttf-meslo-powerline-git
+ conflicts = ttf-monofur-powerline-git
conflicts = ttf-powerline-fonts-git
+ conflicts = ttf-roboto-mono-powerline-git
+ conflicts = ttf-ubuntu-mono-derivative-powerline-git
conflicts = ttf-ubuntu-mono-powerline-git
source = git://github.com/powerline/fonts.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 8844d4b34f5b..e547e4dc61ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Devin Christensen <quixoten at gmail dot com>
pkgname=powerline-fonts-git
-pkgver=r98.6ac4c01
+pkgver=r100.a44abd0
pkgrel=1
pkgdesc="Powerline fonts for X11 and the console"
arch=('any')
@@ -9,31 +9,36 @@ license=('CPL')
depends=(fontconfig xorg-font-utils )
makedepends=('git')
conflicts=(
+ monaco-powerline-font-git
otf-droid-sans-mono-powerline-git
+ otf-droidsansmono-powerline-git
+ otf-fura-mono-powerline-git
otf-inconsolata-dz-powerline-git
otf-inconsolata-g-powerline-git
otf-inconsolata-powerline-git
otf-meslo-powerline-git
otf-sauce-code-powerline-git
- powerline-fonts
- terminess-powerline-font-git
- ttf-anonymice-powerline-git
- ttf-dejavu-sans-mono-powerline-git
- ttf-literation-mono-powerline-git
- ttf-monofur-powerline-git
- ttf-ubuntu-mono-derivative-powerline-git
- monaco-powerline-font-git
- otf-droidsansmono-powerline-git
otf-source-code-pro-powerline-git
+ powerline-fonts
source-code-pro-fonts-powerline
terminess-powerline-font
+ terminess-powerline-font-git
+ ttf-anonymice-powerline-git
ttf-anonymous-pro-powerline
ttf-anonymous-pro-powerline-git
+ ttf-dejavu-sans-mono-powerline-git
ttf-dejavusansmono-powerline-git
+ ttf-droid-sans-mono-dotted-powerline-git
+ ttf-droid-sans-mono-slashed-powerline-git
+ ttf-hack-powerline-git
ttf-inconsolata-dz-powerline
ttf-liberation-mono-powerline-git
+ ttf-literation-mono-powerline-git
ttf-meslo-powerline-git
+ ttf-monofur-powerline-git
ttf-powerline-fonts-git
+ ttf-roboto-mono-powerline-git
+ ttf-ubuntu-mono-derivative-powerline-git
ttf-ubuntu-mono-powerline-git
)
install=$pkgname.install