[Pkg-swan-devel] [strongswan] 01/03: Merge branch 'split-plugins'

[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 a3443538062c7bf1aa8ba08689bfe0edc720002f
Merge: efdf711 ddb97d9
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Tue Mar 4 21:56:06 2014 +0100

    Merge branch 'split-plugins'
    
    Conflicts:
    	debian/changelog

 debian/NEWS                                   |  17 +++
 debian/changelog                              |  17 +++
 debian/charon-cmd.install                     |   2 +
 debian/charon-cmd.lintian-overrides           |   3 +
 debian/control                                | 195 +++++++++++++++++++++++---
 debian/libcharon-extra-plugins.install        |  26 ++++
 debian/libstrongswan-extra-plugins.install    |   9 ++
 debian/libstrongswan-standard-plugins.install |   4 +
 debian/libstrongswan.install                  |  60 +++-----
 debian/rules                                  |  12 +-
 debian/strongswan-charon.install              |   1 +
 debian/strongswan-ike.install                 |  15 --
 debian/strongswan-ike.lintian-overrides       |   3 -
 debian/strongswan-libcharon.install           |   2 +
 debian/strongswan-starter.install             |   1 -
 15 files changed, 281 insertions(+), 86 deletions(-)

diff --cc debian/changelog
index 0e314dd,84207fc..1a434cf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,20 +1,29 @@@
+ strongswan (5.1.1-2+splitplugins) experimental; urgency=medium
+ 
+   * debian/control:
+     - 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.
+     - 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
+     charon-cmd rpath.
+ 
+  -- Yves-Alexis Perez <corsac at debian.org>  Mon, 24 Feb 2014 10:42:49 +0100
+ 
 +strongswan (5.1.1-2) unstable; urgency=medium
 +
 +  * debian/control:
 +    - drop dependency on host, inherited from openSwan.         closes: #736661
 +  * debian/po:
 +    - sv.po updated, thanks Martin Bagge.                       closes: #725667
 +
 + -- Yves-Alexis Perez <corsac at debian.org>  Mon, 24 Feb 2014 10:32:12 +0100
 +
  strongswan (5.1.1-1) unstable; urgency=low
  
    [ Yves-Alexis Perez ]

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