diff --git a/backgrounds/greeter-narrow-large.png b/backgrounds/greeter-narrow-large.png new file mode 100644 index 0000000000000000000000000000000000000000..6115a24d6dde9cb3eec23b77ba48fac8feb3bf3f Binary files /dev/null and b/backgrounds/greeter-narrow-large.png differ diff --git a/backgrounds/greeter-wide-large.png b/backgrounds/greeter-wide-large.png new file mode 100644 index 0000000000000000000000000000000000000000..6b193b17ef513f062b77457b4cffa7c1f4163b67 Binary files /dev/null and b/backgrounds/greeter-wide-large.png differ diff --git a/backgrounds/lightdm.xml b/backgrounds/lightdm.xml new file mode 100644 index 0000000000000000000000000000000000000000..08b481c914ca9bd0263818b3db8254ee936023cd --- /dev/null +++ b/backgrounds/lightdm.xml @@ -0,0 +1,12 @@ + + + 8640000.0 + + /usr/share/images/desktop-base/greeter-narrow-large.png + /usr/share/images/desktop-base/greeter-narrow-large.png + /usr/share/images/desktop-base/greeter-wide-large.png + /usr/share/images/desktop-base/greeter-narrow-large.png + /usr/share/images/desktop-base/greeter-wide-large.png + + + diff --git a/debian/changelog b/debian/changelog index c87bc7707d0bf7d479959418c9966d941464ab5e..c027c29cd363f375dd741248f43975a5bc282452 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +desktop-base (1:2.0.2) unstable; urgency=medium + + * Add support for lightdm + + -- fsmithred Sun, 11 Feb 2018 11:59:00 -0500 + desktop-base (1:2.0.1) unstable; urgency=medium * Check for xfce files before doing anything with them. diff --git a/debian/files b/debian/files index fe2ec6cca15818cda576a2d91facf9d931daa877..28107696c9a75abef8be5c919ac021190f5383f1 100644 --- a/debian/files +++ b/debian/files @@ -1,2 +1,2 @@ -desktop-base_2.1_all.deb x11 optional -desktop-base_2.1_amd64.buildinfo x11 optional +desktop-base_2.0.2_all.deb x11 optional +desktop-base_2.0.2_amd64.buildinfo x11 optional diff --git a/debian/install b/debian/install index 6daf20e122366d104635cc703372badeb7397464..1ac92d10e4c39bd49f8376388073fdbb521ac49b 100644 --- a/debian/install +++ b/debian/install @@ -24,3 +24,4 @@ profiles/xdg-config/xfce4 /etc/xdg/ slim/* /usr/share/slim/themes pixmaps/* /usr/share/pixmaps +lightdm/* /etc/lightdm diff --git a/debian/postinst b/debian/postinst index b7c69bd1334e80fec4d9ec6ed3a09eb91a09a056..3a78a292223e912215722657ebb8fd68f57a2040 100644 --- a/debian/postinst +++ b/debian/postinst @@ -94,9 +94,15 @@ if [ -f /etc/xdg/xfce4/panel/default.xml ] ; then rm -f /etc/xdg/xfce4/panel/default.xml fi +if [ -f /etc/lightdm/lightdm-gtk-greeter.conf ] ; then + if ! [ -f /etc/lightdm/lightdm-gtk-greeter.conf.bak ] ; then + cp /etc/lightdm/lightdm-gtk-greeter.conf /etc/lightdm/lightdm-gtk-greeter.conf.bak + fi + rm -f /etc/lightdm/lightdm-gtk-greeter.conf +fi # Use desktop-base.manifest for setting up the alternatives -prefer_svg="desktop-background desktop-splash" +prefer_svg="desktop-background desktop-splash desktop-lightdm-background" if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then # Alternatives for the background while read mline; do @@ -145,6 +151,11 @@ if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then D_B_PATH="/usr/share/slim/themes" TEST_FLAG="-d" ;;& + 'lightdm-gtk-greeter.conf') + D_B_PATH="/etc/lightdm" + LINK="lightdm-gtk-greeter.conf" + NEEDS_SET="yes" + ;;& 'xfce4-xsettings.xml') D_B_PATH="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml" LINK="xsettings.xml" @@ -162,9 +173,12 @@ if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then ;;& 'desktop-background' | \ 'desktop-splash' | \ + 'desktop-lightdm-background' | \ 'desktop-background.xml' | \ + 'desktop-lightdm-background.xml' | \ 'desktop-grub-theme' | \ 'desktop-slim-theme' | \ + 'lightdm-gtk-greeter.conf' | \ 'xfce4-xsettings.xml' | \ 'xfce4-panel.xml' | \ 'xfwm4.xml' ) diff --git a/debian/prerm b/debian/prerm index 0b49e78fc4d0236465a145562c01f5054296f16b..d5d1fb4f67e42ead05f7fdff800485285ff07ceb 100644 --- a/debian/prerm +++ b/debian/prerm @@ -7,15 +7,18 @@ while read line image opts; do DB_PATH="" case $line in 'desktop-background' | 'desktop-background.xml' | 'desktop-splash' | \ - 'desktop-grub-theme') + 'desktop-lightdm-background' | 'desktop-lightdm-background.xml' ) DB_PATH="/usr/share/images/desktop-base" ;; - 'desktop-grub-theme') + 'desktop-grub-theme') DB_PATH="/usr/share/desktop-base" ;; 'desktop-slim-theme') DB_PATH="/usr/share/slim/themes" ;; + 'lightdm-gtk-greeter.conf') + DB_PATH="/etc/lightdm" + ;; 'xfce4-xsettings.xml' | 'xfwm4.xml') DB_PATH="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml" ;; diff --git a/desktop-base.manifest b/desktop-base.manifest index fe64c24cee1197a8b4b1f931317cd8b9146ffb6a..92f70694d8192f5953eace08e27209aaa73f79fe 100644 --- a/desktop-base.manifest +++ b/desktop-base.manifest @@ -75,6 +75,12 @@ desktop-splash your-way_darkpurpy-wide-large.png wide large default desktop-splash your-way_darkpurpy-wide-large.svg wide large default desktop-splash your-way_darkpurpy-wide-small.png wide small default +desktop-lightdm-background greeter-narrow-large.png narrow large default +desktop-lightdm-background greeter-wide-large.png wide large default +desktop-lightdm-background.xml lightdm.xml default + +lightdm-gtk-greeter.conf lightdm-gtk-greeter.conf-devuan-darkpurpy default + desktop-slim-theme devuan-curve-darkpurpy default xfce4-xsettings.xml xsettings.xml-devuan-darkpurpy default xfce4-panel.xml default.xml-devuan-darkpurpy default diff --git a/lightdm/lightdm-gtk-greeter.conf-devuan-darkpurpy b/lightdm/lightdm-gtk-greeter.conf-devuan-darkpurpy new file mode 100644 index 0000000000000000000000000000000000000000..5ebb3cab2eb283bc6c03a36f5879c1634555358d --- /dev/null +++ b/lightdm/lightdm-gtk-greeter.conf-devuan-darkpurpy @@ -0,0 +1,61 @@ +# LightDM GTK+ Configuration +# Available configuration options listed below. +# +# Appearance: +# theme-name = GTK+ theme to use +# icon-theme-name = Icon theme to use +# background = Background file to use, either an image path or a color (e.g. #772953) +# user-background = false|true ("true" by default) Display user background (if available) +# transition-duration = Length of time (in milliseconds) to transition between background images ("500" by default) +# transition-type = ease-in-out|linear|none ("ease-in-out" by default) +# +# Fonts: +# font-name = Font to use +# xft-antialias = false|true Whether to antialias Xft fonts +# xft-dpi = Resolution for Xft in dots per inch (e.g. 96) +# xft-hintstyle = none|slight|medium|hintfull What degree of hinting to use +# xft-rgba = none|rgb|bgr|vrgb|vbgr Type of subpixel antialiasing +# +# Login window: +# active-monitor = Monitor to display greeter window (name or number). Use #cursor value to display greeter at monitor with cursor. Can be a semicolon separated list +# position = x y ("50% 50%" by default) Login window position +# default-user-image = Image used as default user icon, path or #icon-name +# hide-user-image = false|true ("false" by default) +# +# Panel: +# panel-position = top|bottom ("top" by default) +# clock-format = strftime-format string, e.g. %H:%M +# indicators = semi-colon ";" separated list of allowed indicator modules. Built-in indicators include "~a11y", "~language", "~session", "~power", "~clock", "~host", "~spacer". Unity indicators can be represented by short name (e.g. "sound", "power"), service file name, or absolute path +# +# Accessibility: +# a11y-states = states of accessibility features: "name" - save state on exit, "-name" - disabled at start (default value for unlisted), "+name" - enabled at start. Allowed names: contrast, font, keyboard, reader. +# keyboard = command to launch on-screen keyboard (e.g. "onboard") +# keyboard-position = x y[;width height] ("50%,center -0;50% 25%" by default) Works only for "onboard" +# reader = command to launch screen reader (e.g. "orca") +# +# Security: +# allow-debugging = false|true ("false" by default) +# screensaver-timeout = Timeout (in seconds) until the screen blanks when the greeter is called as lockscreen +# +# Template for per-monitor configuration: +# [monitor: name] +# background = overrides default value +# user-background = overrides default value +# laptop = false|true ("false" by default) Marks monitor as laptop display +# transition-duration = overrides default value +# +[greeter] +background=/usr/share/images/desktop-base/desktop-lightdm-background +#theme-name= +#icon-theme-name= +#font-name= +#xft-antialias= +#xft-dpi= +#xft-hintstyle= +#xft-rgba= +#indicators= +#clock-format= +#keyboard= +#reader= +#position= +#screensaver-timeout= diff --git a/profiles/xdg-config/xfce4/panel/default.xml-devuan-purpy b/profiles/xdg-config/xfce4/panel/default.xml-devuan-purpy deleted file mode 100644 index fd1fd33040f5692b7cc9a116cee8b768a26f69aa..0000000000000000000000000000000000000000 --- a/profiles/xdg-config/xfce4/panel/default.xml-devuan-purpy +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml-devuan-purpy b/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml-devuan-purpy deleted file mode 100644 index b77a178f4590eb66eaabe394081683616c5138c9..0000000000000000000000000000000000000000 --- a/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml-devuan-purpy +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml-devuan-purpy b/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml-devuan-purpy deleted file mode 100644 index 729080fc30244ad30081548781901cd0fee9f802..0000000000000000000000000000000000000000 --- a/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml-devuan-purpy +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -