From f3fa5c538581b301f4db79a53cb707da6d2a07c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 29 Jul 2018 14:41:48 +0200 Subject: d/changelog, d/contol, d/rules: Remove trailing whitespaces --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 603d9a0..28c13e4 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) # Avoid the /sbin/route wrapper which doesn't provide FreeBSD CLI as expected ENV_VARS := IFCONFIG=/sbin/ifconfig ROUTE=/lib/freebsd/route -EXTRA_ARGS := +EXTRA_ARGS := else ENV_VARS := SYSTEMD_ASK_PASSWORD=/bin/systemd-ask-password IFCONFIG=/sbin/ifconfig ROUTE=/sbin/route IPROUTE=/sbin/ip SYSTEMD_UNIT_DIR=/lib/systemd/system TMPFILES_DIR=/usr/lib/tmpfiles.d EXTRA_ARGS := --enable-systemd --enable-iproute2 -- cgit v1.2.3 From b0bd4c813a92c6c430ab87028a53edf5c5b378b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 29 Jul 2018 14:52:15 +0200 Subject: d/changelog, d/contol, d/rules: Remove trailing whitespaces --- debian/rules | 1 - 1 file changed, 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 28c13e4..bb5c118 100755 --- a/debian/rules +++ b/debian/rules @@ -78,4 +78,3 @@ override_dh_compress: override_dh_systemd_start: dh_systemd_start --restart-after-upgrade - -- cgit v1.2.3 From 189300bebad43d737e63d245a4e8e2dad0a6e977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 29 Jul 2018 15:04:35 +0200 Subject: d/rules: Replace outdated dh_installsystemd with dh_systemd_start --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index bb5c118..a2e2395 100755 --- a/debian/rules +++ b/debian/rules @@ -76,5 +76,5 @@ override_dh_installinit: override_dh_compress: dh_compress --exclude=.cnf --exclude=pkitool -override_dh_systemd_start: - dh_systemd_start --restart-after-upgrade +override_dh_installsystemd: + dh_installsystemd --restart-after-upgrade -- cgit v1.2.3 From 880051903016a9118576e933bf99c33a4acb6c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 29 Jul 2018 22:21:33 +0200 Subject: New d/p/systemd.patch to remove obsolete syslog.target --- debian/rules | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index a2e2395..034bd7c 100755 --- a/debian/rules +++ b/debian/rules @@ -61,6 +61,7 @@ override_dh_auto_install: ifeq ($(DEB_HOST_ARCH_OS), linux) cat debian/openvpn.conf >> $(CURDIR)/debian/openvpn/usr/lib/tmpfiles.d/openvpn.conf endif + $(RM) $(CURDIR)/debian/openvpn/usr/share/doc/COPYING override_dh_installexamples: dh_installexamples -- cgit v1.2.3 From 1e99d905950ff0d23522d57349f6da5b5a8b3927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 29 Jul 2018 22:33:51 +0200 Subject: Remove usr/share/doc/openvpn/COPYING --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 034bd7c..ffb411f 100755 --- a/debian/rules +++ b/debian/rules @@ -61,7 +61,7 @@ override_dh_auto_install: ifeq ($(DEB_HOST_ARCH_OS), linux) cat debian/openvpn.conf >> $(CURDIR)/debian/openvpn/usr/lib/tmpfiles.d/openvpn.conf endif - $(RM) $(CURDIR)/debian/openvpn/usr/share/doc/COPYING + $(RM) $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/COPYING override_dh_installexamples: dh_installexamples -- cgit v1.2.3 From eebdf9ccc5be2000041f000ea453d1389fc3c078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 29 Jul 2018 22:49:25 +0200 Subject: d/rules: Replace rm -f with --- debian/rules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index ffb411f..7bec9d2 100755 --- a/debian/rules +++ b/debian/rules @@ -52,7 +52,7 @@ override_dh_auto_install: install -m 755 debian/openvpn.if-up.d $(CURDIR)/debian/openvpn/etc/network/if-up.d/openvpn install -m 755 debian/openvpn.if-down.d $(CURDIR)/debian/openvpn/etc/network/if-down.d/openvpn # remove unwanted plugin files - rm -f $(CURDIR)/debian/openvpn/usr/lib/$(DEB_HOST_GNU_TYPE)/openvpn/plugins/*.la + $(RM) $(CURDIR)/debian/openvpn/usr/lib/$(DEB_HOST_GNU_TYPE)/openvpn/plugins/*.la # resolvconf script install -m 755 debian/update-resolv-conf $(CURDIR)/debian/openvpn/etc/openvpn/update-resolv-conf # bash completion @@ -66,10 +66,10 @@ endif override_dh_installexamples: dh_installexamples ## remove windoze stuff - rm -rf $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/easy-rsa/Windows - rm -rf $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/sample + $(RM) -r $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/easy-rsa/Windows + $(RM) -r $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/sample # remove gitignore file from samples - rm -f $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/sample-keys/.gitignore + $(RM) $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/sample-keys/.gitignore override_dh_installinit: dh_installinit --no-start -- defaults 16 80 -- cgit v1.2.3