summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Wagie2022-06-06 12:23:48 -0600
committerMark Wagie2022-06-06 12:23:48 -0600
commitde8495a9e0cb063dffbe80a5de25c2296e48682f (patch)
treea51c1578234f3b864c8fc69fc562b9f3b1dda6fa
parent1f630febae336fccc90d57bf1325aea56fbb8c39 (diff)
downloadaur-de8495a9e0cb063dffbe80a5de25c2296e48682f.tar.gz
remove conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 2 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8931b8acef0b..c8f4719164e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = autokey
pkgdesc = A desktop automation utility for Linux and X11
pkgver = 0.96.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/autokey/autokey
arch = any
license = GPL3
@@ -35,7 +35,6 @@ pkgname = autokey-gtk
depends = libnotify
depends = zenity
optdepends = python-atspi
- conflicts = autokey-qt
pkgname = autokey-qt
pkgdesc = A desktop automation utility for Linux and X11 - Qt frontend
@@ -45,4 +44,3 @@ pkgname = autokey-qt
depends = qt5-svg
depends = kdialog
optdepends = qt-at-spi
- conflicts = autokey-gtk
diff --git a/PKGBUILD b/PKGBUILD
index a127b26b33ea..5eb56b9346e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=('autokey-common' 'autokey-gtk' 'autokey-qt')
pkgbase=autokey
pkgver=0.96.0
-pkgrel=1
+pkgrel=2
pkgdesc="A desktop automation utility for Linux and X11"
arch=('any')
url="https://github.com/autokey/autokey"
@@ -49,7 +49,6 @@ package_autokey-gtk() {
depends=('autokey-common' 'python-gobject' 'gtksourceview3' 'libappindicator-gtk3'
'libnotify' 'zenity')
optdepends=('python-atspi')
- conflicts=("$pkgbase-qt")
cd "$pkgbase-$pkgver"
python -m installer --destdir="$pkgdir" dist/*.whl
@@ -73,7 +72,6 @@ package_autokey-qt() {
pkgdesc+=" - Qt frontend"
depends=('autokey-common' 'python-pyqt5' 'python-qscintilla-qt5' 'qt5-svg' 'kdialog')
optdepends=('qt-at-spi')
- conflicts=("$pkgbase-gtk")
cd "$pkgbase-$pkgver"
python -m installer --destdir="$pkgdir" dist/*.whl