Enable openvpn.service on systemd. (Closes: #768411)

4 files changed, 17 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 453e133..a51dc57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+openvpn (2.3.4-4) unstable; urgency=medium
+
+  * Use dh-systemd in order to enable the service unit.
+    (Closes: #768411)
+  * Add comment on /etc/default/openvpn file about options
+    not supported on systemd. (Closes: #768384)
+
+ -- Alberto Gonzalez Iniesta <agi@inittab.org>  Fri, 07 Nov 2014 13:59:54 +0100
+
 openvpn (2.3.4-3) unstable; urgency=medium
 
   * Apply patch by Samuel Thibault to clean up temporary files.
diff --git a/debian/control b/debian/control
index 236c580..01a014a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openvpn
 Section: net
 Priority: optional
 Maintainer: Alberto Gonzalez Iniesta <agi@inittab.org>
-Build-Depends: debhelper (>= 7.0.50~), libssl-dev (>> 0.9.8g-9), liblzo2-dev, libpam0g-dev, libpkcs11-helper1-dev, pkg-config, dpkg-dev (>= 1.16.1), iproute2 [linux-any], net-tools [!linux-any]
+Build-Depends: debhelper (>= 7.0.50~), libssl-dev (>> 0.9.8g-9), liblzo2-dev, libpam0g-dev, libpkcs11-helper1-dev, pkg-config, dpkg-dev (>= 1.16.1), iproute2 [linux-any], net-tools [!linux-any], dh-systemd (>= 1.5)
 Standards-Version: 3.9.5
 Homepage: http://www.openvpn.net/
 Vcs-Git: git://anonscm.debian.org/collab-maint/openvpn.git
diff --git a/debian/default b/debian/default
index 0dfa6a1..e18e59d 100644
--- a/debian/default
+++ b/debian/default
@@ -16,6 +16,9 @@
 #AUTOSTART="none"
 #AUTOSTART="home office"
 #
+# WARNING: If you're running systemd the rest of the
+# options in this file are ignored.
+#
 # Refresh interval (in seconds) of default status files
 # located in /var/run/openvpn.$NAME.status
 # Defaults to 10, 0 disables status file generation
diff --git a/debian/rules b/debian/rules
index c5d982d..ba759c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ endif
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@
+	dh $@ --with systemd
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(shell dpkg-buildflags --export=configure) --enable-password-save --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --with-ifconfig-path=/sbin/ifconfig $(ROUTE_ARGS) --with-plugindir=\$${prefix}/lib/openvpn --includedir=\$${prefix}/include/openvpn --enable-pkcs11 --enable-x509-alt-username --enable-systemd
@@ -70,3 +70,6 @@ override_dh_installinit:
 override_dh_compress:
 	dh_compress --exclude=.cnf --exclude=pkitool
 
+override_dh_systemd_start:
+	dh_systemd_start --restart-after-upgrade
+