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 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 100644 --- a/debian/libsystemd-journal-dev.install +++ b/debian/libsystemd-journal-dev.install @@ -1,4 +1,4 @@ -usr/lib/libsystemd-journal.so -usr/lib/pkgconfig/libsystemd-journal.pc +usr/lib/*/libsystemd-journal.so +usr/lib/*/pkgconfig/libsystemd-journal.pc usr/include/systemd/sd-journal.h usr/include/systemd/sd-messages.h diff --git a/debian/libsystemd-journal0.install b/debian/libsystemd-journal0.install index f72ef37..99c2c52 100644 --- a/debian/libsystemd-journal0.install +++ b/debian/libsystemd-journal0.install @@ -1 +1 @@ -lib/libsystemd-journal.so.* +lib/*/libsystemd-journal.so.* diff --git a/debian/libsystemd-login-dev.install b/debian/libsystemd-login-dev.install index d6a0367..8090778 100644 --- a/debian/libsystemd-login-dev.install +++ b/debian/libsystemd-login-dev.install @@ -1,3 +1,3 @@ -usr/lib/libsystemd-login.so -usr/lib/pkgconfig/libsystemd-login.pc +usr/lib/*/libsystemd-login.so +usr/lib/*/pkgconfig/libsystemd-login.pc usr/include/systemd/sd-login.h diff --git a/debian/libsystemd-login0.install b/debian/libsystemd-login0.install index 02ccaf8..18c1228 100644 --- a/debian/libsystemd-login0.install +++ b/debian/libsystemd-login0.install @@ -1 +1 @@ -lib/libsystemd-login.so.* +lib/*/libsystemd-login.so.* diff --git a/debian/rules b/debian/rules index 9be2c36..3b00888 100755 --- a/debian/rules +++ b/debian/rules @@ -3,10 +3,12 @@ #export DH_VERBOSE=1 #export DEB_BUILD_OPTIONS="nostrip" +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + override_dh_auto_configure: dh_auto_configure -- \ --with-rootprefix= \ - --with-rootlibdir=/lib \ + --with-rootlibdir=/lib/$(DEB_HOST_MULTIARCH) \ --with-udevrulesdir=/lib/udev/rules.d \ --enable-gtk \ --enable-libcryptsetup \ @@ -24,9 +26,8 @@ override_dh_auto_clean: override_dh_install: rm debian/tmp/usr/share/doc/systemd/LICENSE - rm debian/tmp/lib/security/pam_systemd.la - rm debian/tmp/usr/lib/*.la rm debian/tmp/lib/systemd/system/sysinit.target.wants/systemd-vconsole-setup.service + find debian/tmp/ -name '*.la' -delete chmod +x debian/debian-fixup dh_install -O--parallel --fail-missing dh_install -plibpam-systemd debian/pam-configs /usr/share diff --git a/debian/systemd.install b/debian/systemd.install index 8003e35..f4916ba 100644 --- a/debian/systemd.install +++ b/debian/systemd.install @@ -39,6 +39,7 @@ usr/lib/binfmt.d usr/lib/modules-load.d usr/lib/sysctl.d usr/lib/systemd +usr/lib/*/systemd usr/lib/tmpfiles.d debian/init-functions lib/lsb debian/debian-fixup lib/systemd/ -- 1.7.10
[The following lists of changes regard files as different if they have
different names, permissions or owners.]
Files in second .changes but not in first
-----------------------------------------
-rw-r--r-- root/root /lib/x86_64-linux-gnu/libsystemd-daemon.so.0.0.1
-rw-r--r-- root/root /lib/x86_64-linux-gnu/libsystemd-id128.so.0.0.3
-rw-r--r-- root/root /lib/x86_64-linux-gnu/libsystemd-journal.so.0.0.3
-rw-r--r-- root/root /lib/x86_64-linux-gnu/libsystemd-login.so.0.2.1
-rw-r--r-- root/root /lib/x86_64-linux-gnu/security/pam_systemd.so
-rw-r--r-- root/root /usr/lib/x86_64-linux-gnu/pkgconfig/libsystemd-daemon.pc
-rw-r--r-- root/root /usr/lib/x86_64-linux-gnu/pkgconfig/libsystemd-id128.pc
-rw-r--r-- root/root
/usr/lib/x86_64-linux-gnu/pkgconfig/libsystemd-journal.pc
-rw-r--r-- root/root /usr/lib/x86_64-linux-gnu/pkgconfig/libsystemd-login.pc
lrwxrwxrwx root/root /lib/x86_64-linux-gnu/libsystemd-daemon.so.0 ->
libsystemd-daemon.so.0.0.1
lrwxrwxrwx root/root /lib/x86_64-linux-gnu/libsystemd-id128.so.0 ->
libsystemd-id128.so.0.0.3
lrwxrwxrwx root/root /lib/x86_64-linux-gnu/libsystemd-journal.so.0 ->
libsystemd-journal.so.0.0.3
lrwxrwxrwx root/root /lib/x86_64-linux-gnu/libsystemd-login.so.0 ->
libsystemd-login.so.0.2.1
lrwxrwxrwx root/root /usr/lib/x86_64-linux-gnu/libsystemd-daemon.so ->
/lib/x86_64-linux-gnu/libsystemd-daemon.so.0.0.1
lrwxrwxrwx root/root /usr/lib/x86_64-linux-gnu/libsystemd-id128.so ->
/lib/x86_64-linux-gnu/libsystemd-id128.so.0.0.3
lrwxrwxrwx root/root /usr/lib/x86_64-linux-gnu/libsystemd-journal.so ->
/lib/x86_64-linux-gnu/libsystemd-journal.so.0.0.3
lrwxrwxrwx root/root /usr/lib/x86_64-linux-gnu/libsystemd-login.so ->
/lib/x86_64-linux-gnu/libsystemd-login.so.0.2.1
Files in first .changes but not in second
-----------------------------------------
-rw-r--r-- root/root /lib/libsystemd-daemon.so.0.0.1
-rw-r--r-- root/root /lib/libsystemd-id128.so.0.0.3
-rw-r--r-- root/root /lib/libsystemd-journal.so.0.0.3
-rw-r--r-- root/root /lib/libsystemd-login.so.0.2.1
-rw-r--r-- root/root /lib/security/pam_systemd.so
-rw-r--r-- root/root /usr/lib/pkgconfig/libsystemd-daemon.pc
-rw-r--r-- root/root /usr/lib/pkgconfig/libsystemd-id128.pc
-rw-r--r-- root/root /usr/lib/pkgconfig/libsystemd-journal.pc
-rw-r--r-- root/root /usr/lib/pkgconfig/libsystemd-login.pc
lrwxrwxrwx root/root /lib/libsystemd-daemon.so.0 ->
libsystemd-daemon.so.0.0.1
lrwxrwxrwx root/root /lib/libsystemd-id128.so.0 -> libsystemd-id128.so.0.0.3
lrwxrwxrwx root/root /lib/libsystemd-journal.so.0 ->
libsystemd-journal.so.0.0.3
lrwxrwxrwx root/root /lib/libsystemd-login.so.0 -> libsystemd-login.so.0.2.1
lrwxrwxrwx root/root /usr/lib/libsystemd-daemon.so ->
/lib/libsystemd-daemon.so.0.0.1
lrwxrwxrwx root/root /usr/lib/libsystemd-id128.so ->
/lib/libsystemd-id128.so.0.0.3
lrwxrwxrwx root/root /usr/lib/libsystemd-journal.so ->
/lib/libsystemd-journal.so.0.0.3
lrwxrwxrwx root/root /usr/lib/libsystemd-login.so ->
/lib/libsystemd-login.so.0.2.1
Control files of package libpam-systemd: lines which differ (wdiff format)
--------------------------------------------------------------------------
Installed-Size: [-98-] {+105+}
Control files of package libsystemd-daemon-dev: lines which differ (wdiff
format)
---------------------------------------------------------------------------------
Installed-Size: [-58-] {+63+}
Control files of package libsystemd-daemon0: lines which differ (wdiff format)
------------------------------------------------------------------------------
Installed-Size: [-46-] {+54+}
{+Multi-Arch: same+}
{+Pre-Depends: multiarch-support+}
Control files of package libsystemd-id128-0: lines which differ (wdiff format)
------------------------------------------------------------------------------
Installed-Size: [-62-] {+66+}
{+Multi-Arch: same+}
{+Pre-Depends: multiarch-support+}
Control files of package libsystemd-id128-dev: lines which differ (wdiff format)
--------------------------------------------------------------------------------
Installed-Size: [-50-] {+54+}
Control files of package libsystemd-journal-dev: lines which differ (wdiff
format)
----------------------------------------------------------------------------------
Installed-Size: [-53-] {+57+}
Control files of package libsystemd-journal0: lines which differ (wdiff format)
-------------------------------------------------------------------------------
Installed-Size: [-104-] {+111+}
{+Multi-Arch: same+}
{+Pre-Depends: multiarch-support+}
Control files of package libsystemd-login-dev: lines which differ (wdiff format)
--------------------------------------------------------------------------------
Installed-Size: [-53-] {+57+}
Control files of package libsystemd-login0: lines which differ (wdiff format)
-----------------------------------------------------------------------------
Installed-Size: [-80-] {+83+}
{+Multi-Arch: same+}
{+Pre-Depends: multiarch-support+}
Control files of package systemd: lines which differ (wdiff format)
-------------------------------------------------------------------
Installed-Size: [-3629-] {+3677+}
Control files of package systemd-gui: lines which differ (wdiff format)
-----------------------------------------------------------------------
Installed-Size: [-215-] {+222+}
No differences were encountered between the control files of package
systemd-sysv
signature.asc
Description: OpenPGP digital signature
