Split package; move systemadm and pam module to own packages

diff --git a/debian/control b/debian/control
index daf5cacb05d63f0641795106d13dbb9f65871d57..1fb343f2711ef44f3b8be4f356c8e2d60dc6163b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,8 @@ Package: systemd
 Architecture: linux-any
 Section: admin
 Priority: extra
+Recommends: libpam-systemd
+Suggests: systemd-gui
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: system and session manager
  systemd is a replacement for sysvinit.  It is dependency-based and
@@ -40,3 +42,36 @@ Description: system and session manager - SysV links
  .
  This package provides the manual pages and links needed for systemd
  to replace sysvinit.
+
+Package: libpam-systemd
+Architecture: linux-any
+Section: admin
+Priority: extra
+Depends: systemd, ${shlibs:Depends}, ${misc:Depends}
+Description: system and session manager - PAM module
+ systemd is a replacement for sysvinit.  It is dependency-based and
+ able to read the LSB init script headers in addition to parsing rcN.d
+ links as hints.
+ .
+ It also provides process supervision using cgroups and the ability to
+ not only depend on other init script being started, but also
+ availability of a given mount point or dbus service.
+ .
+ This package contains the PAM module which registers user sessions in
+ the systemd control group hierarchy
+
+Package: systemd-gui
+Architecture: linux-any
+Section: admin
+Priority: extra
+Depends: systemd, ${shlibs:Depends}, ${misc:Depends}
+Description: system and session manager - GUI
+ systemd is a replacement for sysvinit.  It is dependency-based and
+ able to read the LSB init script headers in addition to parsing rcN.d
+ links as hints.
+ .
+ It also provides process supervision using cgroups and the ability to
+ not only depend on other init script being started, but also
+ availability of a given mount point or dbus service.
+ .
+ This package contains the graphical frontend for systemd.

diff --git a/debian/libpam-systemd.install b/debian/libpam-systemd.install
new file mode 100644 (file)
index 0000000..18b8af9
--- /dev/null
+++ b/debian/libpam-systemd.install
@@ -0,0 +1,2 @@
+lib/security/pam_systemd.so
+usr/share/man/man8/pam_systemd.8

diff --git a/debian/rules b/debian/rules
index 34e1c8c6e1b9bea18bde48735176c7db681c3274..4a40052505e3c9f460621e77b7da8d2cfccf2256 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@
 override_dh_install:
        rm debian/tmp/usr/share/doc/systemd/LICENSE
        dh_install -O--parallel --fail-missing
+       dh_install -plibpam-systemd debian/pam-configs /usr/share
 
 override_dh_auto_configure:
        dh_auto_configure -- --with-rootdir=
@@ -14,6 +15,7 @@ override_dh_auto_install:
        dh_auto_install
        rm debian/tmp/etc/systemd/system/runlevel5.target
        dh_link /lib/systemd/system/multi-user.target etc/systemd/system/runlevel5.target
+       rm debian/tmp/lib/security/pam_systemd.la
 
 %:
        dh --parallel $@

diff --git a/debian/systemd-gui.install b/debian/systemd-gui.install
new file mode 100644 (file)
index 0000000..47d0512
--- /dev/null
+++ b/debian/systemd-gui.install
@@ -0,0 +1,2 @@
+usr/bin/systemadm
+usr/share/man/man1/systemadm.1

diff --git a/debian/systemd.install b/debian/systemd.install
index 141b3d867571059e86809acc55f7ca307021ca49..e87edc13a1306963428a08c9951423c2fd24b77b 100644 (file)
--- a/debian/systemd.install
+++ b/debian/systemd.install
@@ -4,18 +4,15 @@ bin/systemctl
 bin/systemd-notify
 lib/systemd/
 lib/udev/rules.d/99-systemd.rules
-usr/bin/systemd-install
-usr/bin/systemadm
+usr/bin/systemd-cgls
 usr/share/man/man1/systemd-notify.1
+usr/share/man/man1/systemd-cgls.1
 usr/share/man/man1/systemd.1
 usr/share/man/man1/systemctl.1
-usr/share/man/man1/systemd-install.1
-usr/share/man/man1/systemadm.1
 usr/share/man/man3
 usr/share/man/man5
 usr/share/man/man7
 usr/share/dbus-1
 usr/share/doc
 usr/share/pkgconfig
-usr/share/man/man8/pam_systemd.8
 usr/share/systemd/session