Split libsystemd-login and libsystemd-daemon into separate binary packages.

diff --git a/debian/changelog b/debian/changelog
index 48f66e553d75607c8bb36417e0e38bac83806615..0000ca7e5177ea6be812dbe5414c50ca1f7dbc76 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ systemd (35-1) UNRELEASED; urgency=low
   * Bump Build-Depends on libudev to (>= 172).
   * Add Build-Depends on libacl1-dev. Required for building systemd-logind
     with ACL support.
+  * Split libsystemd-login and libsystemd-daemon into separate binary
+    packages.
 
  -- Tollef Fog Heen <tfheen@debian.org>  Wed, 14 Sep 2011 08:25:17 +0200
 

diff --git a/debian/control b/debian/control
index 1d37e5b0daff885788f301c53e29a18551c6b8d9..5e701a81fbfa684433fad6cf78eb65c9b5a2475f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -96,3 +96,39 @@ Description: system and service manager - GUI
  availability of a given mount point or dbus service.
  .
  This package contains the graphical frontend for systemd.
+
+Package: libsystemd-login0
+Architecture: linux-any
+Section: libs
+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.
+
+Package: libsystemd-login-dev
+Architecture: linux-any
+Section: libdevel
+Depends: libsystemd-login0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: systemd login utility library - development files
+ 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
+
+Package: libsystemd-daemon0
+Architecture: linux-any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: systemd utility library
+ The sd-daemon library provides a reference implementation of various
+ APIs for new-style daemons, as implemented by the systemd init system.
+
+Package: libsystemd-daemon-dev
+Architecture: linux-any
+Section: libdevel
+Depends: libsystemd-daemon0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: systemd utility library - development files
+ 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

diff --git a/debian/libsystemd-daemon-dev.install b/debian/libsystemd-daemon-dev.install
new file mode 100644 (file)
index 0000000..3a20bfc
--- /dev/null
+++ b/debian/libsystemd-daemon-dev.install
@@ -0,0 +1,3 @@
+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
new file mode 100644 (file)
index 0000000..48d464a
--- /dev/null
+++ b/debian/libsystemd-daemon0.install
@@ -0,0 +1 @@
+lib/libsystemd-daemon.so.*

diff --git a/debian/libsystemd-daemon0.symbols b/debian/libsystemd-daemon0.symbols
new file mode 100644 (file)
index 0000000..5c064cc
--- /dev/null
+++ b/debian/libsystemd-daemon0.symbols
@@ -0,0 +1,12 @@
+libsystemd-daemon.so.0 libsystemd-daemon0 #MINVER#
+ LIBSYSTEMD_DAEMON_31@LIBSYSTEMD_DAEMON_31 31
+ sd_booted@LIBSYSTEMD_DAEMON_31 31
+ sd_is_fifo@LIBSYSTEMD_DAEMON_31 31
+ sd_is_mq@LIBSYSTEMD_DAEMON_31 31
+ sd_is_socket@LIBSYSTEMD_DAEMON_31 31
+ sd_is_socket_inet@LIBSYSTEMD_DAEMON_31 31
+ sd_is_socket_unix@LIBSYSTEMD_DAEMON_31 31
+ sd_is_special@LIBSYSTEMD_DAEMON_31 31
+ sd_listen_fds@LIBSYSTEMD_DAEMON_31 31
+ sd_notify@LIBSYSTEMD_DAEMON_31 31
+ sd_notifyf@LIBSYSTEMD_DAEMON_31 31

diff --git a/debian/libsystemd-login-dev.install b/debian/libsystemd-login-dev.install
new file mode 100644 (file)
index 0000000..d6a0367
--- /dev/null
+++ b/debian/libsystemd-login-dev.install
@@ -0,0 +1,3 @@
+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
new file mode 100644 (file)
index 0000000..02ccaf8
--- /dev/null
+++ b/debian/libsystemd-login0.install
@@ -0,0 +1 @@
+lib/libsystemd-login.so.*

