Source: atop Version: 2.10.0-1 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2
Your package currently installs this file: /lib/systemd/system-sleep/atop-pm Please find a patch attached to install it into /usr, 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, preferably before the time_t-64bit transition. 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 atop-2.10.0/debian/changelog atop-2.10.0/debian/changelog --- atop-2.10.0/debian/changelog 2024-01-06 07:07:38.000000000 +0100 +++ atop-2.10.0/debian/changelog 2024-01-09 19:37:36.000000000 +0100 @@ -1,3 +1,10 @@ +atop (2.10.0-1.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Honor systemd.pc's systemdsleepdir for DEP17. (Closes: #-1) + + -- Chris Hofstaedtler <z...@debian.org> Tue, 09 Jan 2024 19:37:36 +0100 + atop (2.10.0-1) unstable; urgency=medium * new upstream version 2.10.0 diff -Nru atop-2.10.0/debian/control atop-2.10.0/debian/control --- atop-2.10.0/debian/control 2024-01-06 07:07:38.000000000 +0100 +++ atop-2.10.0/debian/control 2024-01-09 19:37:17.000000000 +0100 @@ -4,7 +4,7 @@ Maintainer: Marc Haber <a...@packages.debian.org> Uploaders: Marc Haber <mh+debian-packa...@zugschlus.de> Build-Depends: debhelper-compat (= 13), zlib1g-dev, libncurses-dev, - libglib2.0-dev + libglib2.0-dev, pkgconf, systemd-dev Standards-Version: 4.6.2 Rules-Requires-Root: no Homepage: https://atoptool.nl/ diff -Nru atop-2.10.0/debian/rules atop-2.10.0/debian/rules --- atop-2.10.0/debian/rules 2024-01-06 07:07:38.000000000 +0100 +++ atop-2.10.0/debian/rules 2024-01-09 19:37:36.000000000 +0100 @@ -9,6 +9,7 @@ # see ENVIRONMENT in dpkg-buildflags(1) # package maintainers to append CFLAGS export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +export deb_systemdsleepdir = $(shell pkg-config --variable=systemdsleepdir systemd) DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk @@ -26,12 +27,12 @@ dh_installinit --name=atop override_dh_auto_install: - dh_auto_install + dh_auto_install -- PMPATHD=${deb_systemdsleepdir} make sysvinstall DESTDIR=$(shell pwd)/debian/atop - make install DESTDIR=$(shell pwd)/debian/atop + make install DESTDIR=$(shell pwd)/debian/atop PMPATHD=${deb_systemdsleepdir} mv debian/atop/lib/systemd/system/atop-rotate.timer debian/atop.atop-rotate.timer mv debian/atop/lib/systemd/system/atop-rotate.service debian/atop.atop-rotate.service - rmdir debian/atop/lib/systemd/system + rmdir --parents --ignore-fail-on-non-empty debian/atop/lib/systemd/system cp atop.default debian/atop.default cp atop.service debian/atop.service cp atop.default debian/atop.default
