Package: dphys-swapfile Version: 20100506-7.1 Severity: normal Tags: patch User: [email protected] Usertags: dep17m2
Dear Maintainer, your package dphys-swapfile installs files into /sbin. For the ongoing UsrMerge effort [1], /sbin should become "empty", IOW packages should not install files there, but instead into /usr/sbin. I think dphys-swapfile could move these files now. I am guessing that there won't be any backports; if there will be any, 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. At [2] you'll find a salsa merge request doing the same. The patch does not change documentation et al, instead opting for a smaller diff. Thanks, Chris 1. https://wiki.debian.org/UsrMerge 2. https://salsa.debian.org/debian/dphys-swapfile/-/merge_requests/4
diff -Nru dphys-swapfile-20100506/debian/changelog dphys-swapfile-20100506/debian/changelog --- dphys-swapfile-20100506/debian/changelog 2022-10-15 12:01:41.000000000 +0200 +++ dphys-swapfile-20100506/debian/changelog 2023-11-27 13:05:05.000000000 +0100 @@ -1,3 +1,10 @@ +dphys-swapfile (20100506-7.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install files into /usr/sbin instead of /sbin. (Closes: #-1) + + -- Chris Hofstaedtler <[email protected]> Mon, 27 Nov 2023 13:05:05 +0100 + dphys-swapfile (20100506-7.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru dphys-swapfile-20100506/debian/dirs dphys-swapfile-20100506/debian/dirs --- dphys-swapfile-20100506/debian/dirs 2016-10-24 01:10:58.000000000 +0200 +++ dphys-swapfile-20100506/debian/dirs 2023-11-27 13:05:05.000000000 +0100 @@ -1,2 +1,2 @@ -sbin etc +usr/sbin diff -Nru dphys-swapfile-20100506/debian/patches/series dphys-swapfile-20100506/debian/patches/series --- dphys-swapfile-20100506/debian/patches/series 2021-01-17 03:22:11.000000000 +0100 +++ dphys-swapfile-20100506/debian/patches/series 2023-11-27 13:04:34.000000000 +0100 @@ -3,3 +3,4 @@ change-example-from-var-run-to-var-tmp.patch replace-p-q-with-p-for-newer-dc.patch disable-swap-copy-on-write-for-copy-on-write-file-systems.patch +usr-sbin.patch diff -Nru dphys-swapfile-20100506/debian/patches/usr-sbin.patch dphys-swapfile-20100506/debian/patches/usr-sbin.patch --- dphys-swapfile-20100506/debian/patches/usr-sbin.patch 1970-01-01 01:00:00.000000000 +0100 +++ dphys-swapfile-20100506/debian/patches/usr-sbin.patch 2023-11-27 13:05:05.000000000 +0100 @@ -0,0 +1,35 @@ +Index: dphys-swapfile-20100506/Makefile +=================================================================== +--- dphys-swapfile-20100506.orig/Makefile ++++ dphys-swapfile-20100506/Makefile +@@ -22,10 +22,6 @@ MAN8DIR = $(PREFIX)/share/man/man8 + DOCDIR = $(PREFIX)/share/doc/dphys-swapfile + EXADIR = $(DOCDIR)/examples + +-# use R_PREFIX (root prefix) as not in /usr, this is early run start up stuff +-R_PREFIX = $(DESTDIR) +-R_SBINDIR = $(R_PREFIX)/sbin +- + + # --- code for acting out the various make targets + +@@ -38,8 +34,8 @@ clean: + distclean: clean + + install: +- @mkdir -p $(R_SBINDIR) +- @cp -p dphys-swapfile $(R_SBINDIR) ++ @mkdir -p $(SBINDIR) ++ @cp -p dphys-swapfile $(SBINDIR) + + @mkdir -p $(MAN8DIR) + @cp -p dphys-swapfile.8.gz $(MAN8DIR) +@@ -55,7 +51,7 @@ uninstall: + + @rm -f $(MAN8DIR)/dphys-swapfile.8.gz + +- @rm -f $(R_SBINDIR)/dphys-swapfile ++ @rm -f $(SBINDIR)/dphys-swapfile + + + # --- project management stuff
