Package: debianutils
Version: 5.14
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Dear Maintainer,

your package debianutils installs files into /bin and /sbin.
For the ongoing UsrMerge effort [1], these directories should become
"empty", IOW packages should not install files there, but instead into
/usr/bin and /usr/sbin.

I think debianutils could move these files now. I am guessing that argyll
would not see backports; if it did, please note that such changes must be
reverted for bookworm (or earlier).

Attached you will find a patch implementing this. Please apply it at
your earliest convenience.

Thanks,
Chris

1. https://wiki.debian.org/UsrMerge
diff -Nru debianutils-5.14/debian/changelog 
debianutils-5.14+nmu1/debian/changelog
--- debianutils-5.14/debian/changelog   2023-09-19 20:35:25.000000000 +0200
+++ debianutils-5.14+nmu1/debian/changelog      2023-11-27 12:10:53.000000000 
+0100
@@ -1,3 +1,10 @@
+debianutils (5.14+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install files into /usr. (Closes: #-1)
+
+ -- Chris Hofstaedtler <z...@debian.org>  Mon, 27 Nov 2023 12:10:53 +0100
+
 debianutils (5.14) unstable; urgency=medium
 
   * acinclude.m4: Bump DEBIANUTILS_VERSION from 5.13 to 5.14.
diff -Nru debianutils-5.14/debian/rules debianutils-5.14+nmu1/debian/rules
--- debianutils-5.14/debian/rules       2023-09-19 20:35:25.000000000 +0200
+++ debianutils-5.14+nmu1/debian/rules  2023-11-27 12:10:49.000000000 +0100
@@ -20,18 +20,13 @@
        dh $@
 
 execute_after_dh_auto_install:
-       $(INSTALL_DIR) $(INSTALL_LOC)/bin \
-                      $(INSTALL_LOC)/sbin \
+       $(INSTALL_DIR) $(INSTALL_LOC)/usr/bin \
+                      $(INSTALL_LOC)/usr/sbin \
                       $(INSTALL_LOC)/usr/share/$(PACKAGE)/shells.d \
                       $(INSTALL_LOC)/usr/share/$(PACKAGE)
-       mv $(INSTALL_LOC)/usr/bin/run-parts \
-          $(INSTALL_LOC)/usr/bin/tempfile \
-          $(INSTALL_LOC)/bin/
        $(INSTALL_FILE) debian/shells $(INSTALL_LOC)/usr/share/$(PACKAGE)
 
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-       mv $(INSTALL_LOC)/usr/sbin/installkernel $(INSTALL_LOC)/sbin/
-else
+ifneq ($(DEB_HOST_ARCH_OS),linux)
        rm $(INSTALL_LOC)/usr/sbin/installkernel \
           $(INSTALL_LOC)/usr/share/man/man8/installkernel.8
 endif

Reply via email to