Hello,

here are patches to revert consequences of Debian's usrmerge:

lvm2, nano, netcat

Thanks!

--- a/debian/changelog    2024-01-06 18:47:24.000000000 +0100

+++ b/debian/changelog    2024-01-21 16:12:36.500000000 +0100
@@ -1,3 +1,9 @@
+lvm2 (2.03.16-3.1) UNRELEASED; urgency=medium
+
+  * Revert moving files to /usr.
+
+ -- Svante Signell <svante.signell@???>  Sun, 21 Jan 2024 16:13:24 +0100
+
 lvm2 (2.03.16-3) unstable; urgency=medium

* Remove obsolete dependency on lsb-base.
--- a/configure.ac    2024-01-21 22:39:54.776000000 +0100

 +++ b/configure.ac    2024-01-21 22:41:58.708000000 +0100
@@ -1099,62 +1099,6 @@
 PKG_CHECK_EXISTS(systemd >= 205, [SYSTEMD_MIN_VERSION=205], [])

 ################################################################################
-dnl -- Build notifydbus
-PKG_CHECK_EXISTS(systemd >= 221, [SYSTEMD_MIN_VERSION=221], [])
-AC_MSG_CHECKING(whether to build notifydbus)
-AC_ARG_ENABLE(notify-dbus,
-          AS_HELP_STRING([--enable-notify-dbus],
-                 [enable LVM notification using dbus]),
-          AS_IF([test "$enableval" = yes && test "$SYSTEMD_MIN_VERSION" -lt 221],
-            AC_MSG_ERROR([Enabling notify-dbus requires systemd >= 221]))
-          NOTIFYDBUS_SUPPORT=$enableval, NOTIFYDBUS_SUPPORT=no)
-AC_MSG_RESULT($NOTIFYDBUS_SUPPORT)
-
-AS_IF([test "$NOTIFYDBUS_SUPPORT" = yes],
-      AC_DEFINE([NOTIFYDBUS_SUPPORT], 1, [Define to 1 to include code that uses dbus notification.]))
-
-################################################################################
-dnl -- Build with systemd journaling when the header file is present
-AS_IF([test "$SYSTEMD_MIN_VERSION" -ge 221], [SYSTEMD_JOURNAL_SUPPORT=maybe], [SYSTEMD_JOURNAL_SUPPORT=no])
-AC_CHECK_HEADER([systemd/sd-journal.h],
-        [AS_IF([test "$SYSTEMD_JOURNAL_SUPPORT" != no], [SYSTEMD_JOURNAL_SUPPORT=yes])],
-                [SYSTEMD_JOURNAL_SUPPORT=no])
-AC_MSG_CHECKING(whether to log to systemd journal)
-AC_ARG_ENABLE(systemd-journal,
-          AS_HELP_STRING([--disable-systemd-journal],
-                 [disable LVM systemd journaling]),
-          AS_IF([test "$enableval" = yes && test "$SYSTEMD_JOURNAL_SUPPORT" = no],
-            AC_MSG_ERROR([Enabling systemd journal requires systemd/sd-journal.h and systemd >= 221.]))
-          SYSTEMD_JOURNAL_SUPPORT=$enableval, [])
-AC_MSG_RESULT($SYSTEMD_JOURNAL_SUPPORT)
-
-AS_IF([test "$SYSTEMD_JOURNAL_SUPPORT" = yes],
-      AC_DEFINE([SYSTEMD_JOURNAL_SUPPORT], 1, [Define to 1 to include code that uses systemd journal.]))
-
-################################################################################
-dnl -- Build appmachineid when header file sd-id128.h is present
-PKG_CHECK_EXISTS(systemd >= 234, [SYSTEMD_MIN_VERSION=234  APP_MACHINEID_SUPPORT=maybe], [APP_MACHINEID_SUPPORT=no])
-AC_CHECK_HEADER([systemd/sd-id128.h],
-        [AS_IF([test "$APP_MACHINEID_SUPPORT" != no], [APP_MACHINEID_SUPPORT=yes])],
-        [APP_MACHINEID_SUPPORT=no])
-AC_MSG_CHECKING(whether to support systemd appmachineid)
-AC_ARG_ENABLE(app-machineid,
-          AC_HELP_STRING([--disable-app-machineid],
-                 [disable LVM system ID using app-specific machine-id]),
-          AS_IF([test "$enableval" = yes && test "$APP_MACHINEID_SUPPORT" = no],
-            AC_MSG_ERROR([Enabling app machineid requires systemd/sd-id128.h and systemd >= 234.]))
-          APP_MACHINEID_SUPPORT=$enableval, [])
-AC_MSG_RESULT($APP_MACHINEID_SUPPORT)
-
-AS_IF([test "$APP_MACHINEID_SUPPORT" = yes],
-      AC_DEFINE([APP_MACHINEID_SUPPORT], 1, [Define to 1 to include code that uses libsystemd machine-id apis.]))
-
-dnl -- Look for libsystemd libraries if needed
-AS_IF([test "$NOTIFYDBUS_SUPPORT" = yes || test "$SYSTEMD_JOURNAL_SUPPORT" = yes || test "$APP_MACHINEID_SUPPORT" = yes ] ,[
-      pkg_config_init
-      PKG_CHECK_MODULES(SYSTEMD, [systemd], [SYSTEMD_LIBS="-lsystemd"], $bailout) ])
-
-################################################################################

