From 7430429b61f0108296a37acc9e0245cda98fce7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 14 Apr 2020 02:05:15 +0200 Subject: Add symlinks for plugins into /usr/lib/openvpn/; Switch to debhelper-compat; Refresh d/copyright --- debian/changelog | 9 ++++++++- debian/compat | 1 - debian/control | 2 +- debian/copyright | 4 ++-- debian/dirs | 1 + debian/rules | 5 +++++ 6 files changed, 17 insertions(+), 5 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index 0db2e0b..f60ddf1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,16 @@ openvpn (2.4.8-1) UNRELEASED; urgency=medium [ Jörg Frings-Fürst ] * New upstream release (Closes: #950610). * Refresh debian/patches/openvpn-pkcs11warn.patch. - * Remove upstream applied fix-pkcs11-helper-hang.patch. + * Remove upstream applied fix-pkcs11-helper-hang.patch. * Add libp11-kit-dev to Build - Depends (Closes: #940727). + * Add symlinks for plugins into /usr/lib/openvpn/ (Closes: #946348). * Declare compliance with Debian Policy 4.5.0 (No changes needed). + * Switch to debhelper-compat: + - debian/control: change to debhelper-compat (=12). + - remove debian/compat. + * debian/copyright: + - Add year 2020 to debian/*. + - Add year 2019 to *. -- Jörg Frings-Fürst Fri, 10 Apr 2020 23:10:22 +0200 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b4de394..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -11 diff --git a/debian/control b/debian/control index 47b2ad2..d6f1cd7 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Bernhard Schmidt Uploaders: Jörg Frings-Fürst Build-Depends: - debhelper (>= 11), + debhelper-compat (= 12), dpkg-dev (>= 1.16.1), iproute2 [linux-any], liblz4-dev, diff --git a/debian/copyright b/debian/copyright index a87a863..62b0be7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream-Contact: OpenVPN Solutions LLC Source: https://openvpn.net/ Files: * -Copyright: 2002-2018 OpenVPN Inc +Copyright: 2002-2019 OpenVPN Inc License: GPL-2 with OpenSSL exception Files: aclocal.m4 @@ -147,7 +147,7 @@ License: GPL-2+ Files: debian/* Copyright: 2002-2017 Alberto Gonzalez Iniesta 2017-2018 Bernhard Schmidt - 2017-2018 Jörg Frings-Fürst + 2017-2020 Jörg Frings-Fürst License: GPL-3+ License: BSD-2 diff --git a/debian/dirs b/debian/dirs index 2823844..97959bf 100644 --- a/debian/dirs +++ b/debian/dirs @@ -10,3 +10,4 @@ usr/share/doc/openvpn usr/share/openvpn usr/include/openvpn var/log/openvpn +usr/lib/openvpn/ diff --git a/debian/rules b/debian/rules index 7bec9d2..6ca9f5f 100755 --- a/debian/rules +++ b/debian/rules @@ -63,6 +63,11 @@ ifeq ($(DEB_HOST_ARCH_OS), linux) endif $(RM) $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/COPYING +override_dh_link: + dh_link usr/lib/$(DEB_HOST_GNU_TYPE)/openvpn/plugins/openvpn-plugin-auth-pam.so usr/lib/openvpn/openvpn-plugin-auth-pam.so + dh_link usr/lib/$(DEB_HOST_GNU_TYPE)/openvpn/plugins/openvpn-plugin-down-root.so usr/lib/openvpn/openvpn-plugin-down-root.so + dh_link + override_dh_installexamples: dh_installexamples ## remove windoze stuff -- cgit v1.2.3