Bug#1061493: consolekit: install PAM module and udev files into /usr

[Michael Hudson-Doyle]

On Fri, 15 Mar 2024 at 08:51, Mark Hindley  wrote:

> Control: notfound -1 1.2.6-3
>
> On Wed, Mar 13, 2024 at 10:40:40PM +0100, Andreas Beckmann wrote:
> > Followup-For: Bug #1061493
> > Control: found -1 1.2.6-3.1~exp1
> > Control: severity -1 serious
> > Control: tag -1 ftbfs
> >
> > This change causes consolekit2 to to FTBFS in experimental:
>
> Indeed. As it was an NMU, I think the etiquette is for the NMUer to fix.
>

Apologies for the disruption.


> In sid consolekit2 still builds cleanly. Therefore, marking notfound there.



> Michael, perhaps you would fix your NMU, or provide a better patch?
>

I thought I had uploaded a fix for this but in any case it was determined
that consolekit2 did not need to be part of the transition so the package
can be removed from experimental. I'll file a removal request in a moment,
or you can just upload over it.

Cheers,
mwh

Bug#1061493: consolekit: install PAM module and udev files into /usr

[Mark Hindley]

Control: notfound -1 1.2.6-3

On Wed, Mar 13, 2024 at 10:40:40PM +0100, Andreas Beckmann wrote:
> Followup-For: Bug #1061493
> Control: found -1 1.2.6-3.1~exp1
> Control: severity -1 serious
> Control: tag -1 ftbfs
> 
> This change causes consolekit2 to to FTBFS in experimental:

Indeed. As it was an NMU, I think the etiquette is for the NMUer to fix.

In sid consolekit2 still builds cleanly. Therefore, marking notfound there.

Michael, perhaps you would fix your NMU, or provide a better patch?

Thanks

Mark

Bug#1061493: consolekit: install PAM module and udev files into /usr

[Andreas Beckmann]

Followup-For: Bug #1061493
Control: found -1 1.2.6-3.1~exp1
Control: severity -1 serious
Control: tag -1 ftbfs

This change causes consolekit2 to to FTBFS in experimental:

https://buildd.debian.org/status/package.php?p=consolekit2=experimental

dh_install
dh_install: warning: Cannot find (any matches for) "usr/lib/udev/" (tried in ., 
debian/tmp)

dh_install: warning: consolekit missing files: usr/lib/udev/
dh_install: error: missing files, aborting
make[1]: *** [debian/rules:43: override_dh_install] Error 255


Andreas

Bug#1061493: consolekit: install PAM module and udev files into /usr

[Michael Biebl]

Source: consolekit2
Version: 1.2.6-3
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

We want to finalize the /usr-merge via DEP17 by moving all files to
/usr. consolekit installs files into /lib; 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 consolekit2-1.2.6/debian/changelog consolekit2-1.2.6/debian/changelog
--- consolekit2-1.2.6/debian/changelog  2023-11-16 13:42:48.0 +0100
+++ consolekit2-1.2.6/debian/changelog  2024-01-25 15:02:55.0 +0100
@@ -1,3 +1,10 @@
+consolekit2 (1.2.6-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Install PAM module into /usr. (Closes: #-1)
+
+ -- Michael Biebl   Thu, 25 Jan 2024 15:02:55 +0100
+
 consolekit2 (1.2.6-3) unstable; urgency=medium
 
   * License appstream metainfo as FSFAP.
diff -Nru consolekit2-1.2.6/debian/consolekit.install 
consolekit2-1.2.6/debian/consolekit.install
--- consolekit2-1.2.6/debian/consolekit.install 2023-11-16 13:42:48.0 
+0100
+++ consolekit2-1.2.6/debian/consolekit.install 2024-01-25 15:02:55.0 
+0100
@@ -3,7 +3,7 @@
 etc/X11/Xsession.d/
 etc/logrotate.d/
 etc/ConsoleKit/
-[linux-any] lib/udev/
+[linux-any] usr/lib/udev/
 usr/share/dbus-1/system-services/
 usr/share/polkit-1/
 usr/share/locale/
diff -Nru consolekit2-1.2.6/debian/control consolekit2-1.2.6/debian/control
--- consolekit2-1.2.6/debian/control2023-11-16 13:42:48.0 +0100
+++ consolekit2-1.2.6/debian/control2024-01-25 15:02:55.0 +0100
@@ -12,7 +12,7 @@
libdbus-1-dev,
libdrm-dev,
libselinux1-dev [linux-any],
-   libudev-dev [linux-any],
+   libudev-dev (>= 255.1-1~) [linux-any],
libacl1-dev [linux-any],
libevdev-dev [linux-any],
libpam0g-dev,
diff -Nru consolekit2-1.2.6/debian/libpam-ck-connector.install 
consolekit2-1.2.6/debian/libpam-ck-connector.install
--- consolekit2-1.2.6/debian/libpam-ck-connector.install2023-11-16 
13:42:48.0 +0100
+++ consolekit2-1.2.6/debian/libpam-ck-connector.install2024-01-25 
15:02:49.0 +0100
@@ -1,4 +1,4 @@
 #! /usr/bin/dh-exec
-lib/*/security/pam_ck_connector.so
+usr/lib/*/security/pam_ck_connector.so
 usr/share/man/man8/pam_ck_connector.8
 debian/libpam-ck-connector.pam-auth-update => usr/share/pam-configs/consolekit
diff -Nru consolekit2-1.2.6/debian/rules consolekit2-1.2.6/debian/rules
--- consolekit2-1.2.6/debian/rules  2023-11-16 13:42:48.0 +0100
+++ consolekit2-1.2.6/debian/rules  2024-01-25 15:02:36.0 +0100
@@ -33,11 +33,11 @@
--without-systemdsystemunitdir \
--enable-docbook-docs \
--enable-gtk-doc \
-   --with-pam-module-dir=/lib/$(DEB_HOST_MULTIARCH)/security
+   --with-pam-module-dir=/usr/lib/$(DEB_HOST_MULTIARCH)/security
 
 override_dh_install:
# la files are not required any more
-   rm debian/tmp/lib/*/security/pam_ck_connector.la \
+   rm debian/tmp/usr/lib/*/security/pam_ck_connector.la \
   debian/tmp/usr/lib/*/libck-connector.la \
   debian/tmp/usr/lib/*/libconsolekit.la
# end user doesn't need these files