Convert to Multi-Arch: same where possible. Closes: #676615

diff --git a/debian/changelog b/debian/changelog
index 534d25a4ce8a70394a8348a6c89cafb5a8db066f..f2ab7b4d2eb5c4247622db69cfaaabefa3e506ed 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ systemd (44-3) UNRELEASED; urgency=low
 
   [ Michael Biebl ]
   * Bump to debhelper 9.
+  * Convert to Multi-Arch: same where possible.  Closes: #676615
 
  -- Tollef Fog Heen <tfheen@debian.org>  Fri, 29 Jun 2012 22:34:16 +0200
 

diff --git a/debian/control b/debian/control
index a1f3e58a106890d0344143e8d5c8bc441caf9689..81c9399168333abb9db4b58e5ea3404ee659181b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -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 18b8af929a0a9f526bc9375338dc8b2b7bf924f5..0796a2218f6b6228ffd50e217a3a052b118bc792 100644 (file)
--- 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 3a20bfcceb00bb25a0f8c6cf6dc1354a47a1b249..b4b7f0db3f171339d66da2dc559c24cf40e5bd12 100644 (file)
--- 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 48d464a9524b3366f5b34a51f55c8c38caa78cf5..6f94e207c81d71689d7c6c7488fac580344b6648 100644 (file)
--- 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 2bfcaf1a870fbf548a90496e01b291e2050d29f9..8dd964eac8705e22a00940f8f88690c86c40bfb5 100644 (file)
--- 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 a6f9ee35cda095aaac6e33c5ba0958873f10b420..68e082965f9f797774de69aad12a3d8020cab669 100644 (file)
--- 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 c57f05497c3305a30ad9aaac9480ef5d97097821..e16e18780bc2c4dac9b9012208fb89ddc85cb099 100644 (file)
--- 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 f72ef37245441943c5f98f1d0ef5688512881474..99c2c52292d30633c3bfd2af8771d48241b688f2 100644 (file)
--- 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 d6a0367b5e5ad0b031978d1cfa9afc44e479e4ff..8090778d82b9668d5a21fe6fd7d572bbf068f782 100644 (file)
--- 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 02ccaf8e955db1bd05dfd3b8533882badaed13d8..18c1228679c0c6862f1a123e82836e0c9aed376f 100644 (file)
--- 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 9be2c364151ef1813a37e6ee794d473dbd350b25..3b00888f22fc6ee023a76897e0fa0529619093d3 100755 (executable)
--- 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 8003e3512451baa0378f3c826b70c84f00313750..f4916ba06542f849c1ec2a608486ec57dc4e0adb 100644 (file)
--- 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/