summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Shparber2015-02-24 13:42:21 -0800
committerOleg Shparber2015-02-24 13:42:21 -0800
commit41c11be0a675f022b74ee328612165ce92c4c12a (patch)
tree7ceb9945ad243101267bd2cae618f44c22c781d8
parent938c19788c17000993ae3fc4ff5e1dc4fc01391c (diff)
downloadaur-41c11be0a675f022b74ee328612165ce92c4c12a.tar.gz
awesome-git: Conflict with 'awesome'
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7361e7a4654..1b84690a536 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = awesome-git
pkgdesc = Highly configurable framework window manager
- pkgver = 3.5.2.315.gc9f08fb
+ pkgver = 3.5.2.344.g2f0a7f9
pkgrel = 1
url = http://awesome.naquadah.org/
arch = i686
@@ -31,6 +31,7 @@ pkgbase = awesome-git
optdepends = vicious: widgets for the Awesome window manager
provides = notification-daemon
provides = awesome
+ conflicts = awesome
backup = etc/xdg/awesome/rc.lua
source = awesome-git::git://github.com/awesomeWM/awesome.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index f2f57d392cc..2851c02f5cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
_pkgname=awesome
pkgname=${_pkgname}-git
-pkgver=3.5.2.315.gc9f08fb
+pkgver=3.5.2.344.g2f0a7f9
pkgrel=1
pkgdesc='Highly configurable framework window manager'
arch=('i686' 'x86_64')
@@ -24,6 +24,7 @@ optdepends=('rlwrap: readline support for awesome-client'
'dex: autostart your desktop files'
'vicious: widgets for the Awesome window manager')
provides=('notification-daemon' 'awesome')
+conflicts=('awesome')
backup=('etc/xdg/awesome/rc.lua')
source=("$pkgname::git://github.com/awesomeWM/awesome.git")
md5sums=('SKIP')