dnl -- Enable blkid wiping functionality
AC_ARG_ENABLE(blkid_wiping,
@@ -1764,7 +1708,7 @@
AC_MSG_RESULT($interface)

################################################################################
-PKG_CHECK_MODULES([LIBSYSTEMD],[libsystemd],[HAVE_LIBSYSTEMD=yes],[HAVE_LIBSYSTEMD=no])
+PKG_CHECK_MODULES([LIBSYSTEMD],[libelogind],[HAVE_LIBSYSTEMD=yes],[HAVE_LIBSYSTEMD=no])

 ################################################################################
 read DM_LIB_VERSION < "$srcdir"/VERSION_DM 2>/dev/null || DM_LIB_VERSION=Unknown
Only in lvm2-2.03.16/debian/: pipeline
diff -ur lvm2-2.03.16/debian/rules lvm2-2.03.16/debian/rules
--- lvm2-2.03.16/debian/rules    2024-01-06 18:47:24.000000000 +0100
+++ lvm2-2.03.16/debian/rules    2022-10-19 21:37:31.000000000 +0200
@@ -24,8 +24,8 @@
 endif

 define CONFARGS.deb
-    --prefix=/usr
-    --exec-prefix=/usr
+    --libdir=/lib/$(DEB_HOST_MULTIARCH)
+    --sbindir=/sbin
     --with-usrlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)
     --with-optimisation="$(CFLAGS_OPT_DEB)"
     --with-cache=internal
@@ -39,6 +39,7 @@
     --with-thin-check=/usr/sbin/thin_check
     --with-thin-dump=/usr/sbin/thin_dump
     --with-thin-repair=/usr/sbin/thin_repair
+    --with-udev-prefix=/
     --enable-applib
     --enable-blkid_wiping
     --enable-cmdlib
@@ -55,12 +56,16 @@
 endef

 define CONFARGS.deb_all
+    --sbindir=/sbin
     --enable-dbus-service
     --disable-readline
     --disable-selinux
 endef

 define CONFARGS.udeb
+    --libdir=/lib
+    --sbindir=/sbin
+    --with-usrlibdir=/usr/lib
     --with-optimisation="$(CFLAGS_OPT_UDEB)"
     --with-lvm1=none
     --with-pool=none
@@ -155,11 +155,6 @@
         -- -c2

 override_dh_installsystemd:
-    dh_installsystemd -plvm2 --no-restart-after-upgrade --no-stop-on-upgrade \
-        blk-availability.service \
-        lvm2-monitor.service
-    dh_installsystemd -plvm2 \
-        lvm2-lvmpolld.socket
     dh_installsystemd --remaining-packages

 .NOTPARALLEL:
--- a/debian/control    2024-01-21 16:10:46.120000000 +0100
+++ b/debian/control    2024-01-21 16:25:25.504000000 +0100
@@ -10,7 +10,7 @@
  libaio-dev,
  libblkid-dev,
  pkg-config,
