Source: otpw
Version: 1.5-2
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. otpw 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.
Note 1: this change includes moving the .so into a multiarch path which
is recommended on Debian nowadays.
Note 2: this should not be backported to bookworm. If you intend to
backport, please use dh_movetousr instead.
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 otpw-1.5/debian/changelog otpw-1.5/debian/changelog
--- otpw-1.5/debian/changelog 2019-01-05 18:22:19.000000000 +0100
+++ otpw-1.5/debian/changelog 2024-02-09 23:08:08.000000000 +0100
@@ -1,3 +1,11 @@
+otpw (1.5-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install PAM module into /usr. (Closes: #-1)
+ * Use Multi-Arch paths.
+
+ -- Michael Biebl <bi...@debian.org> Fri, 09 Feb 2024 23:08:08 +0100
+
otpw (1.5-2) sid; urgency=medium
* debian/control: use dh 11
diff -Nru otpw-1.5/debian/libpam-otpw.install
otpw-1.5/debian/libpam-otpw.install
--- otpw-1.5/debian/libpam-otpw.install 2017-06-04 13:54:48.000000000 +0200
+++ otpw-1.5/debian/libpam-otpw.install 2024-02-09 23:05:29.000000000 +0100
@@ -1 +1 @@
-/lib/security
+usr/lib/*/security
diff -Nru otpw-1.5/debian/rules otpw-1.5/debian/rules
--- otpw-1.5/debian/rules 2018-12-14 19:43:21.000000000 +0100
+++ otpw-1.5/debian/rules 2024-02-09 23:07:29.000000000 +0100
@@ -6,6 +6,8 @@
# dh-make output file, you may use that output file without restriction.
# This special exception was added by Craig Small in version 0.37 of dh-make.
+include /usr/share/dpkg/architecture.mk
+
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
@@ -52,8 +54,8 @@
mkdir -p debian/tmp
install -d debian/tmp/usr/bin
install otpw-gen debian/tmp/usr/bin
- install -d debian/tmp/lib/security
- install pam_otpw.so debian/tmp/lib/security
+ install -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/security
+ install pam_otpw.so debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/security
install -d debian/tmp/usr/include
install -m644 otpw.h debian/tmp/usr/include
install -d debian/tmp/usr/lib
