summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKotelnik2015-07-27 17:52:12 +0200
committerKotelnik2015-07-27 17:52:12 +0200
commitbcf721af214d28f69f5cace3ee9de9a9dbead0fc (patch)
tree397e73b6603ff592949fb7931ef87e0629d6a7f8
parent89924131db01bda3c9769591aa1386c440d7ae97 (diff)
downloadaur-bcf721af214d28f69f5cace3ee9de9a9dbead0fc.tar.gz
update
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e8980e73008d..066116303255 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,6 +11,7 @@ pkgbase = plasma5-applets-resources-monitor-git
depends = qt5-graphicaleffects
provides = plasma5-applets-resources-monitor
conflicts = plasma5-applets-resources-monitor
+ conflicts = plasma-applet-resources-monitor-git
source = git://github.com/kotelnik/plasma-applet-resources-monitor.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 00ba48cd2648..140974d72a35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@ url="https://github.com/kotelnik/$_gitpkgname"
license=('GPL')
depends=('plasma-workspace' 'qt5-graphicaleffects')
makedepends=('git' 'extra-cmake-modules')
-conflicts=("${_pkgname-*}")
+conflicts=("${_pkgname-*}" 'plasma-applet-resources-monitor-git')
provides=("${_pkgname-*}")
source=("git://github.com/kotelnik/$_gitpkgname.git")
md5sums=('SKIP')