- systemd-dev (>= 255~rc1-1),
+ libelogind-dev,
 Build-Depends-Arch:
  libcmap-dev,
  libcorosync-common-dev,
@@ -21,8 +21,8 @@
  libquorum-dev,
  libsanlock-dev,
  libselinux1-dev,
- libsystemd-dev,
- libudev-dev,
+ libelogind-dev,
+ libeudev-dev,
 Build-Depends-Indep:
  dh-sequence-python3,
  python3-dev,
diff -ur lvm2-2.03.16/debian/dmeventd.install lvm2-2.03.16/debian/dmeventd.install
--- lvm2-2.03.16/debian/dmeventd.install    2024-01-06 18:47:24.000000000 +0100
+++ lvm2-2.03.16/debian/dmeventd.install    2022-10-19 21:37:31.000000000 +0200
@@ -1,5 +1,4 @@
-usr/lib/*/libdevmapper-event-*
-usr/lib/*/device-mapper/libdevmapper-event-*
-usr/lib/systemd/system/dm-event*
-usr/sbin/dmeventd
+lib/*/libdevmapper-event-*
+lib/*/device-mapper/libdevmapper-event-*
+sbin/dmeventd
 usr/share/man/man8/dmeventd.8
diff -ur lvm2-2.03.16/debian/dmsetup.install lvm2-2.03.16/debian/dmsetup.install
--- lvm2-2.03.16/debian/dmsetup.install    2024-01-06 18:47:24.000000000 +0100
+++ lvm2-2.03.16/debian/dmsetup.install    2022-10-19 21:37:31.000000000 +0200
@@ -1,8 +1,8 @@
 ../../initramfs-tools/dmsetup/* usr/share/initramfs-tools
-usr/lib/udev/rules.d/*-dm*.rules
-usr/sbin/blkdeactivate
-usr/sbin/dmsetup
-usr/sbin/dmstats
+lib/udev/rules.d/*-dm*.rules
+sbin/blkdeactivate
+sbin/dmsetup
+sbin/dmstats
 usr/share/man/man8/blkdeactivate.8
 usr/share/man/man8/dmsetup.8
 usr/share/man/man8/dmstats.8
diff -ur lvm2-2.03.16/debian/dmsetup-udeb.install lvm2-2.03.16/debian/dmsetup-udeb.install
--- lvm2-2.03.16/debian/dmsetup-udeb.install    2024-01-06 18:47:24.000000000 +0100
+++ lvm2-2.03.16/debian/dmsetup-udeb.install    2022-10-19 21:37:31.000000000 +0200
@@ -1,1 +1,1 @@
-usr/sbin/dmsetup
+sbin/dmsetup
diff -ur lvm2-2.03.16/debian/libdevmapper1.02.1.install lvm2-2.03.16/debian/libdevmapper1.02.1.install
--- lvm2-2.03.16/debian/libdevmapper1.02.1.install    2024-01-06 18:47:24.000000000 +0100
+++ lvm2-2.03.16/debian/libdevmapper1.02.1.install    2022-10-19 21:37:31.000000000 +0200
@@ -1 +1 @@
-usr/lib/*/libdevmapper.so.*
+lib/*/libdevmapper.so.*
diff -ur lvm2-2.03.16/debian/libdevmapper1.02.1-udeb.install lvm2-2.03.16/debian/libdevmapper1.02.1-udeb.install
--- lvm2-2.03.16/debian/libdevmapper1.02.1-udeb.install    2024-01-06 18:47:24.000000000 +0100
+++ lvm2-2.03.16/debian/libdevmapper1.02.1-udeb.install    2022-10-19 21:37:31.000000000 +0200
@@ -1 +1 @@
-usr/lib/*/libdevmapper.so.*
+lib/libdevmapper.so.*
diff -ur lvm2-2.03.16/debian/libdevmapper-event1.02.1.install lvm2-2.03.16/debian/libdevmapper-event1.02.1.install
--- lvm2-2.03.16/debian/libdevmapper-event1.02.1.install    2024-01-06 18:47:24.000000000 +0100
+++ lvm2-2.03.16/debian/libdevmapper-event1.02.1.install    2022-10-19 21:37:31.000000000 +0200
@@ -1 +1 @@
-usr/lib/*/libdevmapper-event.so.*
+lib/*/libdevmapper-event.so.*
diff -ur lvm2-2.03.16/debian/liblvm2cmd2.03.install lvm2-2.03.16/debian/liblvm2cmd2.03.install
--- lvm2-2.03.16/debian/liblvm2cmd2.03.install    2024-01-06 18:47:24.000000000 +0100
+++ lvm2-2.03.16/debian/liblvm2cmd2.03.install    2022-10-19 21:37:31.000000000 +0200
@@ -1 +1 @@
-usr/lib/*/liblvm2cmd.so.2.03
+lib/*/liblvm2cmd.so.2.03
diff -ur lvm2-2.03.16/debian/lvm2-dbusd.install lvm2-2.03.16/debian/lvm2-dbusd.install

