Source: hfsprogs
Version: 540.1.linux3-5
Severity: normal
Tags: patch
User: [email protected]
Usertags: dep17m2

Please find a patch attached to install aliased files into /usr,
for the currently ongoing UsrMerge effort [1].
It has been build-tested and checked by dumat.

Please review it and upload to unstable during the trixie cycle,
preferably before the time_t-64bit transition.

Note: this should not be backported to bookworm. If you intend to
backport, please use dh_movetousr instead.

If your package will change for the t64 transition or otherwise
rename/split/move its binaries (packages) during trixie, please
then upload to experimental and get in touch with the UsrMerge
driver, please see the wiki [1].

Chris

[1] https://wiki.debian.org/UsrMerge
diff -Nru hfsprogs-540.1.linux3/debian/changelog hfsprogs-540.1.linux3/debian/changelog
--- hfsprogs-540.1.linux3/debian/changelog	2021-03-08 10:28:00.000000000 +0100
+++ hfsprogs-540.1.linux3/debian/changelog	2024-01-07 12:01:39.000000000 +0100
@@ -1,3 +1,10 @@
+hfsprogs (540.1.linux3-5.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install aliased files into /usr (DEP17 M2) (Closes: #-1)
+
+ -- Chris Hofstaedtler <[email protected]>  Sun, 07 Jan 2024 12:01:39 +0100
+
 hfsprogs (540.1.linux3-5) unstable; urgency=medium
 
   * Add hfsprogs-udeb package to debian/control
diff -Nru hfsprogs-540.1.linux3/debian/dirs hfsprogs-540.1.linux3/debian/dirs
--- hfsprogs-540.1.linux3/debian/dirs	2021-03-08 10:03:25.000000000 +0100
+++ hfsprogs-540.1.linux3/debian/dirs	2024-01-07 11:59:15.000000000 +0100
@@ -1,3 +1,3 @@
-sbin
+usr/sbin
 usr/share/hfsprogs
 usr/share/man/man8
diff -Nru hfsprogs-540.1.linux3/debian/hfsprogs.install hfsprogs-540.1.linux3/debian/hfsprogs.install
--- hfsprogs-540.1.linux3/debian/hfsprogs.install	2021-03-08 10:21:05.000000000 +0100
+++ hfsprogs-540.1.linux3/debian/hfsprogs.install	2024-01-07 11:59:07.000000000 +0100
@@ -1,6 +1,6 @@
 #!/usr/bin/dh-exec
 debian/hfsbootdata.img      => usr/share/misc/hfsbootdata
-fsck_hfs.tproj/fsck_hfs     => sbin/fsck.hfsplus
-newfs_hfs.tproj/newfs_hfs   => sbin/mkfs.hfsplus
+fsck_hfs.tproj/fsck_hfs     => usr/sbin/fsck.hfsplus
+newfs_hfs.tproj/newfs_hfs   => usr/sbin/mkfs.hfsplus
 fsck_hfs.tproj/fsck_hfs.8   => usr/share/man/man8/fsck.hfsplus.8
 newfs_hfs.tproj/newfs_hfs.8 => usr/share/man/man8/mkfs.hfsplus.8
diff -Nru hfsprogs-540.1.linux3/debian/hfsprogs.links hfsprogs-540.1.linux3/debian/hfsprogs.links
--- hfsprogs-540.1.linux3/debian/hfsprogs.links	2021-03-08 10:21:05.000000000 +0100
+++ hfsprogs-540.1.linux3/debian/hfsprogs.links	2024-01-07 11:59:32.000000000 +0100
@@ -1,4 +1,4 @@
-sbin/fsck.hfsplus			sbin/fsck.hfs
-sbin/mkfs.hfsplus			sbin/mkfs.hfs
+usr/sbin/fsck.hfsplus			usr/sbin/fsck.hfs
+usr/sbin/mkfs.hfsplus			usr/sbin/mkfs.hfs
 usr/share/man/man8/fsck.hfsplus.8	usr/share/man/man8/fsck.hfs.8
 usr/share/man/man8/mkfs.hfsplus.8	usr/share/man/man8/mkfs.hfs.8
diff -Nru hfsprogs-540.1.linux3/debian/hfsprogs-udeb.install hfsprogs-540.1.linux3/debian/hfsprogs-udeb.install
--- hfsprogs-540.1.linux3/debian/hfsprogs-udeb.install	2021-03-08 10:21:05.000000000 +0100
+++ hfsprogs-540.1.linux3/debian/hfsprogs-udeb.install	2024-01-07 11:59:48.000000000 +0100
@@ -1,4 +1,4 @@
 #!/usr/bin/dh-exec
 debian/hfsbootdata.img => usr/share/misc/hfsbootdata
-fsck_hfs.tproj/fsck_hfs => sbin/fsck.hfsplus
-newfs_hfs.tproj/newfs_hfs => sbin/mkfs.hfsplus
+fsck_hfs.tproj/fsck_hfs => usr/sbin/fsck.hfsplus
+newfs_hfs.tproj/newfs_hfs => usr/sbin/mkfs.hfsplus
diff -Nru hfsprogs-540.1.linux3/debian/hfsprogs-udeb.links hfsprogs-540.1.linux3/debian/hfsprogs-udeb.links
--- hfsprogs-540.1.linux3/debian/hfsprogs-udeb.links	2021-03-08 10:21:05.000000000 +0100
+++ hfsprogs-540.1.linux3/debian/hfsprogs-udeb.links	2024-01-07 11:59:57.000000000 +0100
@@ -1,2 +1,2 @@
-sbin/fsck.hfsplus sbin/fsck.hfs
-sbin/mkfs.hfsplus sbin/mkfs.hfs
+usr/sbin/fsck.hfsplus usr/sbin/fsck.hfs
+usr/sbin/mkfs.hfsplus usr/sbin/mkfs.hfs

Reply via email to