From 8a7f97e14fbecb73df3b3ee9f658805d7c272c10 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 12 Jun 2017 01:17:59 +0200 Subject: Split up packaging: outsource arctica-greeter-remote-logon and arctica-greeter-guest-session. Allow the admin to selectively add those features or remove them, if needed. --- Makefile.am | 2 ++ debian/90-arctica-greeter.conf | 4 ++-- debian/91-arctica-greeter-guest-session.conf | 16 +++++++++++++ debian/92-arctica-greeter-remote-logon.conf | 4 ++++ debian/arctica-greeter-guest-session.install | 2 ++ debian/arctica-greeter-remote-logon.install | 1 + debian/arctica-greeter.install | 4 ++++ debian/control | 34 ++++++++++++++++++++++------ debian/rules | 14 +++++++----- 9 files changed, 66 insertions(+), 15 deletions(-) create mode 100644 debian/91-arctica-greeter-guest-session.conf create mode 100644 debian/92-arctica-greeter-remote-logon.conf create mode 100644 debian/arctica-greeter-guest-session.install create mode 100644 debian/arctica-greeter-remote-logon.install create mode 100644 debian/arctica-greeter.install diff --git a/Makefile.am b/Makefile.am index 95dd62b..8035bf3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,6 +2,8 @@ SUBDIRS = src data po tests +sbin_SCRIPTS = arctica-guest-account-script + EXTRA_DIST = \ autogen.sh \ arctica-greeter.doap diff --git a/debian/90-arctica-greeter.conf b/debian/90-arctica-greeter.conf index b6a3050..3f862fe 100644 --- a/debian/90-arctica-greeter.conf +++ b/debian/90-arctica-greeter.conf @@ -10,11 +10,11 @@ greeter-session=arctica-greeter #greeter-hide-users=true # don neither show a username / password login prompt for local login -#greeter-show-manual-login=false +greeter-show-manual-login=true # disable guest sessions (a guest session requires a valid default # user-session parameter, see below) -allow-guest=false +#allow-guest=true # enforce showing remote login feature greeter-show-remote-login=true diff --git a/debian/91-arctica-greeter-guest-session.conf b/debian/91-arctica-greeter-guest-session.conf new file mode 100644 index 0000000..1c95904 --- /dev/null +++ b/debian/91-arctica-greeter-guest-session.conf @@ -0,0 +1,16 @@ +[LightDM] + +# Override default guest-account script by Arctica Greeters guest +# account script. +guest-account-script=arctica-guest-account-script + +[SeatDefaults] + +# disable guest sessions (a guest session requires a valid default +# user-session parameter, see below) +allow-guest=true +greeter-allow-guest=true + +# if on Ubuntu and Unity is not installed, this is a minimal user session type for +# default (guest) sessions (sudo apt-get install openbox) +user-session=openbox diff --git a/debian/92-arctica-greeter-remote-logon.conf b/debian/92-arctica-greeter-remote-logon.conf new file mode 100644 index 0000000..bec1ab2 --- /dev/null +++ b/debian/92-arctica-greeter-remote-logon.conf @@ -0,0 +1,4 @@ +[SeatDefaults] + +# enforce showing remote login feature +greeter-show-remote-login=true diff --git a/debian/arctica-greeter-guest-session.install b/debian/arctica-greeter-guest-session.install new file mode 100644 index 0000000..d09fd2b --- /dev/null +++ b/debian/arctica-greeter-guest-session.install @@ -0,0 +1,2 @@ +usr/sbin/arctica-guest-account-script +etc/lightdm/lightdm.conf.d/91* \ No newline at end of file diff --git a/debian/arctica-greeter-remote-logon.install b/debian/arctica-greeter-remote-logon.install new file mode 100644 index 0000000..dd8baa4 --- /dev/null +++ b/debian/arctica-greeter-remote-logon.install @@ -0,0 +1 @@ +etc/lightdm/lightdm.conf.d/92* \ No newline at end of file diff --git a/debian/arctica-greeter.install b/debian/arctica-greeter.install new file mode 100644 index 0000000..2dcf03c --- /dev/null +++ b/debian/arctica-greeter.install @@ -0,0 +1,4 @@ +etc/lightdm/lightdm.conf.d/90-arctica-greeter.conf +usr/sbin/arctica-greeter +usr/share/ +var/lib/polkit-1/localauthority/10-vendor.d/arctica-greeter.pkla diff --git a/debian/control b/debian/control index 729cafe..f8b2874 100644 --- a/debian/control +++ b/debian/control @@ -47,9 +47,6 @@ Recommends: ayatana-indicator-application, ayatana-indicator-session, ayatana-indicator-sound, network-manager-gnome, - lightdm-remote-session-freerdp, - lightdm-remote-session-x2go, - remote-logon-service, mate-settings-daemon, xinput, Provides: lightdm-greeter @@ -58,10 +55,33 @@ Breaks: Description: LightDM Arctica Greeter A greeter shell for the LightDM login manager. Arctica Greeter can be used as local display manager as well as thin client login manager. + +Package: arctica-greeter-guest-session +Architecture: all +Depends: ${misc:Depends}, + adduser, +Recommends: openbox, +Description: LightDM Arctica Greeter - Guest Session Support + A greeter shell for the LightDM login manager. Arctica Greeter can be used as + local display manager as well as thin client login manager. + . + This package adds guest account support to the Arctica Greeter login manager. + +Package: arctica-greeter-remote-logon +Architecture: all +Depends: ${misc:Depends}, + arctica-greeter-guest-session, + remote-logon-service, +Recommends: lightdm-remote-session-freerdp, + lightdm-remote-session-x2go, +Description: LightDM Arctica Greeter - Remote Login Support + A greeter shell for the LightDM login manager. Arctica Greeter can be used as + local display manager as well as thin client login manager. . - Remote sessions supported by Arctica Greeter: + This package adds remote logon support to Arctica Greeter. Remote + sessions supported by Arctica Greeter are: . - Arctica Remote Desktop Sessions - - X2Go sessions (desktop type) - - FreeRDP sessions - - Citrix remote desktop sessions + - X2Go Desktop Sessions + - Windows RDP sessions (FreeRDP) + - Citrix Remote Desktop Sessions diff --git a/debian/rules b/debian/rules index 3ccbcb0..6d90b03 100755 --- a/debian/rules +++ b/debian/rules @@ -16,12 +16,14 @@ override_dh_auto_build: override_dh_auto_install: dh_auto_install - mkdir -p debian/arctica-greeter/var/lib/polkit-1/localauthority/10-vendor.d/ - cp debian/arctica-greeter.pkla debian/arctica-greeter/var/lib/polkit-1/localauthority/10-vendor.d/ - mkdir -p debian/arctica-greeter/usr/share/lightdm/lightdm.conf.d/ - cp debian/50-arctica-greeter.conf debian/arctica-greeter/usr/share/lightdm/lightdm.conf.d/ - mkdir -p debian/arctica-greeter/etc/lightdm/lightdm.conf.d/ - cp debian/90-arctica-greeter.conf debian/arctica-greeter/etc/lightdm/lightdm.conf.d/ + mkdir -p debian/tmp/var/lib/polkit-1/localauthority/10-vendor.d/ + cp debian/arctica-greeter.pkla debian/tmp/var/lib/polkit-1/localauthority/10-vendor.d/ + mkdir -p debian/tmp/usr/share/lightdm/lightdm.conf.d/ + cp debian/50-arctica-greeter.conf debian/tmp/usr/share/lightdm/lightdm.conf.d/ + mkdir -p debian/tmp/etc/lightdm/lightdm.conf.d/ + cp debian/90-arctica-greeter.conf debian/tmp/etc/lightdm/lightdm.conf.d/ + cp debian/91-arctica-greeter-guest-session.conf debian/tmp/etc/lightdm/lightdm.conf.d/ + cp debian/92-arctica-greeter-remote-logon.conf debian/tmp/etc/lightdm/lightdm.conf.d/ override_dh_auto_clean: dh_auto_clean -- cgit v1.2.3