diff --git a/debian/libsystemd-login0.symbols b/debian/libsystemd-login0.symbols
new file mode 100644 (file)
index 0000000..9441669
--- /dev/null
+++ b/debian/libsystemd-login0.symbols
@@ -0,0 +1,21 @@
+libsystemd-login.so.0 libsystemd-login0 #MINVER#
+ LIBSYSTEMD_LOGIN_31@LIBSYSTEMD_LOGIN_31 31
+ sd_get_seats@LIBSYSTEMD_LOGIN_31 31
+ sd_get_sessions@LIBSYSTEMD_LOGIN_31 31
+ sd_get_uids@LIBSYSTEMD_LOGIN_31 31
+ sd_login_monitor_flush@LIBSYSTEMD_LOGIN_31 31
+ sd_login_monitor_get_fd@LIBSYSTEMD_LOGIN_31 31
+ sd_login_monitor_new@LIBSYSTEMD_LOGIN_31 31
+ sd_login_monitor_unref@LIBSYSTEMD_LOGIN_31 31
+ sd_pid_get_owner_uid@LIBSYSTEMD_LOGIN_31 31
+ sd_pid_get_session@LIBSYSTEMD_LOGIN_31 31
+ sd_seat_can_multi_session@LIBSYSTEMD_LOGIN_31 31
+ sd_seat_get_active@LIBSYSTEMD_LOGIN_31 31
+ sd_seat_get_sessions@LIBSYSTEMD_LOGIN_31 31
+ sd_session_get_seat@LIBSYSTEMD_LOGIN_31 31
+ sd_session_get_uid@LIBSYSTEMD_LOGIN_31 31
+ sd_session_is_active@LIBSYSTEMD_LOGIN_31 31
+ sd_uid_get_seats@LIBSYSTEMD_LOGIN_31 31
+ sd_uid_get_sessions@LIBSYSTEMD_LOGIN_31 31
+ sd_uid_get_state@LIBSYSTEMD_LOGIN_31 31
+ sd_uid_is_on_seat@LIBSYSTEMD_LOGIN_31 31

diff --git a/debian/rules b/debian/rules
index 1e97637f5ecb814f0b4e50cb4f65acf2329eeaa2..329c4dd74966e1ae75dd79df76ec9ee7e51e9736 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,9 @@
 #export DEB_BUILD_OPTIONS="nostrip"
 
 override_dh_auto_configure:
-       dh_auto_configure -- --with-rootdir= \
+       dh_auto_configure -- \
+               --with-rootdir= \
+               --with-rootlibdir=/lib \
                --with-udevrulesdir=/lib/udev/rules.d \
                --enable-gtk \
                --enable-libcryptsetup \
@@ -21,10 +23,11 @@ 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
        dh_install -O--parallel --fail-missing
        dh_install -plibpam-systemd debian/pam-configs /usr/share
        dh_install debian/ifup@.service /lib/systemd/system
 
 %:
-       dh $@ --parallel --with autoreconf
+       dh $@ --parallel

diff --git a/debian/systemd.install b/debian/systemd.install
index 42a130d524274eac1527ecd4326587ffc10a4254..7362951aced593bf58882a52f6f2aacb015191d5 100644 (file)
--- a/debian/systemd.install
+++ b/debian/systemd.install
@@ -6,8 +6,9 @@ bin/systemd-tty-ask-password-agent
 bin/systemd-ask-password
 bin/systemd-machine-id-setup
 bin/systemd-tmpfiles
+bin/systemd-loginctl
 lib/systemd/
-lib/udev/rules.d/99-systemd.rules
+lib/udev/rules.d/
 usr/bin/systemd-cgls
 usr/bin/systemd-nspawn
 usr/bin/systemd-stdio-bridge
@@ -18,6 +19,7 @@ usr/share/man/man1/systemd.1
 usr/share/man/man1/systemctl.1
 usr/share/man/man1/systemd-nspawn.1
 usr/share/man/man1/systemd-ask-password.1
+usr/share/man/man1/systemd-loginctl.1
 usr/share/man/man3
 usr/share/man/man5
 usr/share/man/man7
@@ -26,7 +28,11 @@ usr/share/dbus-1
 usr/share/doc
 usr/share/pkgconfig
 usr/share/polkit-1
-usr/lib
+usr/lib/binfmt.d
+usr/lib/modules-load.d
+usr/lib/sysctl.d
+usr/lib/systemd
+usr/lib/tmpfiles.d
 debian/init-functions lib/lsb
 debian/lib-init-rw.automount lib/systemd/system/
 debian/lib-init-rw.mount lib/systemd/system/