[Pkg-swan-devel] [strongswan] 01/02: Revert "Don't rely on pkg-config based systemd detection"

[Romain Francoise]

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

rfrancoise pushed a commit to branch master
in repository strongswan.

commit fd1e9f808bba47c62b40b51c0afc0bd5c2821835
Author: Romain Francoise <rfrancoise at debian.org>
Date:   Mon Jul 28 19:12:31 2014 +0200

    Revert "Don't rely on pkg-config based systemd detection"
    
    This reverts commit 6e408eb31340230d4c57da34aeab640098c78d1a.
    
    Conflicts:
    	debian/changelog
---
 debian/changelog | 5 +++--
 debian/control   | 3 ++-
 debian/rules     | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 951a814..70ae653 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,11 +7,12 @@ strongswan (5.2.0-2) UNRELEASED; urgency=medium
       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.
-    + Add --with-systemdsystemunitdir to configure options.
+    + 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>  Sat, 26 Jul 2014 17:54:05 +0200
+ -- Romain Francoise <rfrancoise at debian.org>  Fri, 25 Jul 2014 22:51:04 +0200
 
 strongswan (5.2.0-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 934db0f..ddf6905 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.2), libtool, libgmp3-dev,
   libfcgi-dev, clearsilver-dev, libgcrypt20-dev | libgcrypt11-dev,
   libxml2-dev, libsqlite3-dev, network-manager-dev (>= 0.7) [linux-any], 
   libnm-glib-vpn-dev (>= 0.7) [linux-any], libnm-util-dev (>= 0.7) [linux-any], 
-  gperf, libcap-dev [linux-any], dh-autoreconf, pkg-config, dh-systemd (>= 1.5)
+  gperf, libcap-dev [linux-any], dh-autoreconf, pkg-config,
+  systemd [linux-any], dh-systemd (>= 1.5)
 Homepage: http://www.strongswan.org
 
 Package: strongswan
diff --git a/debian/rules b/debian/rules
index 4472508..8af4d3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 CONFIGUREARGS := --libdir=/usr/lib --libexecdir=/usr/lib \
-		--with-systemdsystemunitdir=/lib/systemd/system \
 		--enable-ldap --enable-curl \
 		--enable-pkcs11 \
 		--enable-mediation --enable-medsrv --enable-medcli \

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