diff options
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rwxr-xr-x | arctica-greeter-guest-account-script.in (renamed from arctica-guest-account-script.sh.in) | 0 | ||||
| -rwxr-xr-x | arctica-greeter-guest-session-auto.sh (renamed from arctica-guest-session-auto.sh) | 0 | ||||
| -rwxr-xr-x | arctica-greeter-guest-session-setup.sh (renamed from arctica-guest-session-setup.sh) | 0 | ||||
| -rw-r--r-- | data/50-arctica-greeter-guest-wrapper.conf.in (renamed from data/50-arctica-guest-wrapper.conf.in) | 0 | ||||
| -rw-r--r-- | data/Makefile.am | 12 | ||||
| -rw-r--r-- | data/arctica-greeter-guest-account-script.1 | 27 | ||||
| -rw-r--r-- | data/arctica-greeter-guest-session-startup.desktop.in (renamed from data/arctica-guest-session-startup.desktop.in) | 0 | ||||
| -rw-r--r-- | debian/arctica-greeter-guest-session.install | 10 | ||||
| -rw-r--r-- | debian/copyright | 10 | ||||
| -rw-r--r-- | po/POTFILES.in | 4 |
11 files changed, 50 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am index 9c08fa5..7ba4009 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,14 +2,14 @@ SUBDIRS = src data po tests -arctica-guest-account-script: arctica-guest-account-script.sh.in +arctica-greeter-guest-account-script: arctica-greeter-guest-account-script.in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ -sbin_SCRIPTS = arctica-guest-account-script +sbin_SCRIPTS = arctica-greeter-guest-account-script pkglibexec_SCRIPTS = lightdm-arctica-greeter-session \ - arctica-guest-session-auto.sh \ - arctica-guest-session-setup.sh \ + arctica-greeter-guest-session-auto.sh \ + arctica-greeter-guest-session-setup.sh \ arctica-greeter-set-keyboard-layout EXTRA_DIST = \ @@ -19,7 +19,7 @@ EXTRA_DIST = \ DISTCLEANFILES = \ Makefile.in \ aclocal.m4 \ - arctica-guest-account-script \ + arctica-greeter-guest-account-script \ compile \ configure \ config.h.in \ diff --git a/arctica-guest-account-script.sh.in b/arctica-greeter-guest-account-script.in index 5c0786d..5c0786d 100755 --- a/arctica-guest-account-script.sh.in +++ b/arctica-greeter-guest-account-script.in diff --git a/arctica-guest-session-auto.sh b/arctica-greeter-guest-session-auto.sh index 785b077..785b077 100755 --- a/arctica-guest-session-auto.sh +++ b/arctica-greeter-guest-session-auto.sh diff --git a/arctica-guest-session-setup.sh b/arctica-greeter-guest-session-setup.sh index 595d0bc..595d0bc 100755 --- a/arctica-guest-session-setup.sh +++ b/arctica-greeter-guest-session-setup.sh diff --git a/data/50-arctica-guest-wrapper.conf.in b/data/50-arctica-greeter-guest-wrapper.conf.in index 1ccd04d..1ccd04d 100644 --- a/data/50-arctica-guest-wrapper.conf.in +++ b/data/50-arctica-greeter-guest-wrapper.conf.in diff --git a/data/Makefile.am b/data/Makefile.am index 3ccc581..686a520 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -3,19 +3,19 @@ 50-arctica-greeter.conf: 50-arctica-greeter.conf.in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ -50-arctica-guest-wrapper.conf: 50-arctica-guest-wrapper.conf.in +50-arctica-greeter-guest-wrapper.conf: 50-arctica-greeter-guest-wrapper.conf.in $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ lightdm_confdir = $(datadir)/lightdm/lightdm.conf.d lightdm_conf_DATA = \ 50-arctica-greeter.conf \ - 50-arctica-guest-wrapper.conf + 50-arctica-greeter-guest-wrapper.conf -arctica-guest-session-startup.desktop: arctica-guest-session-startup.desktop.in +arctica-greeter-guest-session-startup.desktop: arctica-greeter-guest-session-startup.desktop.in $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ guestsession_autostartdir = $(datadir)/arctica-greeter/guest-session/skel/.config/autostart -guestsession_autostart_DATA = arctica-guest-session-startup.desktop +guestsession_autostart_DATA = arctica-greeter-guest-session-startup.desktop xgreeterdir = $(datarootdir)/xgreeters dist_xgreeter_in_files = arctica-greeter.desktop.in @@ -91,8 +91,8 @@ EXTRA_DIST = \ DISTCLEANFILES = \ 50-arctica-greeter.conf \ - 50-arctica-guest-wrapper.conf \ + 50-arctica-greeter-guest-wrapper.conf \ arctica-greeter.desktop \ - arctica-guest-session-startup.desktop \ + arctica-greeter-guest-session-startup.desktop \ Makefile.in \ logo.png diff --git a/data/arctica-greeter-guest-account-script.1 b/data/arctica-greeter-guest-account-script.1 new file mode 100644 index 0000000..58a35a6 --- /dev/null +++ b/data/arctica-greeter-guest-account-script.1 @@ -0,0 +1,27 @@ +.TH UNITY-GREETER 1 "June 21, 2012" +.SH NAME +arctica-greeter \- LightDM greeter for the Unity desktop +.SH SYNOPSIS +.B arctica-greeter +[ +.I OPTIONS +] +.SH DESCRIPTION +.B Arctica Greeter +is a LightDM greeter for the Unity desktop. +It is run by the LightDM daemon if configured in lightdm.conf. +It is not normally run by a user, but can run in a test mode with the \-\-test-mode option. +This allows the interface to be tested without installing an updated version. +.PP +.SH OPTIONS +.TP +.B \-v, \-\-version +Show release version. +.TP +.B \-\-test-mode +Run the greeter in a test mode inside the current X session. +.TP +.B \-?, \-\-help +Show help options. +.SH SEE ALSO +.B lightdm diff --git a/data/arctica-guest-session-startup.desktop.in b/data/arctica-greeter-guest-session-startup.desktop.in index f0b702f..f0b702f 100644 --- a/data/arctica-guest-session-startup.desktop.in +++ b/data/arctica-greeter-guest-session-startup.desktop.in diff --git a/debian/arctica-greeter-guest-session.install b/debian/arctica-greeter-guest-session.install index 0b23f36..f5f55da 100644 --- a/debian/arctica-greeter-guest-session.install +++ b/debian/arctica-greeter-guest-session.install @@ -1,6 +1,6 @@ etc/lightdm/lightdm.conf.d/91* -usr/sbin/arctica-guest-account-script -usr/lib/*/arctica-greeter/arctica-guest-session-auto.sh -usr/lib/*/arctica-greeter/arctica-guest-session-setup.sh -usr/share/lightdm/lightdm.conf.d/50-arctica-guest-wrapper.conf -usr/share/arctica-greeter/guest-session/skel/.config/autostart/arctica-guest-session-startup.desktop +usr/sbin/arctica-greeter-guest-account-script +usr/lib/*/arctica-greeter/arctica-greeter-guest-session-auto.sh +usr/lib/*/arctica-greeter/arctica-greeter-guest-session-setup.sh +usr/share/lightdm/lightdm.conf.d/50-arctica-greeter-guest-wrapper.conf +usr/share/arctica-greeter/guest-session/skel/.config/autostart/arctica-greeter-guest-session-startup.desktop diff --git a/debian/copyright b/debian/copyright index 19644a1..91044ec 100644 --- a/debian/copyright +++ b/debian/copyright @@ -35,7 +35,7 @@ Copyright: 2011, Canonical Ltd 2017, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> License: GPL-3 -Files: arctica-guest-session-auto.sh +Files: arctica-greeter-guest-session-auto.sh lightdm-arctica-greeter-session src/cached-image.vala src/cairo-utils.vala @@ -267,7 +267,7 @@ Files: arctica-greeter-set-keyboard-layout Copyright: 2017, Clement Lefebvre <clement.lefebvre@linuxmint.com> License: GPL-3 -Files: arctica-guest-account-script.sh.in +Files: arctica-greeter-guest-account-script.sh.in Copyright: 2008, Canonical Ltd. License: GPL-2+ @@ -287,15 +287,15 @@ Files: AUTHORS NEWS.Canonical README arctica-greeter.doap - arctica-guest-session-setup.sh + arctica-greeter-guest-session-setup.sh autogen.sh configure.ac data/50-arctica-greeter.conf.in - data/50-arctica-guest-wrapper.conf.in + data/50-arctica-greeter-guest-wrapper.conf.in data/Makefile.am data/arctica-greeter.1 data/arctica-greeter.desktop.in - data/arctica-guest-session-startup.desktop.in + data/arctica-greeter-guest-session-startup.desktop.in data/org.ArcticaProject.arctica-greeter.gschema.xml po/LINGUAS po/POTFILES.in diff --git a/po/POTFILES.in b/po/POTFILES.in index 09042e2..73ba077 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -24,6 +24,6 @@ src/toggle-box.vala src/arctica-greeter.vala src/user-list.vala src/user-prompt-box.vala -arctica-guest-account-script.sh.in -arctica-guest-session-auto.sh +arctica-greeter-guest-account-script.sh.in +arctica-greeter-guest-session-auto.sh data/arctica-greeter.desktop.in |