Bug#676615: libsystemd-login0: please convert to Multi-Arch: same
Hi Michael, On Thu, Jun 28, 2012 at 06:53:53AM +0200, Michael Biebl wrote: attached is a patch which converts the (library) packages to m-a:same Thanks for doing the multiarch work for systemd! Please review and apply. I was wondering why you converted the paths for libpam-systemd and libsystemd-*-dev, but did not mark them m-a:same. As far as I can see libpam-systemd only ships a manual page and a pam configuration file in /usr/share besides /usr/share/doc and the library. This would make it a candidate for m-a:same as well, but maybe I am just missing a detail here. Similarly the -dev packages only ship a pkgconfig file and one or two headers besides /usr/share/doc and the library. Marking them m-a:same should be possible as well. Such a marking of -dev packages is useful for crossbuilding. Again, I may be missing a detail here. Can you briefly explain your reasons? Would be nice having this in wheezy. Yes. That would be nice. :-) Helmut -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#676615: libsystemd-login0: please convert to Multi-Arch: same
On 28.06.2012 09:30, Helmut Grohne wrote: Hi Michael, On Thu, Jun 28, 2012 at 06:53:53AM +0200, Michael Biebl wrote: attached is a patch which converts the (library) packages to m-a:same Thanks for doing the multiarch work for systemd! Please review and apply. I was wondering why you converted the paths for libpam-systemd and libsystemd-*-dev, but did not mark them m-a:same. See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676615#27 Similarly the -dev packages only ship a pkgconfig file and one or two headers besides /usr/share/doc and the library. Marking them m-a:same should be possible as well. Such a marking of -dev packages is useful for crossbuilding. Again, I may be missing a detail here. They possibly could be marked as m-a:same. TBH I didn't really bother checking that. Cheers, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth? signature.asc Description: OpenPGP digital signature
Bug#676615: libsystemd-login0: please convert to Multi-Arch: same
tags 676615 patch thanks attached is a patch which converts the (library) packages to m-a:same As you can see, the location of the user-generator directory changed from /usr/lib/systemd/systemd/user-generators → /usr/lib/$(DEB_HOST_MULTIARCH)/systemd/user-generators Afaics this directory is only used internally, so this *should* be fine. Also note the /usr/lib/systemd/systemd/ patch (the duplicate systemd). This is due to systemd using usergeneratordir=$(pkglibexecdir)/user-generators and pkglibexecdir being set to /usr/lib/$(PACKAGE) by default in debian. pkglibexecdir is a very recent addition in automake and kinda conflicts with the notion of setting libexecdir to $(libdir)/$(PACKAGE) compat level 9 changes that behaviour and sets libexecdir to $(libdir) A debdiff is also attached so you can more easily notice the changed location of the files. Please review and apply. Would be nice having this in wheezy. Cheers, Michael -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth? From 68b08816b001d692fad3a484f4fa4337c2f3d72b Mon Sep 17 00:00:00 2001 From: Michael Biebl bi...@debian.org Date: Thu, 28 Jun 2012 06:33:08 +0200 Subject: [PATCH] Convert to multiarch --- debian/compat |2 +- debian/control| 10 +- debian/libpam-systemd.install |2 +- debian/libsystemd-daemon-dev.install |4 ++-- debian/libsystemd-daemon0.install |2 +- debian/libsystemd-id128-0.install |2 +- debian/libsystemd-id128-dev.install |4 ++-- debian/libsystemd-journal-dev.install |4 ++-- debian/libsystemd-journal0.install|2 +- debian/libsystemd-login-dev.install |4 ++-- debian/libsystemd-login0.install |2 +- debian/rules |7 --- debian/systemd.install|1 + 13 files changed, 28 insertions(+), 18 deletions(-) diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 7638583..91d1d82 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Standards-Version: 3.9.2 Vcs-Git: git://git.err.no/systemd/ Vcs-Browser: http://git.err.no/cgi-bin/gitweb.cgi?p=systemd;a=summary Homepage: http://www.freedesktop.org/wiki/Software/systemd -Build-Depends: debhelper (= 8.1.0), +Build-Depends: debhelper (= 9), libcap-dev, pkg-config, libudev-dev (= 172), @@ -107,7 +107,9 @@ Description: system and service manager - GUI Package: libsystemd-login0 Architecture: linux-any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: systemd login utility library The libsystemd-login library provides an interface for the @@ -125,7 +127,9 @@ Description: systemd login utility library - development files Package: libsystemd-daemon0 Architecture: linux-any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: systemd utility library The sd-daemon library provides a reference implementation of various @@ -143,7 +147,9 @@ Description: systemd utility library - development files Package: libsystemd-journal0 Architecture: linux-any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: systemd journal utility library The libsystemd-journal library provides an interface for the @@ -161,7 +167,9 @@ Description: systemd journal utility library - development files Package: libsystemd-id128-0 Architecture: linux-any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: systemd 128 bit ID utility library The libsystemd-id128 library provides utility functions for generating diff --git a/debian/libpam-systemd.install b/debian/libpam-systemd.install index 18b8af9..0796a22 100644 --- a/debian/libpam-systemd.install +++ b/debian/libpam-systemd.install @@ -1,2 +1,2 @@ -lib/security/pam_systemd.so +lib/*/security/pam_systemd.so usr/share/man/man8/pam_systemd.8 diff --git a/debian/libsystemd-daemon-dev.install b/debian/libsystemd-daemon-dev.install index 3a20bfc..b4b7f0d 100644 --- a/debian/libsystemd-daemon-dev.install +++ b/debian/libsystemd-daemon-dev.install @@ -1,3 +1,3 @@ -usr/lib/libsystemd-daemon.so -usr/lib/pkgconfig/libsystemd-daemon.pc +usr/lib/*/libsystemd-daemon.so +usr/lib/*/pkgconfig/libsystemd-daemon.pc usr/include/systemd/sd-daemon.h diff --git a/debian/libsystemd-daemon0.install b/debian/libsystemd-daemon0.install index 48d464a..6f94e20 100644 --- a/debian/libsystemd-daemon0.install +++ b/debian/libsystemd-daemon0.install @@ -1 +1 @@ -lib/libsystemd-daemon.so.* +lib/*/libsystemd-daemon.so.* diff --git
Bug#676615: libsystemd-login0: please convert to Multi-Arch: same
On 28.06.2012 06:53, Michael Biebl wrote: tags 676615 patch thanks attached is a patch which converts the (library) packages to m-a:same We can probably also mark libpam-systemd as m-a:same. updated patch attached. -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth? From 68b08816b001d692fad3a484f4fa4337c2f3d72b Mon Sep 17 00:00:00 2001 From: Michael Biebl bi...@debian.org Date: Thu, 28 Jun 2012 06:33:08 +0200 Subject: [PATCH] Convert to multiarch --- debian/compat |2 +- debian/control| 10 +- debian/libpam-systemd.install |2 +- debian/libsystemd-daemon-dev.install |4 ++-- debian/libsystemd-daemon0.install |2 +- debian/libsystemd-id128-0.install |2 +- debian/libsystemd-id128-dev.install |4 ++-- debian/libsystemd-journal-dev.install |4 ++-- debian/libsystemd-journal0.install|2 +- debian/libsystemd-login-dev.install |4 ++-- debian/libsystemd-login0.install |2 +- debian/rules |7 --- debian/systemd.install|1 + 13 files changed, 28 insertions(+), 18 deletions(-) diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 7638583..91d1d82 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Standards-Version: 3.9.2 Vcs-Git: git://git.err.no/systemd/ Vcs-Browser: http://git.err.no/cgi-bin/gitweb.cgi?p=systemd;a=summary Homepage: http://www.freedesktop.org/wiki/Software/systemd -Build-Depends: debhelper (= 8.1.0), +Build-Depends: debhelper (= 9), libcap-dev, pkg-config, libudev-dev (= 172), @@ -107,7 +107,9 @@ Description: system and service manager - GUI Package: libsystemd-login0 Architecture: linux-any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: systemd login utility library The libsystemd-login library provides an interface for the @@ -125,7 +127,9 @@ Description: systemd login utility library - development files Package: libsystemd-daemon0 Architecture: linux-any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: systemd utility library The sd-daemon library provides a reference implementation of various @@ -143,7 +147,9 @@ Description: systemd utility library - development files Package: libsystemd-journal0 Architecture: linux-any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: systemd journal utility library The libsystemd-journal library provides an interface for the @@ -161,7 +167,9 @@ Description: systemd journal utility library - development files Package: libsystemd-id128-0 Architecture: linux-any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: systemd 128 bit ID utility library The libsystemd-id128 library provides utility functions for generating diff --git a/debian/libpam-systemd.install b/debian/libpam-systemd.install index 18b8af9..0796a22 100644 --- a/debian/libpam-systemd.install +++ b/debian/libpam-systemd.install @@ -1,2 +1,2 @@ -lib/security/pam_systemd.so +lib/*/security/pam_systemd.so usr/share/man/man8/pam_systemd.8 diff --git a/debian/libsystemd-daemon-dev.install b/debian/libsystemd-daemon-dev.install index 3a20bfc..b4b7f0d 100644 --- a/debian/libsystemd-daemon-dev.install +++ b/debian/libsystemd-daemon-dev.install @@ -1,3 +1,3 @@ -usr/lib/libsystemd-daemon.so -usr/lib/pkgconfig/libsystemd-daemon.pc +usr/lib/*/libsystemd-daemon.so +usr/lib/*/pkgconfig/libsystemd-daemon.pc usr/include/systemd/sd-daemon.h diff --git a/debian/libsystemd-daemon0.install b/debian/libsystemd-daemon0.install index 48d464a..6f94e20 100644 --- a/debian/libsystemd-daemon0.install +++ b/debian/libsystemd-daemon0.install @@ -1 +1 @@ -lib/libsystemd-daemon.so.* +lib/*/libsystemd-daemon.so.* diff --git a/debian/libsystemd-id128-0.install b/debian/libsystemd-id128-0.install index 2bfcaf1..8dd964e 100644 --- a/debian/libsystemd-id128-0.install +++ b/debian/libsystemd-id128-0.install @@ -1 +1 @@ -lib/libsystemd-id128.so.* +lib/*/libsystemd-id128.so.* diff --git a/debian/libsystemd-id128-dev.install b/debian/libsystemd-id128-dev.install index a6f9ee3..68e0829 100644 --- a/debian/libsystemd-id128-dev.install +++ b/debian/libsystemd-id128-dev.install @@ -1,3 +1,3 @@ -usr/lib/libsystemd-id128.so -usr/lib/pkgconfig/libsystemd-id128.pc +usr/lib/*/libsystemd-id128.so +usr/lib/*/pkgconfig/libsystemd-id128.pc usr/include/systemd/sd-id128.h diff --git a/debian/libsystemd-journal-dev.install b/debian/libsystemd-journal-dev.install index c57f054..e16e187
Bug#676615: libsystemd-login0: please convert to Multi-Arch: same
On 28.06.2012 07:00, Michael Biebl wrote: We can probably also mark libpam-systemd as m-a:same. updated patch attached. Sorry, wrong patch. Right one attached now. -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth? From 4039a57d905545987f4572c865c81c1278436d33 Mon Sep 17 00:00:00 2001 From: Michael Biebl bi...@debian.org Date: Thu, 28 Jun 2012 06:33:08 +0200 Subject: [PATCH] Convert to multiarch --- debian/compat |2 +- debian/control| 11 ++- debian/libpam-systemd.install |2 +- debian/libsystemd-daemon-dev.install |4 ++-- debian/libsystemd-daemon0.install |2 +- debian/libsystemd-id128-0.install |2 +- debian/libsystemd-id128-dev.install |4 ++-- debian/libsystemd-journal-dev.install |4 ++-- debian/libsystemd-journal0.install|2 +- debian/libsystemd-login-dev.install |4 ++-- debian/libsystemd-login0.install |2 +- debian/rules |7 --- debian/systemd.install|1 + 13 files changed, 29 insertions(+), 18 deletions(-) diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 7638583..2b34138 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Standards-Version: 3.9.2 Vcs-Git: git://git.err.no/systemd/ Vcs-Browser: http://git.err.no/cgi-bin/gitweb.cgi?p=systemd;a=summary Homepage: http://www.freedesktop.org/wiki/Software/systemd -Build-Depends: debhelper (= 8.1.0), +Build-Depends: debhelper (= 9), libcap-dev, pkg-config, libudev-dev (= 172), @@ -74,6 +74,7 @@ Description: system and service manager - SysV links Package: libpam-systemd Architecture: linux-any +Multi-Arch: same Section: admin Priority: extra Depends: systemd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} @@ -107,7 +108,9 @@ Description: system and service manager - GUI Package: libsystemd-login0 Architecture: linux-any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: systemd login utility library The libsystemd-login library provides an interface for the @@ -125,7 +128,9 @@ Description: systemd login utility library - development files Package: libsystemd-daemon0 Architecture: linux-any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: systemd utility library The sd-daemon library provides a reference implementation of various @@ -143,7 +148,9 @@ Description: systemd utility library - development files Package: libsystemd-journal0 Architecture: linux-any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: systemd journal utility library The libsystemd-journal library provides an interface for the @@ -161,7 +168,9 @@ Description: systemd journal utility library - development files Package: libsystemd-id128-0 Architecture: linux-any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: systemd 128 bit ID utility library The libsystemd-id128 library provides utility functions for generating diff --git a/debian/libpam-systemd.install b/debian/libpam-systemd.install index 18b8af9..0796a22 100644 --- a/debian/libpam-systemd.install +++ b/debian/libpam-systemd.install @@ -1,2 +1,2 @@ -lib/security/pam_systemd.so +lib/*/security/pam_systemd.so usr/share/man/man8/pam_systemd.8 diff --git a/debian/libsystemd-daemon-dev.install b/debian/libsystemd-daemon-dev.install index 3a20bfc..b4b7f0d 100644 --- a/debian/libsystemd-daemon-dev.install +++ b/debian/libsystemd-daemon-dev.install @@ -1,3 +1,3 @@ -usr/lib/libsystemd-daemon.so -usr/lib/pkgconfig/libsystemd-daemon.pc +usr/lib/*/libsystemd-daemon.so +usr/lib/*/pkgconfig/libsystemd-daemon.pc usr/include/systemd/sd-daemon.h diff --git a/debian/libsystemd-daemon0.install b/debian/libsystemd-daemon0.install index 48d464a..6f94e20 100644 --- a/debian/libsystemd-daemon0.install +++ b/debian/libsystemd-daemon0.install @@ -1 +1 @@ -lib/libsystemd-daemon.so.* +lib/*/libsystemd-daemon.so.* diff --git a/debian/libsystemd-id128-0.install b/debian/libsystemd-id128-0.install index 2bfcaf1..8dd964e 100644 --- a/debian/libsystemd-id128-0.install +++ b/debian/libsystemd-id128-0.install @@ -1 +1 @@ -lib/libsystemd-id128.so.* +lib/*/libsystemd-id128.so.* diff --git a/debian/libsystemd-id128-dev.install b/debian/libsystemd-id128-dev.install index a6f9ee3..68e0829 100644 --- a/debian/libsystemd-id128-dev.install +++ b/debian/libsystemd-id128-dev.install @@ -1,3 +1,3 @@ -usr/lib/libsystemd-id128.so -usr/lib/pkgconfig/libsystemd-id128.pc
Bug#676615: libsystemd-login0: please convert to Multi-Arch: same
On 28.06.2012 07:06, Michael Biebl wrote: On 28.06.2012 07:00, Michael Biebl wrote: We can probably also mark libpam-systemd as m-a:same. updated patch attached. Sorry, wrong patch. Right one attached now. Grr, was still incomplete. Third time is the charm... -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth? From 106a0bfa21a45958daab793ad86d5d367dddfa93 Mon Sep 17 00:00:00 2001 From: Michael Biebl bi...@debian.org Date: Thu, 28 Jun 2012 06:33:08 +0200 Subject: [PATCH] Convert to multiarch --- debian/compat |2 +- debian/control| 12 +++- debian/libpam-systemd.install |2 +- debian/libsystemd-daemon-dev.install |4 ++-- debian/libsystemd-daemon0.install |2 +- debian/libsystemd-id128-0.install |2 +- debian/libsystemd-id128-dev.install |4 ++-- debian/libsystemd-journal-dev.install |4 ++-- debian/libsystemd-journal0.install|2 +- debian/libsystemd-login-dev.install |4 ++-- debian/libsystemd-login0.install |2 +- debian/rules |7 --- debian/systemd.install|1 + 13 files changed, 30 insertions(+), 18 deletions(-) diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 7638583..81c9399 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Standards-Version: 3.9.2 Vcs-Git: git://git.err.no/systemd/ Vcs-Browser: http://git.err.no/cgi-bin/gitweb.cgi?p=systemd;a=summary Homepage: http://www.freedesktop.org/wiki/Software/systemd -Build-Depends: debhelper (= 8.1.0), +Build-Depends: debhelper (= 9), libcap-dev, pkg-config, libudev-dev (= 172), @@ -74,8 +74,10 @@ Description: system and service manager - SysV links Package: libpam-systemd Architecture: linux-any +Multi-Arch: same Section: admin Priority: extra +Pre-Depends: ${misc:Pre-Depends} Depends: systemd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: system and service manager - PAM module systemd is a replacement for sysvinit. It is dependency-based and @@ -107,7 +109,9 @@ Description: system and service manager - GUI Package: libsystemd-login0 Architecture: linux-any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: systemd login utility library The libsystemd-login library provides an interface for the @@ -125,7 +129,9 @@ Description: systemd login utility library - development files Package: libsystemd-daemon0 Architecture: linux-any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: systemd utility library The sd-daemon library provides a reference implementation of various @@ -143,7 +149,9 @@ Description: systemd utility library - development files Package: libsystemd-journal0 Architecture: linux-any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: systemd journal utility library The libsystemd-journal library provides an interface for the @@ -161,7 +169,9 @@ Description: systemd journal utility library - development files Package: libsystemd-id128-0 Architecture: linux-any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: systemd 128 bit ID utility library The libsystemd-id128 library provides utility functions for generating diff --git a/debian/libpam-systemd.install b/debian/libpam-systemd.install index 18b8af9..0796a22 100644 --- a/debian/libpam-systemd.install +++ b/debian/libpam-systemd.install @@ -1,2 +1,2 @@ -lib/security/pam_systemd.so +lib/*/security/pam_systemd.so usr/share/man/man8/pam_systemd.8 diff --git a/debian/libsystemd-daemon-dev.install b/debian/libsystemd-daemon-dev.install index 3a20bfc..b4b7f0d 100644 --- a/debian/libsystemd-daemon-dev.install +++ b/debian/libsystemd-daemon-dev.install @@ -1,3 +1,3 @@ -usr/lib/libsystemd-daemon.so -usr/lib/pkgconfig/libsystemd-daemon.pc +usr/lib/*/libsystemd-daemon.so +usr/lib/*/pkgconfig/libsystemd-daemon.pc usr/include/systemd/sd-daemon.h diff --git a/debian/libsystemd-daemon0.install b/debian/libsystemd-daemon0.install index 48d464a..6f94e20 100644 --- a/debian/libsystemd-daemon0.install +++ b/debian/libsystemd-daemon0.install @@ -1 +1 @@ -lib/libsystemd-daemon.so.* +lib/*/libsystemd-daemon.so.* diff --git a/debian/libsystemd-id128-0.install b/debian/libsystemd-id128-0.install index 2bfcaf1..8dd964e 100644 --- a/debian/libsystemd-id128-0.install +++ b/debian/libsystemd-id128-0.install @@ -1 +1 @@ -lib/libsystemd-id128.so.* +lib/*/libsystemd-id128.so.* diff --git a/debian/libsystemd-id128-dev.install
Bug#676615: libsystemd-login0: please convert to Multi-Arch: same
Package: libsystemd-login0 Version: 44-2 Severity: important One of the reverse dependencies of libsystemd-login0 is the multiarch aware dbus package. However dbus cannot be cross graded, because libsystemd-login0 is not multiarch aware. Since libsystemd-login0 only contains a single shared library, moving it to /lib/triplet and tagging the package as Multi-Arch: same seems easy and useful. You can find details on the conversion process at http://wiki.debian.org/Multiarch/Implementation. Setting severity to important as this is part of the multiarch release goal. Thanks for your help. Helmut -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org