summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorElis Axelsson2015-12-15 16:01:36 +0100
committerElis Axelsson2015-12-15 16:01:36 +0100
commitcb8d730caa6d71e58ba2f05f7e1e23ac8ae6650b (patch)
tree16010a86770696386f11ba4981b3b65df7fd598a
parent7ce91b4de6ee46298b9e2b38ca5f1273a51f533a (diff)
downloadaur-cb8d730caa6d71e58ba2f05f7e1e23ac8ae6650b.tar.gz
Added conflict to st
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c08c433b8d84..bd6a4315cb4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,6 +10,7 @@ pkgbase = stupidterm-git
license = LGPL
depends = vte3
conflicts = stupidterm
+ conflicts = st
source = stupidterm::git+https://github.com/esmil/stupidterm.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 3f21a73dc2c5..4cb6cd0cca5a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ arch=("i686" "x86_64" "armv5tel" "armv7l")
url="https://github.com/esmil/stupidterm"
license=("LGPL")
depends=("vte3")
-conflicts=("stupidterm")
+conflicts=("stupidterm" "st")
source=("${_pkgname}::git+https://github.com/esmil/stupidterm.git")
md5sums=('SKIP')