--- a/debian/lvm2-dbusd.install    2024-01-06 18:47:24.000000000 +0100
+++ b/debian/lvm2-dbusd.install    2024-01-23 12:51:33.652000000 +0100
@@ -1,6 +1,4 @@
 etc/dbus-1/system.d/com.redhat.lvmdbus1.conf
-usr/lib/systemd/system/lvm2-lvmdbusd.service
-usr/sbin/lvmdbusd
-usr/lib/python*/*-packages/lvmdbusd/
+sbin/lvmdbusd
 usr/share/dbus-1/system-services/com.redhat.lvmdbus1.service
 usr/share/man/man8/lvmdbusd.8
--- a/debian/lvm2.install    2024-01-06 18:47:24.000000000 +0100
+++ b7debian/lvm2.install    2024-01-23 12:42:26.756000000 +0100
@@ -1,57 +1,54 @@
 ../../initramfs-tools/lvm2/* usr/share/initramfs-tools
 etc/lvm
-usr/lib/systemd/system/blk-availability*
-usr/lib/systemd/system/lvm2-lvmpolld*
-usr/lib/systemd/system/lvm2-monitor*
-usr/lib/udev/rules.d/*-lvm*.rules
-usr/sbin/fsadm
-usr/sbin/lvchange
-usr/sbin/lvconvert
-usr/sbin/lvcreate
-usr/sbin/lvdisplay
-usr/sbin/lvextend
-usr/sbin/lvm
-usr/sbin/lvmconfig
-usr/sbin/lvmdiskscan
-usr/sbin/lvmdump
-usr/sbin/lvmpolld
-usr/sbin/lvmsadc
-usr/sbin/lvmsar
-usr/sbin/lvreduce
-usr/sbin/lvremove
-usr/sbin/lvrename
-usr/sbin/lvresize
-usr/sbin/lvs
-usr/sbin/lvscan
-usr/sbin/pvchange
-usr/sbin/pvck
-usr/sbin/pvcreate
-usr/sbin/pvdisplay
-usr/sbin/pvmove
-usr/sbin/pvremove
-usr/sbin/pvresize
-usr/sbin/pvs
-usr/sbin/pvscan
-usr/sbin/vgcfgbackup
-usr/sbin/vgcfgrestore
-usr/sbin/vgchange
-usr/sbin/vgck
-usr/sbin/vgconvert
-usr/sbin/vgcreate
-usr/sbin/vgdisplay
-usr/sbin/vgexport
-usr/sbin/vgextend
-usr/sbin/vgimport
-usr/sbin/vgimportclone
-usr/sbin/vgmerge
-usr/sbin/vgmknodes
-usr/sbin/vgreduce
-usr/sbin/vgremove
-usr/sbin/vgrename
-usr/sbin/vgs
-usr/sbin/vgscan
-usr/sbin/vgsplit
+lib/udev/rules.d/*-lvm*.rules
+sbin/fsadm
+sbin/lvchange
+sbin/lvconvert
+sbin/lvcreate
+sbin/lvdisplay
+sbin/lvextend
+sbin/lvm
+sbin/lvmconfig
+sbin/lvmdiskscan
+sbin/lvmdump
+sbin/lvmpolld
+sbin/lvmsadc
+sbin/lvmsar
+sbin/lvreduce
+sbin/lvremove
+sbin/lvrename
+sbin/lvresize
+sbin/lvs
+sbin/lvscan
+sbin/pvchange
+sbin/pvck
+sbin/pvcreate
+sbin/pvdisplay
+sbin/pvmove
+sbin/pvremove
+sbin/pvresize
+sbin/pvs
+sbin/pvscan
+sbin/vgcfgbackup
+sbin/vgcfgrestore
+sbin/vgchange
+sbin/vgck
+sbin/vgconvert
+sbin/vgcreate
+sbin/vgdisplay
+sbin/vgexport
+sbin/vgextend
+sbin/vgimport
+sbin/vgimportclone
+sbin/vgmerge
+sbin/vgmknodes
+sbin/vgreduce
+sbin/vgremove
+sbin/vgrename
+sbin/vgs
+sbin/vgscan
+sbin/vgsplit
 usr/lib/tmpfiles.d/lvm2.conf
 usr/share/man/man5/lvm.conf.5
 usr/share/man/man7/lvmcache.7
 usr/share/man/man7/lvmvdo.7
diff -ur lvm2-2.03.16/debian/lvm2-lockd.install lvm2-2.03.16/debian/lvm2-lockd.install
--- a/debian/lvm2-lockd.install    2024-01-23 12:18:23.372000000 +0100
+++ b/debian/lvm2-lockd.install    2024-01-23 12:24:17.960000000 +0100
@@ -1,5 +1,3 @@
-usr/lib/systemd/system/lvmlockd.service
-usr/lib/systemd/system/lvmlocks.service
-usr/sbin/lvmlockctl
-usr/sbin/lvmlockd
+sbin/lvmlockctl
+sbin/lvmlockd
 usr/share/man/man8/lvmlockctl.8
diff -ur lvm2-2.03.16/debian/lvm2-udeb.install lvm2-2.03.16/debian/lvm2-udeb.install
--- lvm2-2.03.16/debian/lvm2-udeb.install    2024-01-06 18:47:24.000000000 +0100
+++ lvm2-2.03.16/debian/lvm2-udeb.install    2022-10-19 21:37:31.000000000 +0200
@@ -1,45 +1,45 @@
 etc/lvm/lvm.conf
-usr/sbin/lvchange
-usr/sbin/lvconvert
-usr/sbin/lvcreate
-usr/sbin/lvdisplay
-usr/sbin/lvextend
-usr/sbin/lvm
-usr/sbin/lvmconfig
-usr/sbin/lvmdiskscan
-usr/sbin/lvmsadc
-usr/sbin/lvmsar
-usr/sbin/lvreduce
-usr/sbin/lvremove
-usr/sbin/lvrename
-usr/sbin/lvresize
-usr/sbin/lvs
-usr/sbin/lvscan
-usr/sbin/pvchange
-usr/sbin/pvck
-usr/sbin/pvcreate
-usr/sbin/pvdisplay
-usr/sbin/pvmove
-usr/sbin/pvremove
-usr/sbin/pvresize
-usr/sbin/pvs
-usr/sbin/pvscan
-usr/sbin/vgcfgbackup
-usr/sbin/vgcfgrestore
-usr/sbin/vgchange
-usr/sbin/vgck
-usr/sbin/vgconvert
-usr/sbin/vgcreate
-usr/sbin/vgdisplay
-usr/sbin/vgexport
-usr/sbin/vgextend
-usr/sbin/vgimport
-usr/sbin/vgimportclone
-usr/sbin/vgmerge
-usr/sbin/vgmknodes
-usr/sbin/vgreduce
-usr/sbin/vgremove
-usr/sbin/vgrename
-usr/sbin/vgs
-usr/sbin/vgscan
-usr/sbin/vgsplit
+sbin/lvchange
+sbin/lvconvert
+sbin/lvcreate
+sbin/lvdisplay
+sbin/lvextend
+sbin/lvm
+sbin/lvmconfig
+sbin/lvmdiskscan
+sbin/lvmsadc
+sbin/lvmsar
+sbin/lvreduce
+sbin/lvremove
+sbin/lvrename
+sbin/lvresize
+sbin/lvs
+sbin/lvscan
+sbin/pvchange
+sbin/pvck
+sbin/pvcreate
+sbin/pvdisplay
+sbin/pvmove
+sbin/pvremove
+sbin/pvresize
+sbin/pvs
+sbin/pvscan
+sbin/vgcfgbackup
+sbin/vgcfgrestore
+sbin/vgchange
+sbin/vgck
+sbin/vgconvert
+sbin/vgcreate
+sbin/vgdisplay
+sbin/vgexport
+sbin/vgextend
+sbin/vgimport
+sbin/vgimportclone
+sbin/vgmerge
+sbin/vgmknodes
+sbin/vgreduce
+sbin/vgremove
+sbin/vgrename
+sbin/vgs
+sbin/vgscan
+sbin/vgsplit

--- a/debian/changelog    2024-01-17 01:35:55.000000000 +0100

+++ b/debian/changelog    2024-01-17 17:06:54.468000000 +0100
@@ -1,3 +1,9 @@
+nano (7.2-2.1) UNRELEASED; urgency=medium
+
+  * d/nano.postinst: update-alternatives to /usr/bin.
+
+ -- Svante Signell <svante.signell@???>  Wed, 17 Jan 2024 17:07:55 +0100
+
 nano (7.2-2) unstable; urgency=medium

[ Jordi Mallach ]
--- a/debian/nano.postinst    2024-01-17 17:02:56.576000000 +0100

+++ b/debian/nano.postinst    2022-05-03 00:22:06.000000000 +0200
@@ -3,10 +3,10 @@
 set -e

 if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
-    update-alternatives --install /usr/bin/editor editor /usr/bin/nano 40 \
+    update-alternatives --install /usr/bin/editor editor /bin/nano 40 \
       --slave /usr/share/man/man1/editor.1.gz editor.1.gz \
       /usr/share/man/man1/nano.1.gz
-    update-alternatives --install /usr/bin/pico pico /usr/bin/nano 10 \
+    update-alternatives --install /usr/bin/pico pico /bin/nano 10 \
       --slave /usr/share/man/man1/pico.1.gz pico.1.gz \
       /usr/share/man/man1/nano.1.gz
 fi

--- a/debian/nano-tiny.postinst    2022-05-03 00:22:06.000000000 +0200

+++ b/debian/nano-tiny.postinst    2024-01-17 17:15:45.708000000 +0100
@@ -3,7 +3,7 @@
 set -e

 if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
-    update-alternatives --install /usr/bin/editor editor /bin/nano-tiny 0 \
+    update-alternatives --install /usr/bin/editor editor /usr/bin/nano-tiny 0 \
       --slave /usr/share/man/man1/editor.1.gz editor.1.gz \
       /usr/share/man/man1/nano-tiny.1.gz
 fi

--- a/debian/changelog    2023-11-27 03:20:27.000000000 +0100

+++ b/debian/changelog    2023-12-04 15:15:45.000000000 +0100
@@ -1,3 +1,9 @@
+netcat (1.10-48.1) UNRELEASED; urgency=medium
+
+  * Correct paths also in netcat-traditional.postinst.
+
+ -- Svante Signell <svante.signell@???>  Mon, 04 Nov 2023 15:14:27 +0100
+
 netcat (1.10-48) unstable; urgency=medium

* Move files from /bin to /usr/bin
--- a/debian/netcat-traditional.postinst    2023-11-27 03:20:27.000000000 +0100

+++ b/debian/netcat-traditional.postinst    2023-12-04 15:11:31.000000000 +0100
@@ -4,8 +4,8 @@

 if [ "$1" = "configure" ]; then
     update-alternatives \
-        --install /bin/nc nc /bin/nc.traditional 10 \
-        --slave /bin/netcat netcat /bin/nc.traditional \
+        --install /usr/bin/nc nc /usr/bin/nc.traditional 10 \
+        --slave /usr/bin/netcat netcat /usr/bin/nc.traditional \
         --slave /usr/share/man/man1/nc.1.gz nc.1.gz \
                 /usr/share/man/man1/nc.traditional.1.gz \
         --slave /usr/share/man/man1/netcat.1.gz netcat.1.gz \