summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Bellino2018-03-13 20:59:02 +0100
committerCarlos Bellino2018-03-13 20:59:02 +0100
commitc43a0b7fb9ba2a6d56a7597a85ad7d4c6b00cbb6 (patch)
tree411fcacde8af8e5ca3b62fd4df3096dc5f7a7b44
parent7c0229711b0d312f58658d8af9d10b28f1942dc9 (diff)
downloadaur-c43a0b7fb9ba2a6d56a7597a85ad7d4c6b00cbb6.tar.gz
conflict list updated
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 783f13605cd7..23f2d2ec9281 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,6 +11,7 @@ pkgbase = logmein-hamachi-beta
license = custom
depends = glibc>=2.26
conflicts = hamachi
+ conflicts = logmein-hamachi
replaces = hamachi
options = !strip
source = systemd
diff --git a/PKGBUILD b/PKGBUILD
index 8af65032cae9..14ea9c4291ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ pkgdesc="A zero-configuration VPN service"
url="https://www.vpn.net/linux"
arch=("i686" "x86_64" "arm" "armv6h" "armv7h")
license=("custom")
-conflicts=("hamachi")
+conflicts=("hamachi" "logmein-hamachi")
replaces=("hamachi")
options=("!strip")
depends=('glibc>=2.26')