split charon-cmd to a standalone package.

5 files changed, 20 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 428912ecb..597c60640 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ strongswan (5.1.1-2) UNRELEASED; urgency=medium
 
   * debian/control:
     - drop dependency on host, inherited from openSwan.         closes: #736661
+    - split charon-cmd to a standalone package.
   * debian/po:
     - sv.po updated, thanks Martin Bagge.                       closes: #725667
+  * debian/charon-cmd.lintian-overrides: override lintian error about
+    charon-cmd rpath.
 
  -- Yves-Alexis Perez <corsac@debian.org>  Sun, 26 Jan 2014 10:33:42 +0100
 
diff --git a/debian/charon-cmd.install b/debian/charon-cmd.install
new file mode 100644
index 000000000..1db15271f
--- /dev/null
+++ b/debian/charon-cmd.install
@@ -0,0 +1,2 @@
+usr/sbin/charon-cmd
+usr/share/man/man8/charon-cmd.8
diff --git a/debian/charon-cmd.lintian-overrides b/debian/charon-cmd.lintian-overrides
new file mode 100644
index 000000000..26be392ba
--- /dev/null
+++ b/debian/charon-cmd.lintian-overrides
@@ -0,0 +1,3 @@
+# strongswan libraries are installed in /usr/lib/ipsec because they are private
+# to the strongSwan project. We still want to split multiple binaries from the lib
+charon-cmd: binary-or-shlib-defines-rpath usr/sbin/charon-cmd /usr/lib/ipsec
diff --git a/debian/control b/debian/control
index af9b60ca8..2d590ce2a 100644
--- a/debian/control
+++ b/debian/control
@@ -122,3 +122,15 @@ Description: strongSwan IKEv2 daemon, transitional package
  This package used to install the charon daemon, implementing the IKEv2
  protocol. It has been replaced the strongswan-ike package, so it can be safely
  removed.
+
+Package: charon-cmd
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version})
+Breaks: strongswan-ike (<= 5.1.1-1)
+Replaces: strongswan-ike (<= 5.1.1-1)
+Description: standalone IPsec client
+ 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-cmd command, which can be used as a client to
+ connect to a remote IKE daemon.
diff --git a/debian/strongswan-ike.install b/debian/strongswan-ike.install
index 2b94a3c18..e00deaa94 100644
--- a/debian/strongswan-ike.install
+++ b/debian/strongswan-ike.install
@@ -1,5 +1,3 @@
-usr/sbin/charon-cmd
-usr/share/man/man8/charon-cmd.8
 usr/lib/ipsec/libcharon.so*
 usr/lib/ipsec/charon
 usr/lib/ipsec/lookip