Commit 1950f280 authored by Tollef Fog Heen's avatar Tollef Fog Heen
Browse files

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

parent 53771c52
......@@ -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
......
......@@ -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
......
lib/security/pam_systemd.so
lib/*/security/pam_systemd.so
usr/share/man/man8/pam_systemd.8
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
lib/libsystemd-daemon.so.*
lib/*/libsystemd-daemon.so.*
lib/libsystemd-id128.so.*
lib/*/libsystemd-id128.so.*
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
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
lib/libsystemd-journal.so.*
lib/*/libsystemd-journal.so.*
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
lib/libsystemd-login.so.*
lib/*/libsystemd-login.so.*
......@@ -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
......
......@@ -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/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment