summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorShadowKyogre2015-12-03 13:40:34 -0800
committerShadowKyogre2015-12-03 13:40:34 -0800
commit9cb220d45057e24e10d292641f047d44004dd5e0 (patch)
tree4701b6c3baf86825f7c7d52b07e4604bdf2c3875
parent8362b914ccff08fae1984cd8d4cd8d28f97f8fa6 (diff)
downloadaur-9cb220d45057e24e10d292641f047d44004dd5e0.tar.gz
Remove conflicts
It doesn't really conflict with the packages listed. Just provides them.
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD3
2 files changed, 2 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8ba7f2f8f4d3..57c4034fcd49 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = qtnotifydaemon
pkgdesc = Configurable and flexible Qt notification daemon
pkgver = 1.0.14
- pkgrel = 4
+ pkgrel = 5
url = http://sourceforge.net/projects/qtnotifydaemon
install = qtnotifydaemon.install
arch = i686
@@ -11,9 +11,6 @@ pkgbase = qtnotifydaemon
provides = notification-daemon
provides = xfce4-notifyd
provides = notify-osd
- conflicts = notification-daemon
- conflicts = xfce4-notifyd
- conflicts = notify-osd
source = http://downloads.sourceforge.net/project/qtnotifydaemon/qtnotifydaemon_1.0.14.orig.tar.gz
source = override_icon_theme.patch
source = gcc4.7fix.patch
diff --git a/PKGBUILD b/PKGBUILD
index ded47899dcf7..cf667a694d36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
#Contributor: Artem A Klevtsov <unikum.pm at gmail dot com>
pkgname=qtnotifydaemon
pkgver=1.0.14
-pkgrel=4
+pkgrel=5
pkgdesc="Configurable and flexible Qt notification daemon"
arch=('i686' 'x86_64')
url="http://sourceforge.net/projects/${pkgname}"
@@ -15,7 +15,6 @@ md5sums=('af57385fb4acb48ce1ad40aaac369a4e'
'cf6d30e755839eb05b5d63c6754a8524'
'70c283997217001b12ee7721d17491fc')
install="${pkgname}.install"
-conflicts=('notification-daemon' 'xfce4-notifyd' 'notify-osd')
provides=('notification-daemon' 'xfce4-notifyd' 'notify-osd')
build() {