summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Meyer2015-10-22 12:24:46 -0400
committerTed Meyer2015-10-22 12:24:46 -0400
commite59ad6cbe663a66c729ad870d019ca7bc92f4054 (patch)
treea0474883445a414ed60dd405c4906a474dd5e222
parent7cea8c398919663285f71ab66e94eea09f042ba6 (diff)
downloadaur-e59ad6cbe663a66c729ad870d019ca7bc92f4054.tar.gz
fixed some conflics
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD7
2 files changed, 8 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d94df09df298..5624991149c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = tint3
pkgdesc = An independant status bar for X11 (works best with bspwm)
- pkgver = 200
+ pkgver = 201
pkgrel = 1
- url = https://github.com/tmathmeyer/tint3
+ url = https://github.com/tmathmeyer/
arch = x86_64
license = GPL
makedepends = git
@@ -11,10 +11,9 @@ pkgbase = tint3
depends = libxft
depends = xcb-util-wm
depends = libxinerama
- provides = tint3
- conflicts = tint3
- conflicts = tint3-cpp-git
- source = git://github.com/tmathmeyer/tint3.git
+ conflicts =
+ conflicts = tint3-git
+ source = git://github.com/tmathmeyer/.git
md5sums = SKIP
pkgname = tint3
diff --git a/PKGBUILD b/PKGBUILD
index f49f30a55050..4eae0e0106c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,7 @@
# Maintainer: Ted Meyer <tmathmeyer@gmail.com>
-_pkgname=tint3
-pkgname=${_pkgname}
-pkgver=200
+pkgname=tint3
+pkgver=201
pkgrel=1
pkgdesc='An independant status bar for X11 (works best with bspwm)'
arch=('x86_64')
@@ -13,7 +12,7 @@ makedepends=('git' 'libx11' 'xcb-util')
optdepends=()
provides=("${_pkgname}")
conflicts=("${_pkgname}" "tint3-cpp-git")
-conclicts=("${_pkgname}" "tint3-git")
+conflicts=("${_pkgname}" "tint3-git")
source=("git://github.com/tmathmeyer/${_pkgname}.git")
md5sums=('SKIP')