Your message dated Sat, 27 Jan 2024 00:34:09 +0000
with message-id <[email protected]>
and subject line Bug#1057771: fixed in battery-stats 0.5.6-2.1
has caused the Debian Bug report #1057771,
regarding battery-stats: delegate placement of systemd/udev files to pkg-config
data
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 [email protected]
immediately.)
--
1057771: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1057771
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: battery-stats
Version: 0.5.6-2
Severity: normal
Tags: patch
User: [email protected]
Usertags: dep17m2
Dear Maintainer,
your package installs files related to systemd and udev, into /lib.
These files need to be moved to /usr/lib as part of Debian's
usr-merge effort [1].
Attached you will find a patch to delegate the exact placement to
systemd.pc/udev.pc (using pkg-config). This should work today in
unstable and, if necessary, for bookworm. Once udev.pc in unstable
points to /usr/lib your package will benefit automatically after a
binNMU or any other upload. systemd.pc in unstable already points to
/usr/lib.
The same patch can be found here as a salsa merge request:
https://salsa.debian.org/debian/battery-stats/-/merge_requests/3
Most of the patch really changes the upstream build system, and it
should be suitable for upstream too.
Later during the trixie cycle I expect this bug class to raise in
priority.
Per the wiki, it is advisable to upload to experimental first, and
wait a few days for the dumat tool to check your package. The same
is advisable when any structural changes are done in the trixie
cycle.
Thank you for considering,
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru battery-stats-0.5.6/debian/changelog battery-stats-0.5.6/debian/changelog
--- battery-stats-0.5.6/debian/changelog 2021-11-13 14:00:48.000000000 +0100
+++ battery-stats-0.5.6/debian/changelog 2023-12-07 23:11:15.000000000 +0100
@@ -1,3 +1,10 @@
+battery-stats (0.5.6-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Delegate placement of udev and systemd files to pkg-config data
+
+ -- Chris Hofstaedtler <[email protected]> Thu, 07 Dec 2023 23:11:15 +0100
+
battery-stats (0.5.6-2) unstable; urgency=medium
[ Ondřej Nový ]
diff -Nru battery-stats-0.5.6/debian/control battery-stats-0.5.6/debian/control
--- battery-stats-0.5.6/debian/control 2021-11-13 13:37:03.000000000 +0100
+++ battery-stats-0.5.6/debian/control 2023-12-07 23:10:25.000000000 +0100
@@ -8,7 +8,9 @@
cmake,
gnuplot-nox (>= 4) | gnuplot-qt,
libtext-csv-perl,
- imagemagick
+ imagemagick,
+ pkgconf,
+ systemd-dev
Standards-Version: 4.5.0
Homepage: https://github.com/petterreinholdtsen/battery-stats/
Vcs-Browser: https://salsa.debian.org/debian/battery-stats
diff -Nru battery-stats-0.5.6/debian/patches/1001-Use-systemd-pkgconfig-data.patch battery-stats-0.5.6/debian/patches/1001-Use-systemd-pkgconfig-data.patch
--- battery-stats-0.5.6/debian/patches/1001-Use-systemd-pkgconfig-data.patch 1970-01-01 01:00:00.000000000 +0100
+++ battery-stats-0.5.6/debian/patches/1001-Use-systemd-pkgconfig-data.patch 2023-12-07 23:11:15.000000000 +0100
@@ -0,0 +1,28 @@
+Index: battery-stats-0.5.6/data/CMakeLists.txt
+===================================================================
+--- battery-stats-0.5.6.orig/data/CMakeLists.txt
++++ battery-stats-0.5.6/data/CMakeLists.txt
+@@ -1,3 +1,9 @@
++include(FindPkgConfig)
++pkg_check_modules(UDEV REQUIRED udev)
++pkg_get_variable(UDEV_DIR udev udev_dir)
++pkg_check_modules(SYSTEMD REQUIRED systemd)
++pkg_get_variable(SYSTEMD_SLEEP_DIR systemd systemd_sleep_dir)
++
+ # conf
+ install(FILES
+ conf/battery-stats.conf
+@@ -39,11 +45,11 @@ install(
+ FILE(GLOB SYSTEMDSLEEP_FILES "systemd-system-sleep/*")
+ install(
+ PROGRAMS ${SYSTEMDSLEEP_FILES}
+- DESTINATION /lib/systemd/system-sleep
++ DESTINATION ${SYSTEMD_SLEEP_DIR}
+ )
+
+ FILE(GLOB UDEVRULES_FILES "udev-rules.d/*")
+ install(
+ FILES ${UDEVRULES_FILES}
+- DESTINATION /lib/udev/rules.d
++ DESTINATION ${UDEV_DIR}/rules.d
+ )
diff -Nru battery-stats-0.5.6/debian/patches/series battery-stats-0.5.6/debian/patches/series
--- battery-stats-0.5.6/debian/patches/series 2021-11-13 13:54:23.000000000 +0100
+++ battery-stats-0.5.6/debian/patches/series 2023-12-07 23:10:54.000000000 +0100
@@ -1,2 +1,3 @@
0001-Update-to-python3.patch
1000-add-more-power-supplies-support.patch
+1001-Use-systemd-pkgconfig-data.patch
--- End Message ---
--- Begin Message ---
Source: battery-stats
Source-Version: 0.5.6-2.1
Done: Chris Hofstaedtler <[email protected]>
We believe that the bug you reported is fixed in the latest version of
battery-stats, 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 [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Chris Hofstaedtler <[email protected]> (supplier of updated battery-stats 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 [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sat, 20 Jan 2024 00:52:13 +0100
Source: battery-stats
Architecture: source
Version: 0.5.6-2.1
Distribution: unstable
Urgency: medium
Maintainer: Petter Reinholdtsen <[email protected]>
Changed-By: Chris Hofstaedtler <[email protected]>
Closes: 1057771
Changes:
battery-stats (0.5.6-2.1) unstable; urgency=medium
.
* Non-maintainer upload.
.
[ Aurélien COUDERC ]
* Fix broken battery-stats-graph due to incorrect numpy type of timestamps.
.
[ Debian Janitor ]
* Bump debhelper from old 12 to 13.
* Set upstream metadata fields: Bug-Database, Bug-Submit, Repository-Browse.
* Update standards version to 4.6.2, no changes needed.
* Set upstream metadata fields: Repository.
.
[ Chris Hofstaedtler ]
* Delegate placement of udev and systemd files to pkg-config data
(Closes: #1057771)
Checksums-Sha1:
5f4ee6f52f3354010c389f9b018823a67d7b6f50 2057 battery-stats_0.5.6-2.1.dsc
519b6a302a69b65822b3a62b686ba6706e4dac10 8936
battery-stats_0.5.6-2.1.debian.tar.xz
2287facca32555050f2600753a3ab6eab1e83937 8845
battery-stats_0.5.6-2.1_arm64.buildinfo
Checksums-Sha256:
e3c9f3de102174b5c0ac909b4720fc2590f0df87d123c6a9664489aa0caef126 2057
battery-stats_0.5.6-2.1.dsc
b38b43856c6d7d280145ee51f2b61ffb02717cc9585a54bcb3406483ab25fefe 8936
battery-stats_0.5.6-2.1.debian.tar.xz
354e49002909ae7a54179ecf58f83810d3cf21f64c23710f38c47a1bc9af0572 8845
battery-stats_0.5.6-2.1_arm64.buildinfo
Files:
f9ab3bb1276455344ac2fb4cb38078b4 2057 admin optional
battery-stats_0.5.6-2.1.dsc
2a789ffde926c931c9230b6fb19a19e4 8936 admin optional
battery-stats_0.5.6-2.1.debian.tar.xz
f9352ac723c5f6a75c9e021bfef3a3e0 8845 admin optional
battery-stats_0.5.6-2.1_arm64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEfRrP+tnggGycTNOSXBPW25MFLgMFAmWrC7oACgkQXBPW25MF
LgOlWg//SxfsZK6JC6UuqnqDRdjSKveH9KeaBy1JPuiGh4+fWjOWVO9i4TZ/8X3G
8EpyQA7tmZ2FSDSxNh6vyuAeRSKeTGNjMiVi++tHKblZu3tcmoU5h8kI8Jnbx5mc
kv9Lq4jzJFqHRHQ2NrArQb0DufcOd5WyiGOJ1XCZ2vac5JNGO4g7dP6VFl2axRU/
wpYKOem2ViGgGV2YBxNDvDZEKEWGCpSRI8IuRbX87ytoAY4vvJPymO4Y/pAdlX0h
P6NH85XMHr19TWbJZxISMfXzlxcHhWwKBOBDloiOeVCUBaeVGjebvyT/hdAtOdE4
1rmimkXnzKSXGhxWKHMjaaWhz7VuxcYw1xk2hodGs7Pp7PLvYJJeKz+/MPVW89+x
OuVry/O94j+lxHGgw6XcARgI+w+sKQogRXzwqI0DeUzb8Pmztfcpjki2kw866elW
L7uoFWsei9BMbeYEDk8PHyOBtI3bXe7rIUBUGOtNu1ldv7KC79LN1V51UlM5sMJs
3ayzwDXhJ1oRZmx71tQmANhfEtC2mkyZ9R4UZtAwCvZc2bF6Z0xiDJL+Gkhth0Fn
XWmEex2rK/MGSoV1qA1uv3cQ67kbtqA+0brhYVBsb4vZcNxtWWAxY0gpOX8vs/sJ
6dYUT5/PpFdkVzRthSxjx9qH1+VYPHgm0swUVlXvD471uvK9N9I=
=3Yum
-----END PGP SIGNATURE-----
--- End Message ---
