Your message dated Tue, 18 Jun 2024 20:19:52 +0200
with message-id <[email protected]>
and subject line Re: Bug#1061527 closed by Debian FTP Masters
<[email protected]> (reply to Mark Hindley <[email protected]>)
(Bug#1061527: fixed in elogind 255.5-1debian2)
has caused the Debian Bug report #1061527,
regarding elogind: install files into /usr
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.)
--
1061527: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061527
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: elogind
Version: 252.9-1debian3
Severity: normal
Tags: patch
User: [email protected]
Usertags: dep17m2
We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. elogind installs files into /lib and /bin; these should be moved
into the respective canonical locations in /usr/.
Please find a patch attached. It has been build-tested.
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].
Michael
[1] https://wiki.debian.org/UsrMerge
diff -Nru elogind-252.9/debian/changelog elogind-252.9/debian/changelog
--- elogind-252.9/debian/changelog 2023-12-26 18:26:30.000000000 +0100
+++ elogind-252.9/debian/changelog 2024-01-25 23:27:16.000000000 +0100
@@ -1,3 +1,10 @@
+elogind (252.9-1debian3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install files into their canonical location in /usr. (Closes: #-1)
+
+ -- Michael Biebl <[email protected]> Thu, 25 Jan 2024 23:27:16 +0100
+
elogind (252.9-1debian3) unstable; urgency=medium
* d/control: add Build-Depends: libmount-dev to fix nocheck build.
diff -Nru elogind-252.9/debian/elogind.install
elogind-252.9/debian/elogind.install
--- elogind-252.9/debian/elogind.install 2023-12-26 18:26:30.000000000
+0100
+++ elogind-252.9/debian/elogind.install 2024-01-25 23:27:16.000000000
+0100
@@ -1,11 +1,10 @@
-bin/
usr/bin
etc/elogind/*.conf
-lib/elogind/
-lib/*/elogind/
-lib/udev/rules.d/70-uaccess.rules
-lib/udev/rules.d/71-seat.rules
-lib/udev/rules.d/73-seat-late.rules
+usr/lib/elogind/
+usr/lib/*/elogind/
+usr/lib/udev/rules.d/70-uaccess.rules
+usr/lib/udev/rules.d/71-seat.rules
+usr/lib/udev/rules.d/73-seat-late.rules
usr/share/bash-completion/
usr/share/dbus-1/
usr/share/locale/
diff -Nru elogind-252.9/debian/libelogind0.install
elogind-252.9/debian/libelogind0.install
--- elogind-252.9/debian/libelogind0.install 2023-12-26 18:26:30.000000000
+0100
+++ elogind-252.9/debian/libelogind0.install 2024-01-25 23:23:29.000000000
+0100
@@ -1 +1 @@
-lib/*/libelogind.so.*
+usr/lib/*/libelogind.so.*
diff -Nru elogind-252.9/debian/libelogind0.links
elogind-252.9/debian/libelogind0.links
--- elogind-252.9/debian/libelogind0.links 2023-12-26 18:26:30.000000000
+0100
+++ elogind-252.9/debian/libelogind0.links 2024-01-25 23:23:53.000000000
+0100
@@ -1,2 +1,2 @@
#! /usr/bin/dh-exec
-lib/${DEB_HOST_MULTIARCH}/libelogind.so.0
lib/${DEB_HOST_MULTIARCH}/libsystemd.so.0
+usr/lib/${DEB_HOST_MULTIARCH}/libelogind.so.0
usr/lib/${DEB_HOST_MULTIARCH}/libsystemd.so.0
diff -Nru elogind-252.9/debian/libelogind-dev-doc.install
elogind-252.9/debian/libelogind-dev-doc.install
--- elogind-252.9/debian/libelogind-dev-doc.install 2023-12-26
18:26:30.000000000 +0100
+++ elogind-252.9/debian/libelogind-dev-doc.install 2024-01-25
23:26:26.000000000 +0100
@@ -1,2 +1,3 @@
usr/share/doc/elogind/ usr/share/doc/libelogind-dev-doc/
usr/share/man/man3/*
+usr/lib/*/libelogind.so
diff -Nru elogind-252.9/debian/libelogind-dev.links
elogind-252.9/debian/libelogind-dev.links
--- elogind-252.9/debian/libelogind-dev.links 2023-12-26 18:26:30.000000000
+0100
+++ elogind-252.9/debian/libelogind-dev.links 1970-01-01 01:00:00.000000000
+0100
@@ -1,2 +0,0 @@
-#! /usr/bin/dh-exec
-lib/${DEB_HOST_MULTIARCH}/libelogind.so.0
usr/lib/${DEB_HOST_MULTIARCH}/libelogind.so
diff -Nru elogind-252.9/debian/libpam-elogind.install
elogind-252.9/debian/libpam-elogind.install
--- elogind-252.9/debian/libpam-elogind.install 2023-12-26 18:26:30.000000000
+0100
+++ elogind-252.9/debian/libpam-elogind.install 2024-01-25 23:23:39.000000000
+0100
@@ -1,4 +1,4 @@
debian/extra/pam.d/ /etc
-lib/*/security/pam_elogind.so
+usr/lib/*/security/pam_elogind.so
usr/share/man/man8/pam_elogind.8
debian/extra/pam-configs/ /usr/share/
diff -Nru elogind-252.9/debian/rules elogind-252.9/debian/rules
--- elogind-252.9/debian/rules 2023-12-26 18:26:30.000000000 +0100
+++ elogind-252.9/debian/rules 2024-01-25 23:27:16.000000000 +0100
@@ -7,12 +7,12 @@
# behaviour
CONFFLAGS = \
- -Dpamlibdir=/lib/$(DEB_HOST_MULTIARCH)/security \
- -Drootlibdir=/lib/$(DEB_HOST_MULTIARCH) \
- -Dsplit-usr=true \
+ -Dpamlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/security \
+ -Drootlibdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ -Dsplit-usr=false \
-Ddocdir=/usr/share/doc/elogind \
-Dman=true \
- -Dudevrulesdir=/lib/udev/rules.d \
+ -Dudevrulesdir=/usr/lib/udev/rules.d \
-Ddefault-kill-user-processes=false \
-Dtests=true \
-Dmode=release
--- End Message ---
--- Begin Message ---
Version: 255.5-1debian2
Am 18.06.24 um 19:56 schrieb Mark Hindley:
On Tue, Jun 18, 2024 at 06:53:35PM +0100, Mark Hindley wrote:
However, most of those changes happened incidentally in version
255.5-1debian1. The single symlink was the only outstanding item.
Actually 255.4.1-1debian1:
elogind (255.4.1-1debian1) unstable; urgency=medium
* New upstream version.
- includes fixed sd_listen_fds(3) manpage (Closes: #1050561).
* d/p: refresh patches and remove one applied upstream.
* d/rules:
- change meson boolean argument from true to enabled.
- remove split-/usr configuration.
* d/control: bump Standards Version (no changes).
* d/*.install: update for merged-/usr.
* d/elogind.init: update as binary is now installed in /usr/libexec.
* d/elogind.install: include sleep.conf.d and fragments.
* d/libelogind-dev.links: move unversioned link below /usr.
-- Mark Hindley <[email protected]> Sun, 14 Apr 2024 14:21:19 +0100
Ok, I see.
After reading the bug closure message and debdiffing 255.5-1debian1 and
255.5-1debian2, the only changes were only related to the move of the
symlink. And seeing the changelog I came to the (wrong) conclusion
apparently, since it didn't mention previous usrmove changes.
Anyway, all seems good now, so closing again.
Michael
OpenPGP_signature.asc
Description: OpenPGP digital signature
--- End Message ---
