[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1054137: marked as done (apt: let dh_installsystemd choose the location of units)

Your message dated Tue, 20 Feb 2024 19:04:08 +0000
with message-id <E1rcVPU-001iM2-AS@fasolo.debian.org>
and subject line Bug#1054137: fixed in apt 2.7.12
has caused the Debian Bug report #1054137,
regarding apt: let dh_installsystemd choose the location of units
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1054137: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1054137
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: apt
Version: 2.7.6
Tags: patch
User: helmutg@debian.org
Usertags: dep17m2

We want to move aliased files from / to /usr to finalize the /usr-merge
transition via DEP17. apt is involved, because it install systemd units.
It currently hard codes their location to /lib/systemd/system. Rather
than moving them to /usr directly, I recommend using dh_installsystemd,
because backports will automatically revert back to the previous
location honouring the file move moratorium in bookworm. I'm attaching a
patch for your convenience. Once dh_installsystemd is updated and apt
binNMUed, it will have no files left in aliased locations.

Helmut

diff -Nru apt-2.7.6/debian/apt-daily-upgrade.service apt-2.7.6+nmu1/debian/apt-daily-upgrade.service
--- apt-2.7.6/debian/apt-daily-upgrade.service	2023-09-20 10:25:26.000000000 +0200
+++ apt-2.7.6+nmu1/debian/apt-daily-upgrade.service	1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-[Unit]
-Description=Daily apt upgrade and clean activities
-Documentation=man:apt(8)
-ConditionACPower=true
-After=apt-daily.service network.target network-online.target systemd-networkd.service NetworkManager.service connman.service
-
-[Service]
-Type=oneshot
-ExecStartPre=-/usr/lib/apt/apt-helper wait-online
-ExecStart=/usr/lib/apt/apt.systemd.daily install
-KillMode=process
-TimeoutStopSec=900
diff -Nru apt-2.7.6/debian/apt-daily-upgrade.timer apt-2.7.6+nmu1/debian/apt-daily-upgrade.timer
--- apt-2.7.6/debian/apt-daily-upgrade.timer	2023-09-20 10:25:26.000000000 +0200
+++ apt-2.7.6+nmu1/debian/apt-daily-upgrade.timer	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-[Unit]
-Description=Daily apt upgrade and clean activities
-After=apt-daily.timer
-
-[Timer]
-OnCalendar=*-*-* 6:00
-RandomizedDelaySec=60m
-Persistent=true
-
-[Install]
-WantedBy=timers.target
diff -Nru apt-2.7.6/debian/apt-daily.service apt-2.7.6+nmu1/debian/apt-daily.service
--- apt-2.7.6/debian/apt-daily.service	2023-09-20 10:25:26.000000000 +0200
+++ apt-2.7.6+nmu1/debian/apt-daily.service	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-[Unit]
-Description=Daily apt download activities
-Documentation=man:apt(8)
-ConditionACPower=true
-After=network.target network-online.target systemd-networkd.service NetworkManager.service connman.service
-
-[Service]
-Type=oneshot
-ExecStartPre=-/usr/lib/apt/apt-helper wait-online
-ExecStart=/usr/lib/apt/apt.systemd.daily update
-
diff -Nru apt-2.7.6/debian/apt-daily.timer apt-2.7.6+nmu1/debian/apt-daily.timer
--- apt-2.7.6/debian/apt-daily.timer	2023-09-20 10:25:26.000000000 +0200
+++ apt-2.7.6+nmu1/debian/apt-daily.timer	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-[Unit]
-Description=Daily apt download activities
-
-[Timer]
-OnCalendar=*-*-* 6,18:00
-RandomizedDelaySec=12h
-Persistent=true
-
-[Install]
-WantedBy=timers.target
diff -Nru apt-2.7.6/debian/apt.apt-daily-upgrade.service apt-2.7.6+nmu1/debian/apt.apt-daily-upgrade.service
--- apt-2.7.6/debian/apt.apt-daily-upgrade.service	1970-01-01 01:00:00.000000000 +0100
+++ apt-2.7.6+nmu1/debian/apt.apt-daily-upgrade.service	2023-09-20 10:25:26.000000000 +0200
@@ -0,0 +1,12 @@
+[Unit]
+Description=Daily apt upgrade and clean activities
+Documentation=man:apt(8)
+ConditionACPower=true
+After=apt-daily.service network.target network-online.target systemd-networkd.service NetworkManager.service connman.service
+
+[Service]
+Type=oneshot
+ExecStartPre=-/usr/lib/apt/apt-helper wait-online
+ExecStart=/usr/lib/apt/apt.systemd.daily install
+KillMode=process
+TimeoutStopSec=900
diff -Nru apt-2.7.6/debian/apt.apt-daily-upgrade.timer apt-2.7.6+nmu1/debian/apt.apt-daily-upgrade.timer
--- apt-2.7.6/debian/apt.apt-daily-upgrade.timer	1970-01-01 01:00:00.000000000 +0100
+++ apt-2.7.6+nmu1/debian/apt.apt-daily-upgrade.timer	2023-09-20 10:25:26.000000000 +0200
@@ -0,0 +1,11 @@
+[Unit]
+Description=Daily apt upgrade and clean activities
+After=apt-daily.timer
+
+[Timer]
+OnCalendar=*-*-* 6:00
+RandomizedDelaySec=60m
+Persistent=true
+
+[Install]
+WantedBy=timers.target
diff -Nru apt-2.7.6/debian/apt.apt-daily.service apt-2.7.6+nmu1/debian/apt.apt-daily.service
--- apt-2.7.6/debian/apt.apt-daily.service	1970-01-01 01:00:00.000000000 +0100
+++ apt-2.7.6+nmu1/debian/apt.apt-daily.service	2023-09-20 10:25:26.000000000 +0200
@@ -0,0 +1,11 @@
+[Unit]
+Description=Daily apt download activities
+Documentation=man:apt(8)
+ConditionACPower=true
+After=network.target network-online.target systemd-networkd.service NetworkManager.service connman.service
+
+[Service]
+Type=oneshot
+ExecStartPre=-/usr/lib/apt/apt-helper wait-online
+ExecStart=/usr/lib/apt/apt.systemd.daily update
+
diff -Nru apt-2.7.6/debian/apt.apt-daily.timer apt-2.7.6+nmu1/debian/apt.apt-daily.timer
--- apt-2.7.6/debian/apt.apt-daily.timer	1970-01-01 01:00:00.000000000 +0100
+++ apt-2.7.6+nmu1/debian/apt.apt-daily.timer	2023-09-20 10:25:26.000000000 +0200
@@ -0,0 +1,10 @@
+[Unit]
+Description=Daily apt download activities
+
+[Timer]
+OnCalendar=*-*-* 6,18:00
+RandomizedDelaySec=12h
+Persistent=true
+
+[Install]
+WantedBy=timers.target
diff -Nru apt-2.7.6/debian/apt.install apt-2.7.6+nmu1/debian/apt.install
--- apt-2.7.6/debian/apt.install	2023-09-20 10:25:26.000000000 +0200
+++ apt-2.7.6+nmu1/debian/apt.install	2023-10-17 16:12:09.000000000 +0200
@@ -1,5 +1,3 @@
-debian/*.service /lib/systemd/system/
-debian/*.timer /lib/systemd/system/
 debian/apt.systemd.daily usr/lib/apt
 etc/apt/
 usr/bin/apt
diff -Nru apt-2.7.6/debian/changelog apt-2.7.6+nmu1/debian/changelog
--- apt-2.7.6/debian/changelog	2023-09-20 10:25:26.000000000 +0200
+++ apt-2.7.6+nmu1/debian/changelog	2023-10-17 16:12:19.000000000 +0200
@@ -1,3 +1,10 @@
+apt (2.7.6+nmu1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Let dh_installsystemd choose the location of units. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Tue, 17 Oct 2023 16:12:19 +0200
+
 apt (2.7.6) unstable; urgency=medium
 
   [ Américo Monteiro ]
diff -Nru apt-2.7.6/debian/rules apt-2.7.6+nmu1/debian/rules
--- apt-2.7.6/debian/rules	2023-09-20 10:25:26.000000000 +0200
+++ apt-2.7.6+nmu1/debian/rules	2023-10-17 16:12:02.000000000 +0200
@@ -40,8 +40,10 @@
 	# Do not restart "apt-daily.service" because this script runs
 	# unattended-upgrades. So if apt itself is upgraded as part of
 	# an unattended-upgrades run it would kill itself
-	dh_installsystemd -papt apt-daily.timer apt-daily-upgrade.timer
-	dh_installsystemd -papt --no-restart-on-upgrade --no-restart-after-upgrade --no-start apt-daily.service apt-daily-upgrade.service
+	dh_installsystemd -papt --name apt-daily --no-restart-on-upgrade --no-restart-after-upgrade --no-start apt-daily.service
+	dh_installsystemd -papt --name apt-daily apt-daily.timer
+	dh_installsystemd -papt --name apt-daily-upgrade --no-restart-on-upgrade --no-restart-after-upgrade --no-start apt-daily-upgrade.service
+	dh_installsystemd -papt --name apt-daily-upgrade apt-daily-upgrade.timer
 	dh_installsystemd --remaining-packages
 
 ifneq ($(filter pkg.apt.nodoxygen,$(DEB_BUILD_PROFILES)),)

--- End Message ---
--- Begin Message --- 
Source: apt
Source-Version: 2.7.12
Done: Julian Andres Klode <jak@debian.org>

We believe that the bug you reported is fixed in the latest version of
apt, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1054137@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Julian Andres Klode <jak@debian.org> (supplier of updated apt package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Tue, 20 Feb 2024 19:38:02 +0100
Source: apt
Architecture: source
Version: 2.7.12
Distribution: unstable
Urgency: medium
Maintainer: APT Development Team <deity@lists.debian.org>
Changed-By: Julian Andres Klode <jak@debian.org>
Closes: 827785 1054137
Changes:
 apt (2.7.12) unstable; urgency=medium
 .
   [ Kenyon Ralph ]
   * apt-key: remove carriage returns from armored keyrings before dearmoring
 .
   [ наб ]
   * apt.8: summarise remaining verbs (Closes: #827785)
 .
   [ Adam Saponara ]
   * Prevent infinite loop in `ReadConfigFile`
 .
   [ Gábor Németh ]
   * Typos in integration tests
   * Document 'dist-clean'
 .
   [ Wesley Schwengle ]
   * Configure the amount of kernels to keep
   * Fix bug where ./git-clang-format.sh errors incorrectly
   * Add documentation of autoremove to apt.conf (5)
 .
   [ Julian Andres Klode ]
   * Bump Ubuntu apt-key deprecation notice to 24.04
   * Modernize standard library includes
   * Automatically enable snapshots where supported
   * test-snapshot: Fix a test case
   * Move systemd units to /usr/lib (Closes: #1054137)
Checksums-Sha1:
 0348c478946d054ee98e7239aa780391ee35e855 2935 apt_2.7.12.dsc
 9cbf273c3e7b6c3f366491103fa9fe2a8bba52d0 2350828 apt_2.7.12.tar.xz
 bb1d70854ba66576987d9b4f66267b49791bcea6 7947 apt_2.7.12_source.buildinfo
Checksums-Sha256:
 2ca5e44c888a1e485ccd5ef0d3a653f718c6615d499c38c6696fad978f6c03dd 2935 apt_2.7.12.dsc
 e46d166b5fc887c2d9bca7add7e0ccda547b962b762e1272a08c0426baa99caf 2350828 apt_2.7.12.tar.xz
 6ee511dd8c39919a5e02aebf96a452331e4fc5b80d34892ac6602722dced9105 7947 apt_2.7.12_source.buildinfo
Files:
 480e09ae847d62ec15abf1d96dc52d09 2935 admin required apt_2.7.12.dsc
 449dc774c1bb3e4a6abd534b7070d8c3 2350828 admin required apt_2.7.12.tar.xz
 515034fd0b372c605546ab0f1a4c3e36 7947 admin required apt_2.7.12_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQJDBAEBCgAtFiEET7WIqEwt3nmnTHeHb6RY3R2wP3EFAmXU8loPHGpha0BkZWJp
YW4ub3JnAAoJEG+kWN0dsD9xoW0QAIJfJBd/jZYpcoXbUS+aIEtj56F0tfyMbFSl
yyI8/0bAMpY6ARpYk7FnwYHXe8NxpM3lfOxnhuWerqd5ofaJvkAD62uoo/EjHSPG
LQvZHwe+/yv8Vvb4H6DYcFxQ1ILQx4XxVS2snGXyesJpgGdc9px7cVnhHdnyoUhA
uA2ujwHg74grnf7hds4RCrm7yNcJIEwnOjr+ObIBslnsvK7m6I8/EdAe8+YQtiYn
5ypvFC7f3aoX7DiSVYiPtHNF/nHyVQwExrutjKhkaieqdM9HLonIJUgqnwhYzrck
uQCaf4265sIhI8mEuHKFdtKpcLQILYziQCnIn2oHuwz7FXEQ7dVvL3W53Y/VOI+F
+hksZtVcs+LzWce61ncN/SwuCDqT+DnUeot8LDIaXi2orSWS1/Fs4tUK9Hgn0fOQ
NWkFbmOGzQb4QlzDKG2YvsWRtTCx20C0IlAWSkSE9rVrpNCUaVtZdkwZH6F4guTE
IQ5CXrLdDHEiDnxjHprdW6JKjX0wER6ZAWjPHNtdvnvfCjZIOzD2VBZJEeoV2Ox+
aEddulEVHsFmHu9NFDsnCUQc6MAmr5Lq/vhEXo1jLSKRFMC+RH49mgeXQnSP0Ewx
LAkBpq7xPXhz6MyCR9wrkjsvZ3Ta74epQM5+Mac9LpwTniRv6iGZMbFu17U65f+x
xzsZJpDB
=pE6m
-----END PGP SIGNATURE-----

Attachment: pgpX74rN4pElt.pgp
Description: PGP signature


--- End Message ---
Reply to: