Split pki and scepclient to new packages

  - create new strongswan-pki and strongswan-scepclient packages
* debian/strongswan-pki.install:
  - install pki files
* debian/strongswan-scepclient.install:
  - install scepclient files

6 files changed, 53 insertions, 21 deletions

diff --git a/debian/changelog b/debian/changelog
index cb88fcdef..c372a5f8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,10 +7,15 @@ strongswan (5.3.5-2) UNRELEASED; urgency=medium
     - drop strongswan-dbg package.
     - add strongswan-swanctl and charon-systemd packages.
     - replace sytemd build-dep by libsystemd-dev.
+    - create new strongswan-pki and strongswan-scepclient packages
   * debian/strongswan-swanctl.install:
     - install vici plugin and swanctl files
   * debian/charon-systemd.install:
     - install charon-systemd binary and strongswan-swanctl service file.
+  * debian/strongswan-pki.install:
+    - install pki files
+  * debian/strongswan-scepclient.install:
+    - install scepclient files
 
  -- Yves-Alexis Perez <corsac@debian.org>  Mon, 11 Jan 2016 14:50:14 +0100
 
diff --git a/debian/control b/debian/control
index f5da534aa..68c0390c7 100644
--- a/debian/control
+++ b/debian/control
@@ -270,6 +270,30 @@ Description: standalone IPsec client
  This package contains the charon-cmd command, which can be used as a client to
  connect to a remote IKE daemon.
 
+Package: strongswan-pki
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version})
+Breaks: strongswan-starter (<< 5.3.5-2)
+Replaces: strongswan-starter (<< 5.3.5-2)
+Description: strongSwan IPsec client, pki command
+ 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 pki tool which allows on to run a simple public key
+ infrastructure.
+
+Package: strongswan-scepclient
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version})
+Breaks: strongswan-starter (<< 5.3.5-2)
+Replaces: strongswan-starter (<< 5.3.5-2)
+Description: strongSwan IPsec client, SCEP 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 SCEP client, an implementation of the Cisco System's
+ Simple Certificate Enrollment Protocol (SCEP).
+
 Package: strongswan-swanctl
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version})
diff --git a/debian/strongswan-pki.install b/debian/strongswan-pki.install
new file mode 100644
index 000000000..7cccf5241
--- /dev/null
+++ b/debian/strongswan-pki.install
@@ -0,0 +1,16 @@
+usr/bin/pki
+usr/share/man/man1/pki---acert.1
+usr/share/man/man1/pki---dn.1
+usr/share/man/man1/pki---gen.1
+usr/share/man/man1/pki---issue.1
+usr/share/man/man1/pki---keyid.1
+usr/share/man/man1/pki---pkcs7.1
+usr/share/man/man1/pki---print.1
+usr/share/man/man1/pki---pub.1
+usr/share/man/man1/pki---req.1
+usr/share/man/man1/pki---self.1
+usr/share/man/man1/pki---signcrl.1
+usr/share/man/man1/pki---verify.1
+usr/share/man/man1/pki.1
+usr/share/strongswan/templates/config/strongswan.d/pki.conf
+etc/strongswan.d/pki.conf
diff --git a/debian/strongswan-pki.lintian-overrides b/debian/strongswan-pki.lintian-overrides
new file mode 100644
index 000000000..444d88b26
--- /dev/null
+++ b/debian/strongswan-pki.lintian-overrides
@@ -0,0 +1,4 @@
+# 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
+strongswan-pki: binary-or-shlib-defines-rpath usr/bin/pki /usr/lib/ipsec
diff --git a/debian/strongswan-scepclient.install b/debian/strongswan-scepclient.install
new file mode 100644
index 000000000..e04bc65d0
--- /dev/null
+++ b/debian/strongswan-scepclient.install
@@ -0,0 +1,4 @@
+usr/lib/ipsec/scepclient
+usr/share/man/man8/scepclient.8
+usr/share/strongswan/templates/config/strongswan.d/scepclient.conf
+etc/strongswan.d/scepclient.conf
diff --git a/debian/strongswan-starter.install b/debian/strongswan-starter.install
index 393098499..b6f4071bf 100644
--- a/debian/strongswan-starter.install
+++ b/debian/strongswan-starter.install
@@ -15,27 +15,6 @@ usr/lib/ipsec/plugins/libstrongswan-updown.so
 usr/share/strongswan/templates/config/plugins/updown.conf
 etc/strongswan.d/charon/updown.conf
 usr/lib/ipsec/_updown
-#tools
-usr/bin/pki
-usr/lib/ipsec/scepclient
-usr/share/man/man8/scepclient.8
-usr/share/man/man1/pki---acert.1
-usr/share/man/man1/pki---dn.1
-usr/share/man/man1/pki---gen.1
-usr/share/man/man1/pki---issue.1
-usr/share/man/man1/pki---keyid.1
-usr/share/man/man1/pki---pkcs7.1
-usr/share/man/man1/pki---print.1
-usr/share/man/man1/pki---pub.1
-usr/share/man/man1/pki---req.1
-usr/share/man/man1/pki---self.1
-usr/share/man/man1/pki---signcrl.1
-usr/share/man/man1/pki---verify.1
-usr/share/man/man1/pki.1
-usr/share/strongswan/templates/config/strongswan.d/pki.conf
-usr/share/strongswan/templates/config/strongswan.d/scepclient.conf
-etc/strongswan.d/pki.conf
-etc/strongswan.d/scepclient.conf
 #stroke
 usr/lib/ipsec/stroke
 usr/lib/ipsec/plugins/libstrongswan-stroke.so