From cc0e37e6d3337c3201e48e30ac2673194a9d662d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Sun, 25 Oct 2015 14:44:20 +0100
Subject: main/dropbear: make scp subpackage conflict with openssh-client

---
 main/dropbear/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'main/dropbear')

diff --git a/main/dropbear/APKBUILD b/main/dropbear/APKBUILD
index bbbff79941..281a97b4d1 100644
--- a/main/dropbear/APKBUILD
+++ b/main/dropbear/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dropbear
 pkgver=2015.68
-pkgrel=1
+pkgrel=2
 pkgdesc="small SSH 2 client/server designed for small memory environments"
 url="http://matt.ucc.asn.au/dropbear/dropbear.html"
 arch="all"
@@ -63,7 +63,7 @@ package() {
 
 _scp() {
 	pkgdesc="Dropbear scp support"
-	depends="dropbear"
+	depends="dropbear !openssh-client"
 	arch="noarch"
 	mkdir -p "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/scp "$subpkgdir"/usr/bin/
-- 
cgit v1.2.3