summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKotelnik2015-07-27 18:16:11 +0200
committerKotelnik2015-07-27 18:16:11 +0200
commitd0055b769d6e5fef7b9263ffca2d0237335f5d64 (patch)
tree0352de884806b371dc0fba123a38dc3fbafc3c24
parent5559f7da4a960766711cb1eaa0aa885f03b8ccd2 (diff)
downloadaur-d0055b769d6e5fef7b9263ffca2d0237335f5d64.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 542ed6e5b4d5..8d6c49cd886a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,6 +11,7 @@ pkgbase = plasma5-applets-network-monitor-git
depends = qt5-graphicaleffects
provides = plasma5-applets-network-monitor
conflicts = plasma5-applets-network-monitor
+ conflicts = plasma-applet-network-monitor-git
source = git://github.com/kotelnik/plasma-applet-network-monitor.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 13fb0fccc0d7..355e7c701513 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-network-monitor-git')
provides=("${_pkgname-*}")
source=("git://github.com/kotelnik/$_gitpkgname.git")
md5sums=('SKIP')