Source: openvpn Version: 2.6.7-1 Severity: normal Tags: patch trixie sid User: helm...@debian.org Usertags: dep17m2
We want to finalize the /usr-merge via DEP17 by moving all files to /usr. openvpn installs files into /lib; these should be moved into the respective canonical locations in /usr/. Please find a patch attached. It has been build-tested. This should not be backported to bookworm. If you intend to backport, please use dh_movetousr instead or defer the placement of the unit files to systemd.pc. If your package will change for the t64 transition or otherwise rename/split/move its binaries (packages) during trixie, please then upload to experimental and get in touch with the UsrMerge driver, please see the wiki [1]. Michael [1] https://wiki.debian.org/UsrMerge
diff -Nru openvpn-2.6.7/debian/changelog openvpn-2.6.7/debian/changelog --- openvpn-2.6.7/debian/changelog 2023-11-11 22:01:15.000000000 +0100 +++ openvpn-2.6.7/debian/changelog 2024-02-21 14:43:14.000000000 +0100 @@ -1,3 +1,10 @@ +openvpn (2.6.7-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install systemd generator and units into /usr. (Closes: #-1) + + -- Michael Biebl <bi...@debian.org> Wed, 21 Feb 2024 14:43:14 +0100 + openvpn (2.6.7-1) unstable; urgency=medium [ Aquila Macedo ] diff -Nru openvpn-2.6.7/debian/openvpn.install openvpn-2.6.7/debian/openvpn.install --- openvpn-2.6.7/debian/openvpn.install 2023-11-11 22:01:15.000000000 +0100 +++ openvpn-2.6.7/debian/openvpn.install 2024-02-21 14:40:37.000000000 +0100 @@ -1 +1 @@ -debian/openvpn-generator /lib/systemd/system-generators +debian/openvpn-generator /usr/lib/systemd/system-generators diff -Nru openvpn-2.6.7/debian/rules openvpn-2.6.7/debian/rules --- openvpn-2.6.7/debian/rules 2023-11-11 22:01:15.000000000 +0100 +++ openvpn-2.6.7/debian/rules 2024-02-21 14:39:48.000000000 +0100 @@ -5,7 +5,7 @@ ENV_VARS := IFCONFIG=/sbin/ifconfig ROUTE=/lib/freebsd/route EXTRA_ARGS := else -ENV_VARS := SYSTEMD_ASK_PASSWORD=/bin/systemd-ask-password SYSTEMD_UNIT_DIR=/lib/systemd/system TMPFILES_DIR=/usr/lib/tmpfiles.d +ENV_VARS := SYSTEMD_ASK_PASSWORD=/usr/bin/systemd-ask-password SYSTEMD_UNIT_DIR=/usr/lib/systemd/system TMPFILES_DIR=/usr/lib/tmpfiles.d EXTRA_ARGS := --enable-systemd --enable-dco endif
