Source: tomoyo-tools
Version: 2.6.1-20210910-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Please find a patch attached to install tomoyo-init into
*/usr*/sbin, 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.

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 tomoyo-tools-2.6.1-20210910/debian/changelog tomoyo-tools-2.6.1-20210910/debian/changelog
--- tomoyo-tools-2.6.1-20210910/debian/changelog	2021-10-24 16:31:53.000000000 +0200
+++ tomoyo-tools-2.6.1-20210910/debian/changelog	2024-01-09 23:05:23.000000000 +0100
@@ -1,3 +1,10 @@
+tomoyo-tools (2.6.1-20210910-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install into /usr (DEP17 M2)
+
+ -- Chris Hofstaedtler <z...@debian.org>  Tue, 09 Jan 2024 23:05:23 +0100
+
 tomoyo-tools (2.6.1-20210910-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru tomoyo-tools-2.6.1-20210910/debian/rules tomoyo-tools-2.6.1-20210910/debian/rules
--- tomoyo-tools-2.6.1-20210910/debian/rules	2021-10-24 16:31:53.000000000 +0200
+++ tomoyo-tools-2.6.1-20210910/debian/rules	2024-01-09 23:05:11.000000000 +0100
@@ -8,4 +8,4 @@
 	dh $@
 
 override_dh_auto_install:
-	dh_auto_install -- INSTALLDIR=$(CURDIR)/debian/tmp
+	dh_auto_install -- INSTALLDIR=$(CURDIR)/debian/tmp SBINDIR=/usr/sbin
diff -Nru tomoyo-tools-2.6.1-20210910/debian/tomoyo-tools.install tomoyo-tools-2.6.1-20210910/debian/tomoyo-tools.install
--- tomoyo-tools-2.6.1-20210910/debian/tomoyo-tools.install	2021-10-24 16:31:53.000000000 +0200
+++ tomoyo-tools-2.6.1-20210910/debian/tomoyo-tools.install	2024-01-09 23:05:23.000000000 +0100
@@ -1,3 +1,2 @@
-debian/tmp/sbin/tomoyo-init
 usr/sbin/*
 usr/lib/tomoyo/*

Reply via email to