summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonio Rojas2016-11-06 10:19:22 +0000
committerAntonio Rojas2016-11-06 10:19:22 +0000
commitcfd81138ea4480f8fea905d764793cf3f1ad6458 (patch)
tree5b0a41b3d7ac9dfc28ea5f60d314d67cecc7b207
parent6fbc0d87ef10eaf78e96405a2da3c36f051ea4ee (diff)
downloadaur-cfd81138ea4480f8fea905d764793cf3f1ad6458.tar.gz
More conflicts
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fbea2438d1c..94d6c993e36 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = konqueror-git
pkgdesc = KDE File Manager and Web Browser
- pkgver = r14064.fc206b3
+ pkgver = r14067.4ab571e
pkgrel = 1
url = https://userbase.kde.org/Konqueror
arch = i686
@@ -26,6 +26,7 @@ pkgbase = konqueror-git
conflicts = libkonq-git
conflicts = libkonq-frameworks-git
conflicts = konq-plugins
+ conflicts = kdebase-konq-plugins
replaces = konq-plugins-git
replaces = libkonq-git
source = git://anongit.kde.org/konqueror
diff --git a/PKGBUILD b/PKGBUILD
index cfda2e56747..56e0a1e276b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Antonio Rojas <arojas@archlinux.org>
pkgname=konqueror-git
-pkgver=r14064.fc206b3
+pkgver=r14067.4ab571e
pkgrel=1
pkgdesc="KDE File Manager and Web Browser"
arch=(i686 x86_64)
@@ -10,7 +10,7 @@ license=(LGPL)
depends=(dolphin qt5-webengine)
makedepends=(extra-cmake-modules git kdoctools kdesu tidy kdesignerplugin kdelibs4support)
conflicts=(kdebase-konqueror konqueror konqueror-frameworks-git konq-plugins-git konq-plugins-frameworks-git
- libkonq-git libkonq-frameworks-git konq-plugins)
+ libkonq-git libkonq-frameworks-git konq-plugins kdebase-konq-plugins)
provides=(konqueror)
replaces=(konq-plugins-git libkonq-git)
optdepends=('tidy: Tidy HTML plugin' 'kdesu: shell command plugin')