[Pkg-swan-devel] [strongswan] 02/02: Install systemd file from debian/rules

[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 e87aaff64a969a6ee3d2e682ee7480cfee123e4d
Author: Romain Francoise <rfrancoise at debian.org>
Date:   Mon Jul 28 22:53:38 2014 +0200

    Install systemd file from debian/rules
    
    It gets generated only on Linux, so install it from debian/rules with
    the rest of the arch-specific files.
---
 debian/rules                      | 5 ++++-
 debian/strongswan-starter.install | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 8af4d3d..3fa0d26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -111,6 +111,8 @@ ifeq ($(DEB_BUILD_ARCH_OS),linux)
 	dh_install -p libstrongswan-extra-plugins usr/lib/ipsec/plugins/libstrongswan-af-alg.so
 	dh_install -p libstrongswan-extra-plugins usr/share/strongswan/templates/config/plugins/af-alg.conf
 	dh_install -p libstrongswan-extra-plugins etc/strongswan.d/charon/af-alg.conf
+	# the systemd service file only gets generated on Linux
+	dh_install -p strongswan-starter lib/systemd/system/strongswan.service
 endif
 
 ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
@@ -150,7 +152,8 @@ endif
 		-Xlibstrongswan-farp.so -X farp.conf \
 		-Xlibstrongswan-padlock.so -X padlock.conf \
 		-Xlibstrongswan-rdrand.so -X rdrand.conf \
-		-Xlibstrongswan-af-alg.so -X af-alg.conf
+		-Xlibstrongswan-af-alg.so -X af-alg.conf \
+		-Xstrongswan.service
 
 	# add additional files not covered by upstream makefile...
 	install --mode=0600 $(CURDIR)/debian/ipsec.secrets.proto $(CURDIR)/debian/strongswan-starter/etc/ipsec.secrets
diff --git a/debian/strongswan-starter.install b/debian/strongswan-starter.install
index ee8c8ec..5d765ee 100644
--- a/debian/strongswan-starter.install
+++ b/debian/strongswan-starter.install
@@ -10,7 +10,6 @@ usr/share/man/man8/ipsec.8
 usr/share/man/man5/ipsec.conf.5
 usr/share/man/man5/ipsec.secrets.5
 usr/share/man/man5/strongswan.conf.5
-lib/systemd/system/strongswan.service
 #updown
 usr/lib/ipsec/plugins/libstrongswan-updown.so
 usr/share/strongswan/templates/config/plugins/updown.conf

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