Source: shishi
Version: 1.0.3-1
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. shishi 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: 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 shishi-1.0.3/debian/changelog shishi-1.0.3/debian/changelog
--- shishi-1.0.3/debian/changelog       2022-08-07 18:29:29.000000000 +0200
+++ shishi-1.0.3/debian/changelog       2024-01-29 22:16:26.000000000 +0100
@@ -1,3 +1,10 @@
+shishi (1.0.3-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install PAM module into /usr. (Closes: #-1)
+
+ -- Michael Biebl <bi...@debian.org>  Mon, 29 Jan 2024 22:16:26 +0100
+
 shishi (1.0.3-1) unstable; urgency=medium
 
   * New upstream version 1.0.3
diff -Nru shishi-1.0.3/debian/libpam-shishi.install 
shishi-1.0.3/debian/libpam-shishi.install
--- shishi-1.0.3/debian/libpam-shishi.install   2022-08-07 04:17:31.000000000 
+0200
+++ shishi-1.0.3/debian/libpam-shishi.install   2024-01-29 22:13:13.000000000 
+0100
@@ -1 +1 @@
-lib/*/security/pam_shishi.so
+usr/lib/*/security/pam_shishi.so
diff -Nru shishi-1.0.3/debian/not-installed shishi-1.0.3/debian/not-installed
--- shishi-1.0.3/debian/not-installed   2022-08-07 12:33:13.000000000 +0200
+++ shishi-1.0.3/debian/not-installed   2024-01-29 22:16:26.000000000 +0100
@@ -1,2 +1,2 @@
 usr/lib/*/*.la
-lib/*/security/pam_shishi.la
+usr/lib/*/security/pam_shishi.la
diff -Nru shishi-1.0.3/debian/rules shishi-1.0.3/debian/rules
--- shishi-1.0.3/debian/rules   2022-08-07 10:06:48.000000000 +0200
+++ shishi-1.0.3/debian/rules   2024-01-29 22:13:07.000000000 +0100
@@ -21,7 +21,7 @@
 CONFIGURE_FLAGS = \
        --disable-rpath \
        --with-db-dir=/var/lib/shishi \
-       --with-pam-dir=/lib/$(DEB_HOST_MULTIARCH)/security \
+       --with-pam-dir=/usr/lib/$(DEB_HOST_MULTIARCH)/security \
        --with-packager=Debian \
        --with-packager-version=$(DEB_VERSION) \
        --with-packager-bug-reports=https://bugs.debian.org/

Reply via email to