Source: msktutil
Version: 1.2.1-1
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
We want to move aliased files from / to /usr to finalize the /usr-merge
transition via DEP17. msktutil is involved, because it installs a
systemd unit. Rather than hard code /usr now, I recommend installing the
units using dh_installsystemd such that backports to bookworm will
automatically revert back to the old location. I'm attaching a patch for
your convenience.
Helmut
diff -Nru msktutil-1.2.1/debian/changelog msktutil-1.2.1/debian/changelog
--- msktutil-1.2.1/debian/changelog 2023-10-01 20:08:14.000000000 +0200
+++ msktutil-1.2.1/debian/changelog 2023-10-16 19:45:04.000000000 +0200
@@ -1,3 +1,10 @@
+msktutil (1.2.1-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Let dh_installsystemd choose the location of units. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Mon, 16 Oct 2023 19:45:04 +0200
+
msktutil (1.2.1-1) unstable; urgency=medium
[ Debian Janitor ]
diff -Nru msktutil-1.2.1/debian/msktutil-auto-update.service
msktutil-1.2.1/debian/msktutil-auto-update.service
--- msktutil-1.2.1/debian/msktutil-auto-update.service 2023-10-01
20:08:14.000000000 +0200
+++ msktutil-1.2.1/debian/msktutil-auto-update.service 1970-01-01
01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-[Unit]
-Description=Run msktutil-auto-update if configured in /etc/default/msktutil
-Documentation=man:msktutil(8)
-
-[Service]
-EnvironmentFile=/etc/default/msktutil
-ExecCondition=/bin/sh -a -c "[ \"${AUTOUPDATE_ENABLED}\" = \"true\" ]"
-ExecStart=/usr/sbin/msktutil --auto-update $AUTOUPDATE_OPTIONS
diff -Nru msktutil-1.2.1/debian/msktutil-auto-update.timer
msktutil-1.2.1/debian/msktutil-auto-update.timer
--- msktutil-1.2.1/debian/msktutil-auto-update.timer 2023-10-01
20:08:14.000000000 +0200
+++ msktutil-1.2.1/debian/msktutil-auto-update.timer 1970-01-01
01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-[Unit]
-Description=Run msktutil-auto-update service daily
-
-[Timer]
-OnCalendar=Mon..Sun *-*-* 06:25:00
-Persistent=true
-Unit=msktutil-auto-update.service
-
-[Install]
-WantedBy=timers.target
diff -Nru msktutil-1.2.1/debian/msktutil.msktutil-auto-update.service
msktutil-1.2.1/debian/msktutil.msktutil-auto-update.service
--- msktutil-1.2.1/debian/msktutil.msktutil-auto-update.service 1970-01-01
01:00:00.000000000 +0100
+++ msktutil-1.2.1/debian/msktutil.msktutil-auto-update.service 2023-10-01
20:08:14.000000000 +0200
@@ -0,0 +1,8 @@
+[Unit]
+Description=Run msktutil-auto-update if configured in /etc/default/msktutil
+Documentation=man:msktutil(8)
+
+[Service]
+EnvironmentFile=/etc/default/msktutil
+ExecCondition=/bin/sh -a -c "[ \"${AUTOUPDATE_ENABLED}\" = \"true\" ]"
+ExecStart=/usr/sbin/msktutil --auto-update $AUTOUPDATE_OPTIONS
diff -Nru msktutil-1.2.1/debian/msktutil.msktutil-auto-update.timer
msktutil-1.2.1/debian/msktutil.msktutil-auto-update.timer
--- msktutil-1.2.1/debian/msktutil.msktutil-auto-update.timer 1970-01-01
01:00:00.000000000 +0100
+++ msktutil-1.2.1/debian/msktutil.msktutil-auto-update.timer 2023-10-01
20:08:14.000000000 +0200
@@ -0,0 +1,10 @@
+[Unit]
+Description=Run msktutil-auto-update service daily
+
+[Timer]
+OnCalendar=Mon..Sun *-*-* 06:25:00
+Persistent=true
+Unit=msktutil-auto-update.service
+
+[Install]
+WantedBy=timers.target
diff -Nru msktutil-1.2.1/debian/rules msktutil-1.2.1/debian/rules
--- msktutil-1.2.1/debian/rules 2023-10-01 20:08:14.000000000 +0200
+++ msktutil-1.2.1/debian/rules 2023-10-16 19:45:03.000000000 +0200
@@ -7,16 +7,5 @@
%:
dh $@
-override_dh_auto_install:
- install -d debian/msktutil/lib/systemd/system
- install -m 644 \
- debian/msktutil-auto-update.service \
- debian/msktutil/lib/systemd/system/msktutil-auto-update.service
- install -m 644 \
- debian/msktutil-auto-update.timer \
- debian/msktutil/lib/systemd/system/msktutil-auto-update.timer
- dh_auto_install
-
override_dh_installsystemd:
- dh_installsystemd msktutil-auto-update.service \
- msktutil-auto-update.timer
+ dh_installsystemd --name msktutil-auto-update
