Bug#1059177: makedev: move files from / to /usr

2024-01-19 Thread Chris Hofstaedtler
On Wed, Dec 20, 2023 at 11:53:15PM +0100, Chris Hofstaedtler wrote:
> Source: makedev
[..]
> your package installs MAKEDEV directly into /sbin. For the ongoing
> Debian UsrMerge effort [1] it should move to /usr/sbin in the trixie
> cycle.

I've uploaded the patch as makedev_2.3.1-97.1_source.changes to
DELAYED/7, and pushed an "nmu" branch to salsa.d.o.

Chris



Bug#1059177: makedev: move files from / to /usr

2023-12-20 Thread Chris Hofstaedtler
Source: makedev
Version: 2.3.1-97
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Dear Maintainer,

your package installs MAKEDEV directly into /sbin. For the ongoing
Debian UsrMerge effort [1] it should move to /usr/sbin in the trixie
cycle.

For your convenience, I'm attaching a patch. Please upload to
experimental first, and then after a few days to unstable. This way,
the dumat tool [1] gets to check your package and can report new
issues.

If during the trixie cycle your package will undergo structural
changes or any other file moves, please see the wiki and upload to
experimental first when these changes are done.

Thank you for considering,
Chris

[1] https://wiki.debian.org/UsrMerge
diff -Nru makedev-2.3.1/debian/changelog makedev-2.3.1/debian/changelog
--- makedev-2.3.1/debian/changelog	2022-06-03 14:07:08.0 +0200
+++ makedev-2.3.1/debian/changelog	2023-12-20 23:10:49.0 +0100
@@ -1,3 +1,10 @@
+makedev (2.3.1-97.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install into /usr/sbin instead of /sbin. (Closes: #-1)
+
+ -- Chris Hofstaedtler   Wed, 20 Dec 2023 23:10:49 +0100
+
 makedev (2.3.1-97) unstable; urgency=medium
 
   * debian/control: reverted relationship removal. (Closes: #1012283)
diff -Nru makedev-2.3.1/debian/dirs makedev-2.3.1/debian/dirs
--- makedev-2.3.1/debian/dirs	2022-06-03 14:07:08.0 +0200
+++ makedev-2.3.1/debian/dirs	2023-12-20 23:10:02.0 +0100
@@ -1,2 +1,2 @@
-sbin
+usr/sbin
 usr/share/man/man8
diff -Nru makedev-2.3.1/debian/rules makedev-2.3.1/debian/rules
--- makedev-2.3.1/debian/rules	2022-06-03 14:07:08.0 +0200
+++ makedev-2.3.1/debian/rules	2023-12-20 23:10:49.0 +0100
@@ -5,4 +5,4 @@
 	dh $@
 
 override_dh_auto_install:
-	dh_auto_install -- ROOT=debian/makedev
+	dh_auto_install -- ROOT=debian/makedev BINDIR=debian/makedev/usr/sbin