summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorElis Axelsson2015-12-15 14:50:27 +0100
committerElis Axelsson2015-12-15 14:50:27 +0100
commit7ce91b4de6ee46298b9e2b38ca5f1273a51f533a (patch)
tree83cc9e45d90b3b1fa83f3f637a1f9ce82c0442ad
parenteb23d929f07aa56784f90bd57c75c840b2178295 (diff)
downloadaur-7ce91b4de6ee46298b9e2b38ca5f1273a51f533a.tar.gz
Conflict added
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD3
2 files changed, 2 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 142ca0e2fe82..c08c433b8d84 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,6 +9,7 @@ pkgbase = stupidterm-git
arch = armv7l
license = LGPL
depends = vte3
+ conflicts = stupidterm
source = stupidterm::git+https://github.com/esmil/stupidterm.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index fac97bd344df..3f21a73dc2c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,6 +10,7 @@ arch=("i686" "x86_64" "armv5tel" "armv7l")
url="https://github.com/esmil/stupidterm"
license=("LGPL")
depends=("vte3")
+conflicts=("stupidterm")
source=("${_pkgname}::git+https://github.com/esmil/stupidterm.git")
md5sums=('SKIP')
@@ -30,5 +31,3 @@ package() {
make DESTDIR="${pkgdir}" prefix=/usr install
}
-
-# vim:set ts=2 sw=2 et: