[Pkg-swan-devel] [strongswan] 01/02: Merge tag 'v5.2.0-2' into strongswan-wheezy-backports

[Romain Francoise]

This is an automated email from the git hooks/post-receive script.

rfrancoise pushed a commit to branch strongswan-wheezy-backports
in repository strongswan.

commit a2743eefd99d434de320b3ab5be51f533b7a4e96
Merge: 1f917b4 de97d21
Author: Romain Francoise <rfrancoise at debian.org>
Date:   Tue Aug 5 22:01:35 2014 +0200

    Merge tag 'v5.2.0-2' into strongswan-wheezy-backports
    
    Debian release 5.2.0-2
    
    * tag 'v5.2.0-2':
      Upload to unstable
      Install systemd file from debian/rules
      Revert "Don't rely on pkg-config based systemd detection"
      Use After=network.target
      Don't rely on pkg-config based systemd detection
      Initial systemd integration
      Remove disabled debian/patches/03_include-stdint.patch

 debian/changelog                        | 16 ++++++++++++++++
 debian/control                          |  4 ++--
 debian/patches/03_include-stdint.patch  | 12 ------------
 debian/patches/03_systemd-service.patch | 16 ++++++++++++++++
 debian/patches/series                   |  1 +
 debian/rules                            |  7 +++++--
 6 files changed, 40 insertions(+), 16 deletions(-)

diff --cc debian/changelog
index 86c7dee,0d8f57c..7c7a188
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,25 @@@
+ strongswan (5.2.0-2) unstable; urgency=medium
+ 
+   * Add systemd integration:
+     + Install upstream systemd service file in strongswan-starter.
+     + Alias strongswan.service to ipsec.service to match the sysv init script.
+     + Drop After=syslog.target (as syslog is socket-activated nowadays), but
+       add After=network.target to ensure that charon gets the chance to send
+       deletes on exit.
+     + Add ExecReload for reload action, since the starter script has one.
+     + On linux-any, add build-dep on systemd to ensure that the pkg-config
+       metadata file can be found.
+     + Add build-dep on dh-systemd, and use systemd dh addon.
+   * Remove debian/patches/03_include-stdint.patch.
+ 
+  -- Romain Francoise <rfrancoise at debian.org>  Wed, 30 Jul 2014 21:37:53 +0200
+ 
 +strongswan (5.2.0-1~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- Romain Francoise <rfrancoise at debian.org>  Tue, 22 Jul 2014 20:10:55 +0200
 +
  strongswan (5.2.0-1) unstable; urgency=medium
  
    * New upstream release.

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