[Pkg-swan-devel] [strongswan] 01/02: move counters plugin from -starter to -libcharon. closes: #882431

[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 e89f35cc01d439b9307e6d87dae3f9b918c370a1
Author: Yves-Alexis Perez <corsac at corsac.net>
Date:   Thu Nov 23 13:37:38 2017 +0100

    move counters plugin from -starter to -libcharon. closes: #882431
---
 debian/control                      | 7 ++++++-
 debian/strongswan-libcharon.install | 6 ++++++
 debian/strongswan-starter.install   | 4 ----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index a351836..7c9847b 100644
--- a/debian/control
+++ b/debian/control
@@ -214,13 +214,18 @@ Architecture: any
 Depends: libstrongswan (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
+Breaks: strongswan-starter (<= 5.6.1-1)
+Replaces: strongswan-starter (<= 5.6.1-1)
 Suggests: libcharon-extra-plugins
 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
+ strongswan-charon, strongswan-charon-cmd or strongswan-nm as well as standard
+ plugins:
+   - socket-default
+   - counters
 
 Package: strongswan-charon
 Architecture: any
diff --git a/debian/strongswan-libcharon.install b/debian/strongswan-libcharon.install
index 15d63ed..9227945 100644
--- a/debian/strongswan-libcharon.install
+++ b/debian/strongswan-libcharon.install
@@ -1,4 +1,10 @@
 usr/lib/ipsec/libcharon*
+## libcharon plugins
+# socket-default
 usr/lib/ipsec/plugins/libstrongswan-socket-default.so
 usr/share/strongswan/templates/config/plugins/socket-default.conf
 etc/strongswan.d/charon/socket-default.conf
+# counters
+usr/lib/ipsec/plugins/libstrongswan-counters.so
+usr/share/strongswan/templates/config/plugins/counters.conf
+etc/strongswan.d/charon/counters.conf
diff --git a/debian/strongswan-starter.install b/debian/strongswan-starter.install
index 7eebe6b..7b02b0a 100644
--- a/debian/strongswan-starter.install
+++ b/debian/strongswan-starter.install
@@ -21,7 +21,3 @@ usr/lib/ipsec/plugins/libstrongswan-stroke.so
 usr/share/strongswan/templates/config/plugins/stroke.conf
 etc/strongswan.d/charon/stroke.conf
 debian/usr.lib.ipsec.stroke /etc/apparmor.d/
-#counters
-usr/lib/ipsec/plugins/libstrongswan-counters.so
-usr/share/strongswan/templates/config/plugins/counters.conf
-etc/strongswan.d/charon/counters.conf

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