6 files changed, 47 insertions, 25 deletions
diff --git a/debian/changelog b/debian/changelog
index 68a5c955c..f04b7521a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,10 @@ strongswan (5.1.1-2) UNRELEASED; urgency=medium
     - drop dependency on host, inherited from openSwan.         closes: #736661
     - split charon-cmd to a standalone package.
     - add new plugins packages: libstrongswan-standard-plugins,
-      libstrongswan-extra-plugins and libcharon-extra-plugins.
+    libstrongswan-extra-plugins and libcharon-extra-plugins.
+    - split strongswan-ike package to strongswan-libcharon (libcharon and
+    default libcharon plugins) and strongswan-charon (charon daemon), keep
+    strongswan-ike as transitional package for now.
   * debian/po:
     - sv.po updated, thanks Martin Bagge.                       closes: #725667
   * debian/charon-cmd.lintian-overrides: override lintian error about
diff --git a/debian/control b/debian/control
index e7bacbdfe..072a08652 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,7 @@ Homepage: http://www.strongswan.org
 
 Package: strongswan
 Architecture: all
-Depends: ${misc:Depends}, strongswan-ike
-Suggests: network-manager-strongswan
+Depends: ${misc:Depends}, strongswan-charon, strongswan-starter
 Description: IPsec VPN solution metapackage
  The strongSwan VPN suite uses the native IPsec stack in the standard Linux
  kernel. It supports both the IKEv1 and IKEv2 protocols.
@@ -174,9 +173,9 @@ Description: strongSwan library and binaries - debugging symbols
 
 Package: strongswan-starter
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, 
-  libstrongswan (= ${binary:Version}), strongswan-ike,
-  adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (=
+ ${binary:Version}), adduser
+Recommends: strongswan-charon
 Conflicts: strongswan (<< 4.2.12-1)
 Description: strongSwan daemon starter and configuration file parser
  The strongSwan VPN suite uses the native IPsec stack in the standard
@@ -186,28 +185,51 @@ Description: strongSwan daemon starter and configuration file parser
  the command line. It parses ipsec.conf and loads the configurations to the
  daemon.
 
-Package: strongswan-ike
+Package: strongswan-libcharon
 Architecture: any
-Pre-Depends: debconf | debconf-2.0
-Depends: ${shlibs:Depends}, ${misc:Depends}, 
-  libstrongswan (= ${binary:Version}), strongswan-starter | strongswan-nm,
-  bsdmainutils, debianutils (>=1.7), ipsec-tools, iproute [linux-any]
+Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version})
 Suggests: libcharon-extra-plugins
-Provides: ike-server
-Conflicts: freeswan (<< 2.04-12), openswan, strongswan (<< 4.2.12-1)
 Breaks: libstrongswan (<= 5.1.1-1)
-Replaces: strongswan-ikev1, strongswan-ikev2, libstrongswan (<= 5.1.1-1)
-Description: strongSwan Internet Key Exchange (v2) daemon
+Replaces: strongswan-ike, libstrongswan (<= 5.1.1-1)
+Description: strongSwan charon library
+ The strongSwan VPN suite uses the native IPsec stack in the standard
+ Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
+ .
+ This package contains the charon library, used by IKE client like
+ strongswan-charon, strongswan-charon-cmd or strongswan-nm
+
+Package: strongswan-charon
+Architecture: any
+Pre-Depends: debconf | debconf-2.0
+Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version}),
+ strongswan-starter
+Provides: ike-server
+Breaks: libstrongswan (<= 5.1.1-1), strongswan-ike (<= 5.1.1-1)
+Replaces: strongswan-ikev1, strongswan-ikev2, libstrongswan (<= 5.1.1-1), strongswan-ike (<= 5.1.1-1)
+Description: strongSwan Internet Key Exchange daemon
  The strongSwan VPN suite uses the native IPsec stack in the standard
  Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
  .
- charon is an IPsec IKEv2 daemon. It is written from scratch using a fully
- multi-threaded design and a modular architecture. Various plugins can provide
- additional functionality.
+ charon is an IPsec IKEv2 daemon which can act as an initiator or a responder.
+ It is written from scratch using a fully multi-threaded design and a modular
+ architecture. Various plugins can provide additional functionality.
+
+Package: strongswan-ike
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, strongswan-charon
+Description: strongSwan Internet Key Exchange daemon (transitional package)
+ The strongSwan VPN suite uses the native IPsec stack in the standard
+ Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
+ .
+ This package used to install version 5 of the charon daemon and has been
+ replaced by the strongswan-charon package. This package can be safely removed
+ once it's installed.
 
 Package: strongswan-nm
 Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, strongswan-ike
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: network-manager-strongswan
 Description: strongSwan plugin to interact with NetworkManager
  The strongSwan VPN suite uses the native IPsec stack in the standard
diff --git a/debian/strongswan-charon.install b/debian/strongswan-charon.install
new file mode 100644
index 000000000..761aea544
--- /dev/null
+++ b/debian/strongswan-charon.install
@@ -0,0 +1 @@
+usr/lib/ipsec/charon
diff --git a/debian/strongswan-ike.install b/debian/strongswan-ike.install
deleted file mode 100644
index 6c1185f83..000000000
--- a/debian/strongswan-ike.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/ipsec/libcharon.so*
-usr/lib/ipsec/charon
-usr/lib/ipsec/plugins/libstrongswan-socket*.so
diff --git a/debian/strongswan-ike.lintian-overrides b/debian/strongswan-ike.lintian-overrides
deleted file mode 100644
index 90f644f8f..000000000
--- a/debian/strongswan-ike.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# we do pass hardening flags
-strongswan-ike: hardening-no-fortify-functions usr/lib/ipsec/plugins/libstrongswan-agent.so
-strongswan-ike: hardening-no-fortify-functions usr/lib/ipsec/plugins/libstrongswan-socket-raw.so
diff --git a/debian/strongswan-libcharon.install b/debian/strongswan-libcharon.install
new file mode 100644
index 000000000..084db38eb
--- /dev/null
+++ b/debian/strongswan-libcharon.install
@@ -0,0 +1,2 @@
+usr/lib/ipsec/libcharon*
+usr/lib/ipsec/plugins/libstrongswan-socket-default.so