diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 7f9aedaa0..fcd38452e 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@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 d0efb0e17..119ff8ace 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. |