Bug#1051458: painintheapt: move systemd units to /usr

[Martin]

On 2023-12-08 22:16, Chris Hofstaedtler wrote:
> Is there any way we can help you out? Are there problems with the
> patch Helmut sent?

No problem, just -ENOTIME.
Uploading right now.
Thanks for the patch!

Bug#1051458: painintheapt: move systemd units to /usr

[Chris Hofstaedtler]

Dear painintheapt Maintainers,

On Fri, Sep 08, 2023 at 11:10:18AM +0200, Helmut Grohne wrote:
> Are you fine with uploading this change at this early stage
> of the transition?

It's no longer that "early stage", and systemd units can and should
move at this point.

Is there any way we can help you out? Are there problems with the
patch Helmut sent?

Thanks,
Chris

Bug#1051458: painintheapt: move systemd units to /usr

[Helmut Grohne]

Source: painintheapt
Version: 0.20220226-2
Severity: wishlist
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Hi,

painintheapt happens to be affected by the /usr-merge by virtue of
including systemd units. The CTTE has recommended not moving such units
from / to /usr to avoid problems such as file loss. These problems are
better understood and documented at
https://subdivi.de/~helmut/dep17.html. I'm looking into lifting the
moratorium in a controlled way and propose this patch as a test case for
it. Yes, this patch expressly violates the moratorium. I've taken care
to update debhelper to recognize the new location. No problems shall
arise unless you restructure painintheapt (renaming the binary package,
splitting it, moving files between packages). If you do such activity
within the trixie cycle, please upload to experimental first such that
https://salsa.debian.org/helmutg/dumat can tell you whether the
particular change is problematic. In case of problems, I'll be
assisting. Are you fine with uploading this change at this early stage
of the transition?

Thanks for considering

Helmut
diff --minimal -Nru painintheapt-0.20220226/debian/changelog 
painintheapt-0.20220226/debian/changelog
--- painintheapt-0.20220226/debian/changelog2023-02-28 22:31:14.0 
+0100
+++ painintheapt-0.20220226/debian/changelog2023-09-08 11:00:14.0 
+0200
@@ -1,3 +1,10 @@
+painintheapt (0.20220226-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Move systemd units to /usr. (Closes: #-1)
+
+ -- Helmut Grohne   Fri, 08 Sep 2023 11:00:14 +0200
+
 painintheapt (0.20220226-2) unstable; urgency=medium
 
   * Add debian/watch
diff --minimal -Nru painintheapt-0.20220226/debian/control 
painintheapt-0.20220226/debian/control
--- painintheapt-0.20220226/debian/control  2022-02-26 02:52:22.0 
+0100
+++ painintheapt-0.20220226/debian/control  2023-09-08 11:00:14.0 
+0200
@@ -4,6 +4,7 @@
 Maintainer: Debian XMPP Maintainers 
 Uploaders: Martin 
 Build-Depends: debhelper-compat (= 13),
+debhelper (>= 13.11.6~),
python3,
dh-python,
python3-docutils,
diff --minimal -Nru painintheapt-0.20220226/debian/install 
painintheapt-0.20220226/debian/install
--- painintheapt-0.20220226/debian/install  2022-02-26 02:49:36.0 
+0100
+++ painintheapt-0.20220226/debian/install  2023-09-08 11:00:11.0 
+0200
@@ -1,4 +1,4 @@
 painintheapt /usr/sbin/
 painintheapt.conf /etc/
-*.service /lib/systemd/system/
-*.timer /lib/systemd/system/
+*.service /usr/lib/systemd/system/
+*.timer /usr/lib/systemd/system/