summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorXorg2016-03-07 10:14:03 +0100
committerXorg2016-03-07 10:14:11 +0100
commitedaf1535d57e8c4a00bfcbd4586836ab4220e86d (patch)
treea8ba73e0010ef70e11b2b995005cb91806404ae4
parent6fabd6e42586d362828f21211adec806421f8a16 (diff)
downloadaur-edaf1535d57e8c4a00bfcbd4586836ab4220e86d.tar.gz
Add libappindicator packages (GTK2) in conflicts
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD3
2 files changed, 8 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6c7c48c68086..0e879b467523 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Mar 5 12:58:27 UTC 2016
+# Mon Mar 7 09:14:04 UTC 2016
pkgbase = psensor
pkgdesc = A graphical hardware temperature monitor for Linux
pkgver = 1.1.3
- pkgrel = 2
+ pkgrel = 3
url = http://wpitchoune.net/psensor
install = psensor.install
arch = i686
@@ -21,6 +21,10 @@ pkgbase = psensor
optdepends = json-c: required for remote monitoring
optdepends = curl: required for remote monitoring
optdepends = libgtop: required for CPU usage
+ conflicts = libappindicator-gtk2
+ conflicts = libappindicator-activate-gtk2
+ conflicts = libappindicator-gtk2-ubuntu
+ conflicts = lib32-libappindicator-gtk2
source = http://wpitchoune.net/psensor/files/psensor-1.1.3.tar.gz
source = psensor-libmicrohttpd.patch
md5sums = c3a3c1dea4dbfe12bbfb8088b86c3d4f
diff --git a/PKGBUILD b/PKGBUILD
index 58ca0e261cc0..91b6c3e8c879 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=psensor
pkgver=1.1.3
-pkgrel=2
+pkgrel=3
pkgdesc="A graphical hardware temperature monitor for Linux"
arch=('i686' 'x86_64')
url="http://wpitchoune.net/psensor"
@@ -18,6 +18,7 @@ optdepends=('asciidoc: required to produce the HTML version of the FAQ'
'json-c: required for remote monitoring'
'curl: required for remote monitoring'
'libgtop: required for CPU usage')
+conflicts=('libappindicator-gtk2' 'libappindicator-activate-gtk2' 'libappindicator-gtk2-ubuntu' 'lib32-libappindicator-gtk2')
install=$pkgname.install
source=("http://wpitchoune.net/$pkgname/files/$pkgname-$pkgver.tar.gz"
"psensor-libmicrohttpd.patch")