Source: debci Version: 3.6 Tags: patch User: helm...@debian.org Usertags: dep17m2
We want to change dh_installsystemd to install units to /usr to finalize the /usr-merge transition via DEP17. When doing so, at least one unit is installed to both /usr/lib/systemd/system (via dh_installsystemd) and /lib/systemd/system (via dh_install). Doing so is a policy violation. I'm attaching a patch for your convenience. Once I upload debhelper, this bug will become release critical. Helmut
diff -Nru debci-3.6/debian/changelog debci-3.6+nmu1/debian/changelog --- debci-3.6/debian/changelog 2023-02-26 16:08:48.000000000 +0100 +++ debci-3.6+nmu1/debian/changelog 2023-10-18 14:23:50.000000000 +0200 @@ -1,3 +1,10 @@ +debci (3.6+nmu1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install units with dh_installsystemd only. (Closes: #-1) + + -- Helmut Grohne <hel...@subdivi.de> Wed, 18 Oct 2023 14:23:50 +0200 + debci (3.6) unstable; urgency=medium [ Louis-Philippe Véronneau ] diff -Nru debci-3.6/debian/debci-collector.debci-update.service debci-3.6+nmu1/debian/debci-collector.debci-update.service --- debci-3.6/debian/debci-collector.debci-update.service 1970-01-01 01:00:00.000000000 +0100 +++ debci-3.6+nmu1/debian/debci-collector.debci-update.service 2023-02-26 16:08:48.000000000 +0100 @@ -0,0 +1,10 @@ +[Unit] +Description=debci index generator +Documentation=https://ci.debian.net/doc/ + +[Service] +Type=oneshot +User=debci +Group=debci +ExecStart=/bin/sleep 1s +ExecStart=/usr/bin/debci update diff -Nru debci-3.6/debian/debci-collector.debci-update.timer debci-3.6+nmu1/debian/debci-collector.debci-update.timer --- debci-3.6/debian/debci-collector.debci-update.timer 1970-01-01 01:00:00.000000000 +0100 +++ debci-3.6+nmu1/debian/debci-collector.debci-update.timer 2023-02-26 16:08:48.000000000 +0100 @@ -0,0 +1,8 @@ +[Unit] +Description=debci update timer + +[Timer] +OnCalendar=*:0/5 + +[Install] +WantedBy=timers.target diff -Nru debci-3.6/debian/debci-collector.install debci-3.6+nmu1/debian/debci-collector.install --- debci-3.6/debian/debci-collector.install 2023-02-26 16:08:48.000000000 +0100 +++ debci-3.6+nmu1/debian/debci-collector.install 2023-10-18 14:22:54.000000000 +0200 @@ -1,6 +1,3 @@ -debian/debci-update.service lib/systemd/system/ -debian/debci-update.timer lib/systemd/system/ - bin/debci-expire usr/share/debci/bin bin/debci-update usr/share/debci/bin bin/debci-status usr/share/debci/bin diff -Nru debci-3.6/debian/debci-update.service debci-3.6+nmu1/debian/debci-update.service --- debci-3.6/debian/debci-update.service 2023-02-26 16:08:48.000000000 +0100 +++ debci-3.6+nmu1/debian/debci-update.service 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -[Unit] -Description=debci index generator -Documentation=https://ci.debian.net/doc/ - -[Service] -Type=oneshot -User=debci -Group=debci -ExecStart=/bin/sleep 1s -ExecStart=/usr/bin/debci update diff -Nru debci-3.6/debian/debci-update.timer debci-3.6+nmu1/debian/debci-update.timer --- debci-3.6/debian/debci-update.timer 2023-02-26 16:08:48.000000000 +0100 +++ debci-3.6+nmu1/debian/debci-update.timer 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -[Unit] -Description=debci update timer - -[Timer] -OnCalendar=*:0/5 - -[Install] -WantedBy=timers.target diff -Nru debci-3.6/debian/debci-worker.install debci-3.6+nmu1/debian/debci-worker.install --- debci-3.6/debian/debci-worker.install 2023-02-26 16:08:48.000000000 +0100 +++ debci-3.6+nmu1/debian/debci-worker.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -debian/debci-worker@.service lib/systemd/system/ diff -Nru debci-3.6/debian/rules debci-3.6+nmu1/debian/rules --- debci-3.6/debian/rules 2023-02-26 16:08:48.000000000 +0100 +++ debci-3.6+nmu1/debian/rules 2023-10-18 14:23:24.000000000 +0200 @@ -19,6 +19,9 @@ override_dh_installinit: @true +execute_after_dh_installsystemd: + dh_installsystemd -pdebci-collector --name=debci-update + override_dh_install: dh_install debian/sanity-check
