:: [devuan-dev] Revert-usrmerge patche…
Forside
Slet denne besked
Besvar denne besked
Skribent: Svante Signell
Dato:  
Til: devuan-dev
Emne: [devuan-dev] Revert-usrmerge patches: grep, init-system-helpers, kmod
Hello,

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

grep, init-system-helpers (not needed, already at 1.66devuan1), kmod (revert
move-to-usr.diff)

Thanks!
--- a/debian/changelog    2024-01-04 12:56:48.000000000 +0100
+++ b/debian/changelog    2024-01-17 10:59:04.200000000 +0100
@@ -1,3 +1,9 @@
+grep (3.11-4.1) UNRELEASED; urgency=low
+
+  * Revert moving files to /usr.
+
+ -- Svante Signell <svante.signell@???>  Wed, 17 Jan 2024 10:59:48 +0100
+
 grep (3.11-4) unstable; urgency=low


* Upload to unstable.
--- a/debian/control    2024-01-04 12:56:48.000000000 +0100
+++ b/debian/control    2024-01-16 21:45:55.300000000 +0100
@@ -4,7 +4,7 @@
 Maintainer: Anibal Monsalve Salazar <anibal@???>
 Uploaders: Santiago Ruano Rincón <santiago@???>
 Standards-Version: 4.6.1.1
-Build-Depends: debhelper-compat (=13), dh-sequence-movetousr, gettext, libpcre2-dev, texinfo <!nodoc>
+Build-Depends: debhelper-compat (=13), gettext, libpcre2-dev, texinfo <!nodoc>
 Homepage: https://www.gnu.org/software/grep/
 Vcs-Git: https://salsa.debian.org/debian/grep.git
 Vcs-Browser: https://salsa.debian.org/debian/grep

--- a/debian/changelog    2024-01-04 20:10:38.000000000 +0100
+++ b/debian/changelog    2024-01-17 15:23:31.056000000 +0100
@@ -1,3 +1,9 @@
+kmod (31-1.1) UNRELEASED; urgency=medium
+
+  * Revert mode to /usr.
+
+ -- Svante Signell <svante.signell@???>  Wed, 17 Jan 2024 15:24:38 +0100
+
 kmod (31-1) unstable; urgency=medium


[ Marco d'Itri ]
diff --minimal -Nru kmod-30+20230601/debian/kmod-udeb.links kmod-30+20230601/debian/kmod-udeb.links
--- kmod-30+20230601/debian/kmod-udeb.links    2023-12-23 18:48:14.000000000 +0100
+++ kmod-30+20230601/debian/kmod-udeb.links    2024-01-03 17:04:29.000000000 +0100
@@ -1,7 +1,7 @@
-/bin/kmod /sbin/depmod
-/bin/kmod /sbin/insmod
-/bin/kmod /sbin/lsmod
-/bin/kmod /sbin/modinfo
-/bin/kmod /sbin/modprobe
-/bin/kmod /sbin/rmmod
-/bin/kmod /bin/lsmod
+/usr/bin/kmod /usr/sbin/depmod
+/usr/bin/kmod /usr/sbin/insmod
+/usr/bin/kmod /usr/sbin/lsmod
+/usr/bin/kmod /usr/sbin/modinfo
+/usr/bin/kmod /usr/sbin/modprobe
+/usr/bin/kmod /usr/sbin/rmmod
+/usr/bin/kmod /usr/bin/lsmod
diff --minimal -Nru kmod-30+20230601/debian/kmod.dirs kmod-30+20230601/debian/kmod.dirs
--- kmod-30+20230601/debian/kmod.dirs    2023-12-23 18:48:14.000000000 +0100
+++ kmod-30+20230601/debian/kmod.dirs    2024-01-03 17:06:56.000000000 +0100
@@ -1,5 +1,4 @@
 /etc/modprobe.d/
-/lib/modprobe.d/
-/sbin/
+/usr/lib/modprobe.d/
 /usr/share/doc/libkmod2/
 /usr/share/initramfs-tools/hooks/
diff --minimal -Nru kmod-30+20230601/debian/kmod.initramfs-hook kmod-30+20230601/debian/kmod.initramfs-hook
--- kmod-30+20230601/debian/kmod.initramfs-hook    2023-12-23 18:48:14.000000000 +0100
+++ kmod-30+20230601/debian/kmod.initramfs-hook    2024-01-03 17:05:20.000000000 +0100
@@ -6,11 +6,11 @@


. /usr/share/initramfs-tools/hook-functions

-copy_exec /bin/kmod
-cp -aZ /sbin/modprobe /sbin/rmmod "$DESTDIR/sbin/"
+copy_exec /usr/bin/kmod
+cp -aZ /usr/sbin/modprobe /usr/sbin/rmmod "$DESTDIR/usr/sbin/"

-mkdir -p "$DESTDIR/lib/modprobe.d/"
-if [ "$(echo /lib/modprobe.d/*)" != "/lib/modprobe.d/*" ]; then
- cp -aZ /lib/modprobe.d/* "$DESTDIR/lib/modprobe.d/"
+mkdir -p "$DESTDIR/usr/lib/modprobe.d/"
+if [ "$(echo /usr/lib/modprobe.d/*)" != "/usr/lib/modprobe.d/*" ]; then
+ cp -aZ /usr/lib/modprobe.d/* "$DESTDIR/usr/lib/modprobe.d/"
fi

diff --minimal -Nru kmod-30+20230601/debian/kmod.links kmod-30+20230601/debian/kmod.links
--- kmod-30+20230601/debian/kmod.links    2023-12-23 18:48:14.000000000 +0100
+++ kmod-30+20230601/debian/kmod.links    2024-01-03 17:05:52.000000000 +0100
@@ -1,7 +1,7 @@
-/bin/kmod /sbin/depmod
-/bin/kmod /sbin/insmod
-/bin/kmod /sbin/lsmod
-/bin/kmod /sbin/modinfo
-/bin/kmod /sbin/modprobe
-/bin/kmod /sbin/rmmod
-/bin/kmod /bin/lsmod
+/usr/bin/kmod /usr/sbin/depmod
+/usr/bin/kmod /usr/sbin/insmod
+/usr/bin/kmod /usr/sbin/lsmod
+/usr/bin/kmod /usr/sbin/modinfo
+/usr/bin/kmod /usr/sbin/modprobe
+/usr/bin/kmod /usr/sbin/rmmod
+/usr/bin/kmod /usr/bin/lsmod
diff --minimal -Nru kmod-30+20230601/debian/rules kmod-30+20230601/debian/rules
--- kmod-30+20230601/debian/rules    2023-12-24 00:08:19.000000000 +0100
+++ kmod-30+20230601/debian/rules    2024-01-03 17:06:56.000000000 +0100
@@ -12,7 +12,6 @@


 CONFFLAGS = \
   --sysconfdir=/etc \
-  --bindir=/bin \
   --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
   --with-rootlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 CONFFLAGS_deb  = $(CONFFLAGS) \
@@ -82,7 +82,7 @@
 override_dh_install:
     rm $D/usr/lib/*/*.la
     dh_movefiles --sourcedir=debian/kmod
-    cp debian/extra/aliases.conf $D/lib/modprobe.d/
+    cp debian/extra/aliases.conf $D/usr/lib/modprobe.d/
     install --mode=755 debian/kmod.initramfs-hook \
         $D/usr/share/initramfs-tools/hooks/kmod
     find $D/usr -type d -empty -delete