summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Bidulock2014-04-17 15:01:12 -0600
committerBrian Bidulock2015-06-10 07:12:06 -0600
commit2911e0add0e98b5af702c30574d328824c37b0f1 (patch)
tree0d34b93f7b71b09b13573a1d0170962b2af08736
parent96421b675864c20a5ddfc8739064539d2e5f3310 (diff)
downloadaur-2911e0add0e98b5af702c30574d328824c37b0f1.tar.gz
version 20130209.2.r5.gc33df8a-2
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fee7a9f27812..30b8193321be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mcwm-git
pkgdesc = A minimalist floating window manager written on top of the XCB
pkgver = 20130209.2.r5.gc33df8a
- pkgrel = 1
+ pkgrel = 2
url = http://hack.org/mc/hacks/mcwm/
arch = i686
arch = x86_64
@@ -11,6 +11,8 @@ pkgbase = mcwm-git
depends = xcb-util-keysyms
provides = mcwm
conflicts = mcwm
+ conflicts = 2bwm
+ conflicts = 2bwm-git
source = mcwm-git::git://hack.org/mcwm
source = mcwm.desktop
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index ffe3aae5b32d..85c5e7d8533a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Brian Bidulock <bidulock@openss7.org>
pkgname=mcwm-git
pkgver=20130209.2.r5.gc33df8a
-pkgrel=1
+pkgrel=2
pkgdesc="A minimalist floating window manager written on top of the XCB"
arch=('i686' 'x86_64')
url="http://hack.org/mc/hacks/mcwm/"
@@ -9,7 +9,7 @@ license=('ISC')
depends=('xcb-util-wm' 'xcb-util-keysyms')
makedepends=('git')
provides=('mcwm')
-conflicts=('mcwm')
+conflicts=('mcwm' '2bwm' '2bwm-git') # because of /usr/bin/hidden program
source=("$pkgname::git://hack.org/mcwm" "mcwm.desktop")
md5sums=('SKIP'
'8daed020f1a9df4b774207b30d954c53')