Commit ca3e157b authored by Jon Severinsson's avatar Jon Severinsson

Install the new combined libsystemd0 library

parent 37993e0d
......@@ -6,6 +6,10 @@ systemd (214-1) UNRELEASED; urgency=medium
* Import upstream v214-stable patch series.
- Rebase remaining Debian patches on top of v214-stable.
- Drop modifications to the now-removed built-in sysvinit support.
* Install the new combined libsystemd0 library, this library combines all
functionality of the various libsystemd-* libraries.
- Deprecate the old libsystemd-* libraries as they've been bundled into
libsystemd0. The old -dev files now just carry a transitional .pc file.
[ Sjoerd Simons ]
* debian/patches/shared-include-stdbool.h-in-mkdir.h.patch
......
......@@ -50,7 +50,7 @@ Suggests: systemd-ui
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends},
libsystemd-login0 (= ${binary:Version}),
libsystemd0 (= ${binary:Version}),
util-linux (>= 2.19.1-2),
initscripts (>= 2.88dsf-17),
sysv-rc,
......@@ -125,7 +125,7 @@ Description: system and service manager - PAM module
.
Packages that depend on logind functionality need to depend on libpam-systemd.
Package: libsystemd-login0
Package: libsystemd0
Architecture: linux-any
Multi-Arch: same
Section: libs
......@@ -133,110 +133,143 @@ Priority: optional
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: systemd login utility library
The libsystemd-login library provides an interface for the
systemd-logind service which is used to track user sessions and seats.
Description: systemd utility library
The libsystemd0 library provides interfaces to various systemd components
Package: libsystemd-login-dev
Package: libsystemd-dev
Architecture: linux-any
Multi-Arch: same
Section: libdevel
Priority: optional
Depends: ${shlibs:Depends},
${misc:Depends},
libsystemd-login0 (= ${binary:Version})
Breaks: systemd (<< 204-8)
Replaces: systemd (<< 204-8)
Description: systemd login utility library - development files
libsystemd0 (= ${binary:Version})
Breaks: systemd (<< 204-8),
libsystemd-login-dev (<< 209),
libsystemd-daemon-dev (<< 209),
libsystemd-journal-dev (<< 209),
libsystemd-id128-dev (<< 209),
Replaces: systemd (<< 204-8),
libsystemd-login-dev (<< 209),
libsystemd-daemon-dev (<< 209),
libsystemd-journal-dev (<< 209),
libsystemd-id128-dev (<< 209),
Description: systemd utility library - development files
The libsystemd0 library provides interfaces to various systemd components
.
This package contains the development files
Package: libsystemd-login0
Architecture: linux-any
Multi-Arch: same
Section: oldlibs
Priority: extra
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: systemd login utility library (deprecated)
The libsystemd-login library provides an interface for the
systemd-logind service which is used to track user sessions and seats.
.
This package contains the development files
Transitional compatibility library, functionality has been integrated into
libsystemd0
Package: libsystemd-login-dev
Architecture: linux-any
Multi-Arch: same
Section: oldlibs
Priority: extra
Depends: ${misc:Depends},
libsystemd-dev (>= ${binary:Version})
Description: systemd login utility library (transitional package)
The libsystemd-login library provides an interface for the
systemd-logind service which is used to track user sessions and seats.
.
This is a transition package that can be safely removed once no package depend on it.
Package: libsystemd-daemon0
Architecture: linux-any
Multi-Arch: same
Section: libs
Priority: optional
Section: oldlibs
Priority: extra
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: systemd utility library
Description: systemd utility library (deprecated)
The sd-daemon library provides a reference implementation of various
APIs for new-style daemons, as implemented by the systemd init system.
.
Transitional compatibility library, functionality has been integrated into
libsystemd0
Package: libsystemd-daemon-dev
Architecture: linux-any
Multi-Arch: same
Section: libdevel
Priority: optional
Depends: ${shlibs:Depends},
${misc:Depends},
libsystemd-daemon0 (= ${binary:Version})
Breaks: systemd (<< 204-8)
Replaces: systemd (<< 204-8)
Description: systemd utility library - development files
Section: oldlibs
Priority: extra
Depends: ${misc:Depends},
libsystemd-dev (>= ${binary:Version})
Description: systemd utility library (transitional package)
The sd-daemon library provides a reference implementation of various
APIs for new-style daemons, as implemented by the systemd init system.
.
This package contains the development files
This is a transition package that can be safely removed once no package depend on it.
Package: libsystemd-journal0
Architecture: linux-any
Multi-Arch: same
Section: libs
Priority: optional
Section: oldlibs
Priority: extra
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: systemd journal utility library
Description: systemd journal utility library (deprecated)
The libsystemd-journal library provides an interface for the
systemd journal service.
.
Transitional compatibility library, functionality has been integrated into
libsystemd0
Package: libsystemd-journal-dev
Architecture: linux-any
Multi-Arch: same
Section: libdevel
Priority: optional
Depends: ${shlibs:Depends},
${misc:Depends},
libsystemd-journal0 (= ${binary:Version}),
libsystemd-id128-dev (= ${binary:Version})
Breaks: systemd (<< 204-8)
Replaces: systemd (<< 204-8)
Description: systemd journal utility library - development files
Section: oldlibs
Priority: extra
Depends: ${misc:Depends},
libsystemd-dev (>= ${binary:Version})
Description: systemd journal utility library (transitional package)
The libsystemd-journal library provides an interface for the
systemd journal service.
.
This package contains the development files
This is a transition package that can be safely removed once no package depend on it.
Package: libsystemd-id128-0
Architecture: linux-any
Multi-Arch: same
Section: libs
Priority: optional
Section: oldlibs
Priority: extra
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends},
${misc:Depends}
Description: systemd 128 bit ID utility library
Description: systemd 128 bit ID utility library (deprecated)
The libsystemd-id128 library provides utility functions for generating
128 bit IDs.
.
Transitional compatibility library, functionality has been integrated into
libsystemd0
Package: libsystemd-id128-dev
Architecture: linux-any
Multi-Arch: same
Section: libdevel
Priority: optional
Depends: ${shlibs:Depends},
${misc:Depends},
libsystemd-id128-0 (= ${binary:Version})
Breaks: systemd (<< 204-8)
Replaces: systemd (<< 204-8)
Description: systemd 128 bit ID utility library - development files
Section: oldlibs
Priority: extra
Depends: ${misc:Depends},
libsystemd-dev (>= ${binary:Version})
Description: systemd 128 bit ID utility library (transitional package)
The libsystemd-id128 library provides utility functions for generating
128 bit IDs.
.
This package contains the development files
This is a transition package that can be safely removed once no package depend on it.
Package: udev
Section: admin
......@@ -361,10 +394,7 @@ Priority: extra
Depends: ${misc:Depends},
systemd (= ${binary:Version}),
udev (= ${binary:Version}),
libsystemd-login0 (= ${binary:Version}),
libsystemd-daemon0 (= ${binary:Version}),
libsystemd-journal0 (= ${binary:Version}),
libsystemd-id128-0 (= ${binary:Version}),
libsystemd0 (= ${binary:Version}),
libudev1 (= ${binary:Version})
Description: system and service manager (debug symbols)
systemd is a replacement for sysvinit. It is dependency-based and
......
usr/lib/*/libsystemd-daemon.so
usr/lib/*/pkgconfig/libsystemd-daemon.pc
usr/include/systemd/sd-daemon.h
usr/include/systemd/sd-shutdown.h
usr/share/man/man3/sd-daemon.3
usr/share/man/man3/SD_EMERG.3
usr/share/man/man3/SD_ALERT.3
usr/share/man/man3/SD_CRIT.3
usr/share/man/man3/SD_ERR.3
usr/share/man/man3/SD_WARNING.3
usr/share/man/man3/SD_NOTICE.3
usr/share/man/man3/SD_INFO.3
usr/share/man/man3/SD_DEBUG.3
usr/share/man/man3/SD_LISTEN_FDS_START.3
usr/share/man/man3/sd_booted.3
usr/share/man/man3/sd_notify.3
usr/share/man/man3/sd_notifyf.3
usr/share/man/man3/sd_listen_fds.3
usr/share/man/man3/sd_is_fifo.3
usr/share/man/man3/sd_is_socket.3
usr/share/man/man3/sd_is_socket_inet.3
usr/share/man/man3/sd_is_socket_unix.3
usr/share/man/man3/sd_is_special.3
usr/share/man/man3/sd_is_mq.3
usr/lib/*/libsystemd.so
usr/lib/*/pkgconfig/libsystemd.pc
usr/include/systemd/
usr/share/man/man3/
usr/lib/*/libsystemd-id128.so
usr/lib/*/pkgconfig/libsystemd-id128.pc
usr/include/systemd/sd-id128.h
usr/share/man/man3/sd-id128.3
usr/share/man/man3/sd_id128*
usr/share/man/man3/SD_ID128*
usr/lib/*/libsystemd-journal.so
usr/lib/*/pkgconfig/libsystemd-journal.pc
usr/include/systemd/sd-journal.h
usr/include/systemd/sd-messages.h
usr/share/man/man3/sd_journal*
usr/share/man/man3/sd-journal*
usr/share/man/man3/SD_JOURNAL*
usr/lib/*/libsystemd-login.so
usr/lib/*/pkgconfig/libsystemd-login.pc
usr/include/systemd/sd-login.h
usr/share/man/man3/sd_login*
usr/share/man/man3/sd-login.3
usr/share/man/man3/sd_get_seats.3
usr/share/man/man3/sd_get_sessions.3
usr/share/man/man3/sd_get_uids.3
usr/share/man/man3/sd_get_machine_names.3
usr/share/man/man3/sd_pid_get_session.3
usr/share/man/man3/sd_pid_get_unit.3
usr/share/man/man3/sd_pid_get_user_unit.3
usr/share/man/man3/sd_pid_get_owner_uid.3
usr/share/man/man3/sd_pid_get_machine_name.3
usr/share/man/man3/sd_pid_get_slice.3
usr/share/man/man3/sd_session_is_active.3
usr/share/man/man3/sd_session_get_state.3
usr/share/man/man3/sd_session_get_uid.3
usr/share/man/man3/sd_session_get_seat.3
usr/share/man/man3/sd_session_get_service.3
usr/share/man/man3/sd_session_get_type.3
usr/share/man/man3/sd_session_get_class.3
usr/share/man/man3/sd_session_get_display.3
usr/share/man/man3/sd_session_get_tty.3
usr/share/man/man3/sd_session_get_vt.3
usr/share/man/man3/sd_uid_get_state.3
usr/share/man/man3/sd_uid_is_on_seat.3
usr/share/man/man3/sd_uid_get_sessions.3
usr/share/man/man3/sd_uid_get_seats.3
usr/share/man/man3/sd_seat_get_active.3
usr/share/man/man3/sd_seat_get_sessions.3
usr/share/man/man3/sd_seat_can_graphical.3
usr/share/man/man3/sd_seat_can_multi_session.3
usr/share/man/man3/sd_seat_can_tty.3
lib/*/libsystemd.so.*
......@@ -31,7 +31,8 @@ endif
CONFFLAGS_deb = \
--enable-selinux \
--enable-introspection \
--enable-gtk-doc
--enable-gtk-doc \
--enable-compat-libs
CONFFLAGS_udeb = \
--disable-selinux \
......@@ -98,6 +99,11 @@ override_dh_install:
rm -rf debian/install/*/etc/kernel/
rm -f debian/install/*/usr/lib/sysctl.d/50-default.conf
find debian/install/ -name '*.la' -delete
# Remove .so for deprecated compatibility libraries
rm -f debian/install/*/usr/lib/*/libsystemd-daemon.so
rm -f debian/install/*/usr/lib/*/libsystemd-login.so
rm -f debian/install/*/usr/lib/*/libsystemd-id128.so
rm -f debian/install/*/usr/lib/*/libsystemd-journal.so
dh_install -pudev-udeb -plibudev1-udeb --sourcedir=debian/install/udeb
dh_install $(BOOTSTRAP_DH_FLAGS) -Nudev-udeb -Nlibudev1-udeb --sourcedir=debian/install/deb --fail-missing
# install some files manually, --sourcedir makes that necessary
......@@ -156,6 +162,11 @@ override_dh_install:
ln -s ../udev-finish.service debian/udev/lib/systemd/system/sysinit.target.wants/
install --mode=755 debian/debian-fixup \
debian/systemd/lib/systemd/
# man files for example code in /usr/share/doc
mkdir -p debian/systemd/usr/share/man/man3/
mv debian/libsystemd-dev/usr/share/man/man3/sd-readahead.3 \
debian/libsystemd-dev/usr/share/man/man3/sd_readahead.3 \
debian/systemd/usr/share/man/man3/
# remove duplicates
# files shipped by systemd-sysv / sysvinit
rm debian/systemd/usr/share/man/man1/init.1
......@@ -185,9 +196,6 @@ endif
rm debian/udev/lib/udev/rules.d/73-seat-late.rules
rm debian/udev/lib/udev/rules.d/71-seat.rules
rm debian/udev/lib/udev/rules.d/99-systemd.rules
# files shipped by libsystemd-*-dev
find debian/libsystemd-*-dev -name "*.3" -exec sh -c \
'rm debian/systemd/usr/share/man/man3/$$(basename {})' \;
# use symlinked doc directories as the old udev package did
override_dh_installdocs:
......
udeb: libudev 1 libudev1-udeb
libsystemd 0 libsystemd0 (= ${binary:Version})
libsystemd-login 0 libsystemd-login0 (= ${binary:Version})
libsystemd-journal 0 libsystemd-journal0 (= ${binary:Version})
libsystemd-id128 0 libsystemd-id128-0 (= ${binary:Version})
......
......@@ -28,7 +28,6 @@ usr/bin/timedatectl
usr/bin/localectl
usr/bin/hostnamectl
usr/share/man/man1/
usr/share/man/man3/
usr/share/man/man5/
usr/share/man/man7/
usr/share/man/man8/
......
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