Adding conflicts

2 files changed, 13 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3e9818a0e0d0..4f17a3de3eeb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,20 @@
 # Generated by mksrcinfo v8
-# Fri Jan 22 16:06:06 UTC 2016
+# Tue Jan 26 02:28:14 UTC 2016
 pkgbase = moksha-modules-extra-git
 	pkgdesc = Extra Moksha modules
-	pkgver = f7db19e
+	pkgver = 9ab20a0
 	pkgrel = 1
 	url = http://mokshadesktop.org
 	arch = i686
 	arch = x86_64
 	license = BSD
-	depends = elementary
-	depends = moksha-module-deskshow-git
-	depends = moksha-module-emprint-git
+	depends = moksha
+	depends = moksha-modules-emprint-git
+	conflicts = moksha-module-cpu-git
+	conflicts = moksha-module-deskshow-git
+	conflicts = moksha-module-diskio-git
+	conflicts = moksha-module-mem-git
+	conflicts = moksha-module-net-git
 	source = moksha-modules-extra::git+https://github.com/JeffHoogland/moksha-modules-extra.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 058f0fc48597..e18dd0e7c028 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,18 @@
 pkgname=moksha-modules-extra-git
-pkgver=f7db19e
+pkgver=9ab20a0
 pkgrel=1
 _pkgname=moksha-modules-extra
 pkgdesc="Extra Moksha modules"
 arch=('i686' 'x86_64')
 url="http://mokshadesktop.org"
 license=('BSD')
-depends=('elementary' 'moksha-module-deskshow-git' 'moksha-module-emprint-git')
+depends=('moksha' 'moksha-modules-emprint-git')
+conflicts=('moksha-module-cpu-git' 'moksha-module-deskshow-git' 'moksha-module-diskio-git' 'moksha-module-mem-git' 'moksha-module-net-git')
 _module_list=(
   'alarm'
   'calendar'
   'cpu'
+  'deskshow'
   'diskio'
   'engage'
   'flame'