[Pkg-swan-devel] [strongswan] 01/12: Conflicts against openSwan

[Yves-Alexis Perez]

This is an automated email from the git hooks/post-receive script.

corsac pushed a commit to branch master
in repository strongswan.

commit 4eb894c612261cae409a248eef0535a4fa9a9e8f
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Wed Mar 5 09:57:08 2014 +0100

    Conflicts against openSwan
    
    * debian/control:
      - add conflicts against openSwan.                           closes: #740808
---
 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7f9aeda..fcd3845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+strongswan (5.1.1-4) UNRELEASED; urgency=medium
+
+  * debian/control:
+    - add conflicts against openSwan.                           closes: #740808
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 05 Mar 2014 09:51:11 +0100
+
 strongswan (5.1.1-3) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index d0efb0e..119ff8a 100644
--- a/debian/control
+++ b/debian/control
@@ -176,7 +176,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (=
  ${binary:Version}), adduser
 Recommends: strongswan-charon
-Conflicts: strongswan (<< 4.2.12-1)
+Conflicts: strongswan (<< 4.2.12-1), openswan
 Description: strongSwan daemon starter and configuration file parser
  The strongSwan VPN suite uses the native IPsec stack in the standard
  Linux kernel. It supports both the IKEv1 and IKEv2 protocols.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-swan/strongswan.git