Source: lzo2
Version: 2.10-2
Severity: normal
Tags: patch trixie sid
User: [email protected]
Usertags: dep17m2

We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. lzo2 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.

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 lzo2-2.10/debian/changelog lzo2-2.10/debian/changelog
--- lzo2-2.10/debian/changelog  2020-01-22 21:35:19.000000000 +0100
+++ lzo2-2.10/debian/changelog  2024-02-22 22:44:26.000000000 +0100
@@ -1,3 +1,10 @@
+lzo2 (2.10-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install shared library into /usr. (Closes: #-1)
+
+ -- Michael Biebl <[email protected]>  Thu, 22 Feb 2024 22:44:26 +0100
+
 lzo2 (2.10-2) unstable; urgency=medium
 
   * Add missing pkg-config build-dependency.
diff -Nru lzo2-2.10/debian/liblzo2-2.install lzo2-2.10/debian/liblzo2-2.install
--- lzo2-2.10/debian/liblzo2-2.install  2020-01-20 11:42:23.000000000 +0100
+++ lzo2-2.10/debian/liblzo2-2.install  2024-02-22 22:44:18.000000000 +0100
@@ -1 +1 @@
-lib/*/*.so.*
+usr/lib/*/*.so.*
diff -Nru lzo2-2.10/debian/liblzo2-2-udeb.install 
lzo2-2.10/debian/liblzo2-2-udeb.install
--- lzo2-2.10/debian/liblzo2-2-udeb.install     2020-01-20 11:42:23.000000000 
+0100
+++ lzo2-2.10/debian/liblzo2-2-udeb.install     2024-02-22 22:44:21.000000000 
+0100
@@ -1 +1 @@
-lib/*/*.so.*
+usr/lib/*/*.so.*
diff -Nru lzo2-2.10/debian/rules lzo2-2.10/debian/rules
--- lzo2-2.10/debian/rules      2020-01-22 19:13:05.000000000 +0100
+++ lzo2-2.10/debian/rules      2024-02-22 22:44:10.000000000 +0100
@@ -18,9 +18,6 @@
 
 override_dh_auto_install:
        dh_auto_install
-       mkdir -p $(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)
-       mv $(DEB_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/*.so.* 
$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH)
-       ln -sf /lib/$(DEB_HOST_MULTIARCH)/$$(basename $$(readlink 
$(DEB_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/*.so)) 
$(DEB_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/*.so
        mkdir -p $(DEB_DESTDIR)/usr/share/lzo/minilzo
        install -D -m 644 minilzo/README.LZO minilzo/minilzo.c 
minilzo/minilzo.h include/lzo/lzoconf.h include/lzo/lzodefs.h 
$(CURDIR)/debian/tmp/usr/share/lzo/minilzo
 

Reply via email to