[arch-commits] Commit in psi (4 files)

[Sergej Pupykin]

    Date: Monday, February 26, 2018 @ 12:36:02
  Author: spupykin
Revision: 298285

rm conflicts/replaces

Modified:
  psi-l10n/trunk/PKGBUILD
  psi-nowebkit/trunk/PKGBUILD
  psi-plugins/trunk/PKGBUILD
  psi/trunk/PKGBUILD

--------------------------+
 -l10n/trunk/PKGBUILD     |    2 --
 -nowebkit/trunk/PKGBUILD |    2 +-
 -plugins/trunk/PKGBUILD  |    2 --
 trunk/PKGBUILD           |    4 +---
 4 files changed, 2 insertions(+), 8 deletions(-)

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2018-02-26 12:35:07 UTC (rev 298284)
+++ trunk/PKGBUILD	2018-02-26 12:36:02 UTC (rev 298285)
@@ -3,7 +3,7 @@
 
 pkgname="psi"
 pkgver=1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="a powerful Jabber client (Qt, C++) designed for the Jabber power users"
 url="https://psi-im.org"
 license=('GPL2')
@@ -11,8 +11,6 @@
 depends=('qt5-base' 'qt5-webengine' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5'
 	 'libidn' 'libxss' 'qt5-svg' 'hunspell' 'qtkeychain')
 makedepends=('patch' 'cmake')
-conflicts=('psi-plus-qt5-git' 'psi-plus-webkit-qt5-git' 'psi-plus-webkit-git' 'psi-plus-git' 'psi-plus')
-replaces=('psi-plus')
 source=("https://downloads.sourceforge.net/project/${pkgname}/Psi/${pkgver}/psi-${pkgver}.tar.xz"
 	"no-qca-qt4.patch::https://aur.archlinux.org/cgit/aur.git/plain/no-qca-qt4.patch?h=psi-plus-git&id=bc3ee431ca26d6294810636a514c50985540bd23"
 	"join.patch")

Modified: -l10n/trunk/PKGBUILD
===================================================================
--- -l10n/trunk/PKGBUILD	2018-02-26 12:35:07 UTC (rev 298284)
+++ -l10n/trunk/PKGBUILD	2018-02-26 12:36:02 UTC (rev 298285)
@@ -9,8 +9,6 @@
 url="https://psi-im.org"
 license=('GPL2')
 depends=('psi')
-conflicts=('psi-plus-l10n')
-replaces=('psi-plus-l10n')
 makedepends=('qt5-tools')
 options=('!strip' '!zipman')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/psi-im/psi-l10n/archive/$pkgver.tar.gz")

Modified: -nowebkit/trunk/PKGBUILD
===================================================================
--- -nowebkit/trunk/PKGBUILD	2018-02-26 12:35:07 UTC (rev 298284)
+++ -nowebkit/trunk/PKGBUILD	2018-02-26 12:36:02 UTC (rev 298285)
@@ -11,7 +11,7 @@
 depends=('qt5-base' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5'
 	 'libidn' 'libxss' 'qt5-svg' 'hunspell' 'qtkeychain')
 makedepends=('patch' 'cmake')
-conflicts=('psi-plus-qt5-git' 'psi-plus-webkit-qt5-git' 'psi-plus-webkit-git' 'psi-plus-git' 'psi-plus' 'psi')
+conflicts=('psi')
 provides=('psi')
 source=("https://downloads.sourceforge.net/project/psi/Psi/${pkgver}/psi-${pkgver}.tar.xz"
 	"no-qca-qt4.patch::https://aur.archlinux.org/cgit/aur.git/plain/no-qca-qt4.patch?h=psi-plus-git&id=bc3ee431ca26d6294810636a514c50985540bd23"

Modified: -plugins/trunk/PKGBUILD
===================================================================
--- -plugins/trunk/PKGBUILD	2018-02-26 12:35:07 UTC (rev 298284)
+++ -plugins/trunk/PKGBUILD	2018-02-26 12:36:02 UTC (rev 298285)
@@ -9,8 +9,6 @@
 url="https://psi-im.org"
 license=('GPL2')
 depends=('qt5-base' 'qt5-webkit' 'qt5-multimedia' 'psi' 'qt5-webengine')
-conflicts=('psi-plus-plugins-git' 'psi-plus-plugins-qt5-git' 'psi-plus-plugins')
-replaces=('psi-plus-plugins')
 makedepends=('libotr' 'tidyhtml')
 optdepends=('libotr: for OTR plugin'
             'tidyhtml: for OTR plugin')