From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Date: Tue, 25 Aug 2009 11:39:19 +0000 (+0200)
Subject: openssh: make openssh-keygen conflict with ssh-keygen (old name of it)
X-Git-Tag: Release-2010-05/1~2614^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d516d8ef61a6769e7391fb27ff43ff622517e68;p=openembedded.git

openssh: make openssh-keygen conflict with ssh-keygen (old name of it)

Should fix situation after e05310f4958ba6c73488d398325670704401ee70 commit.

Before:

 * Package openssh-keygen wants to install file /usr/bin/ssh-keygen
        But that file is already provided by package  * ssh-keygen

After:

 * ERROR: The following packages conflict with openssh-keygen:
         *  ssh-keygen *
---

diff --git a/recipes/openssh/openssh.inc b/recipes/openssh/openssh.inc
index 086c9015ad..9e4ca1467e 100644
--- a/recipes/openssh/openssh.inc
+++ b/recipes/openssh/openssh.inc
@@ -2,6 +2,7 @@ DEPENDS = "zlib openssl"
 
 RCONFLICTS_${PN} = "dropbear"
 RCONFLICTS_${PN}-sshd = "dropbear"
+RCONFLICTS_${PN}-keygen = "ssh-keygen"
 
 SECTION = "console/network"
 DESCRIPTION = "Secure rlogin/rsh/rcp/telnet replacement (OpenSSH) \
@@ -15,7 +16,7 @@ used to provide applications with a secure communication channel."
 HOMEPAGE = "http://www.openssh.org/"
 LICENSE = "BSD"
 
-INC_PR = "r7"
+INC_PR = "r8"
 
 inherit autotools