From b53a1b605c6b2209e7be6bd3694abf1c7e19c965 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Tue, 13 Oct 2015 12:13:09 +0200 Subject: [PATCH] * src/etc/lightdm/lightdm-gtk-greeter.conf.d/30_lubuntu.conf: - Move the lightdm-gtk-greeter config file to the new location. * src/etc/xdg/lubuntu/lightdm: - Remove the old location of lightdm-gtk-greeter config file. * debian/lubuntu-default-settings.dirs - Remove /etc/lightdm now that it's created. * debian/control - Increase the depends on lightdm-gtk-greeter. * debian/lubuntu-default-settings.postinst * debian/lubuntu-default-settings.postrm * debian/lubuntu-default-settings.preinst * debian/lubuntu-default-settings.prerm - Update with the new lightdm-gtk-greeter config file. --- debian/changelog | 13 +++++++++++++ debian/control | 6 +++--- debian/lubuntu-default-settings.dirs | 1 - debian/lubuntu-default-settings.install | 2 +- debian/lubuntu-default-settings.postinst | 10 +++++++--- debian/lubuntu-default-settings.postrm | 14 ++++++++++++++ debian/lubuntu-default-settings.preinst | 14 ++++++++++++++ debian/lubuntu-default-settings.prerm | 2 -- .../lightdm-gtk-greeter.conf.d/30_lubuntu.conf} | 0 9 files changed, 52 insertions(+), 10 deletions(-) create mode 100644 debian/lubuntu-default-settings.postrm create mode 100644 debian/lubuntu-default-settings.preinst rename src/etc/{xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf => lightdm/lightdm-gtk-greeter.conf.d/30_lubuntu.conf} (100%) diff --git a/debian/changelog b/debian/changelog index 133830b..a71e7f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,19 @@ lubuntu-default-settings (0.44) UNRELEASED; urgency=medium by default. * debian/lubuntu-default-settings.install - Install xfce4 specific settings. + * src/etc/lightdm/lightdm-gtk-greeter.conf.d/30_lubuntu.conf: + - Move the lightdm-gtk-greeter config file to the new location. + * src/etc/xdg/lubuntu/lightdm: + - Remove the old location of lightdm-gtk-greeter config file. + * debian/lubuntu-default-settings.dirs + - Remove /etc/lightdm now that it's created. + * debian/control + - Increase the depends on lightdm-gtk-greeter. + * debian/lubuntu-default-settings.postinst + * debian/lubuntu-default-settings.postrm + * debian/lubuntu-default-settings.preinst + * debian/lubuntu-default-settings.prerm + - Update with the new lightdm-gtk-greeter config file. [ Krytarik Raido ] * src/usr/share/lubuntu/openbox/rc.xml & nexus-rc.xml: diff --git a/debian/control b/debian/control index c873da9..47db0fa 100644 --- a/debian/control +++ b/debian/control @@ -44,7 +44,7 @@ Package: lxgames-default-session Architecture: all Depends: ${misc:Depends}, lubuntu-default-settings, - lightdm-greeter, + lightdm-gtk-greeter (>= 2.0.1-1), lightdm (>= 1.9.4), lubuntu-extra-sessions Provides: lightdm-gtk-greeter-config @@ -55,7 +55,7 @@ Package: lubuntu-default-session Architecture: all Depends: ${misc:Depends}, lubuntu-default-settings, - lightdm-greeter, + lightdm-gtk-greeter (>= 2.0.1-1), lightdm (>= 1.9.4) Provides: lightdm-gtk-greeter-config Description: Set default session to Lubuntu @@ -65,7 +65,7 @@ Package: lubuntu-nexus7-default-session Architecture: all Depends: ${misc:Depends}, lubuntu-default-settings, - lightdm-greeter, + lightdm-gtk-greeter (>= 2.0.1-1), lightdm (>= 1.9.4), lubuntu-extra-sessions Provides: lightdm-gtk-greeter-config diff --git a/debian/lubuntu-default-settings.dirs b/debian/lubuntu-default-settings.dirs index 389ccb7..cc94349 100644 --- a/debian/lubuntu-default-settings.dirs +++ b/debian/lubuntu-default-settings.dirs @@ -1,2 +1 @@ /etc/lxdm -/etc/lightdm diff --git a/debian/lubuntu-default-settings.install b/debian/lubuntu-default-settings.install index abf64df..7e12447 100644 --- a/debian/lubuntu-default-settings.install +++ b/debian/lubuntu-default-settings.install @@ -1,6 +1,6 @@ +etc/lightdm/ etc/xdg/lubuntu/applications/ etc/xdg/lubuntu/libfm/ -etc/xdg/lubuntu/lightdm/ etc/xdg/lubuntu/lxdm/ etc/xdg/lubuntu/lxterminal/ etc/xdg/lubuntu/menus/lxde-applications.menu diff --git a/debian/lubuntu-default-settings.postinst b/debian/lubuntu-default-settings.postinst index b4b9465..865ef36 100644 --- a/debian/lubuntu-default-settings.postinst +++ b/debian/lubuntu-default-settings.postinst @@ -13,9 +13,13 @@ fi if [ "$1" = "configure" ] ; then update-alternatives --install /etc/lxdm/default.conf \ lxdm.conf /etc/xdg/lubuntu/lxdm/lxdm.conf 60 - update-alternatives --install /etc/lightdm/lightdm-gtk-greeter.conf \ - lightdm-gtk-greeter-config-derivative \ - /etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf 30 +fi + +if dpkg-maintscript-helper supports mv_conffile; then + dpkg-maintscript-helper mv_conffile \ + /etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf \ + /etc/lightdm/lightdm-gtk-greeter.conf.d/30_lubuntu.conf \ + 0.44 -- "$@" fi #DEBHELPER# diff --git a/debian/lubuntu-default-settings.postrm b/debian/lubuntu-default-settings.postrm new file mode 100644 index 0000000..018967e --- /dev/null +++ b/debian/lubuntu-default-settings.postrm @@ -0,0 +1,14 @@ +#! /bin/sh + +set -e + +if dpkg-maintscript-helper supports mv_conffile; then + dpkg-maintscript-helper mv_conffile \ + /etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf \ + /etc/lightdm/lightdm-gtk-greeter.conf.d/30_lubuntu.conf \ + 0.44 -- "$@" +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/lubuntu-default-settings.preinst b/debian/lubuntu-default-settings.preinst new file mode 100644 index 0000000..018967e --- /dev/null +++ b/debian/lubuntu-default-settings.preinst @@ -0,0 +1,14 @@ +#! /bin/sh + +set -e + +if dpkg-maintscript-helper supports mv_conffile; then + dpkg-maintscript-helper mv_conffile \ + /etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf \ + /etc/lightdm/lightdm-gtk-greeter.conf.d/30_lubuntu.conf \ + 0.44 -- "$@" +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/lubuntu-default-settings.prerm b/debian/lubuntu-default-settings.prerm index 1466ea8..c287785 100644 --- a/debian/lubuntu-default-settings.prerm +++ b/debian/lubuntu-default-settings.prerm @@ -4,8 +4,6 @@ set -e if [ "$1" = "remove" ] ; then update-alternatives --remove lxdm.conf /etc/xdg/lubuntu/lxdm/lxdm.conf - update-alternatives --remove lightdm-gtk-greeter-config-derivative \ - /etc/xdg/xdg-xubuntu/lightdm/lightdm-gtk-greeter.conf fi #DEBHELPER# diff --git a/src/etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf b/src/etc/lightdm/lightdm-gtk-greeter.conf.d/30_lubuntu.conf similarity index 100% rename from src/etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf rename to src/etc/lightdm/lightdm-gtk-greeter.conf.d/30_lubuntu.conf