Merge remote-tracking branch 'origin/master'

2 files changed, 4 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6b9622122b9c..221f8b02b692 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,6 +6,8 @@ pkgbase = armake-git
 	arch = i686
 	arch = x86_64
 	license = GPL2
+	depends = openssl
+	conflicts = armake
 	source = git+https://github.com/KoffeinFlummi/armake.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 78fb6d160cb0..2b39fea3a898 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,9 @@ pkgdesc="An open-source implementation of the Arma modding tools."
 arch=('i686' 'x86_64')
 url="https://github.com/KoffeinFlummi/armake"
 license=('GPL2')
-depends=()
+depends=('openssl')
 optdepends=()
+conflicts=('armake')
 source=("git+https://github.com/KoffeinFlummi/armake.git")
 sha256sums=('SKIP')