diff --git a/debian/10-lubuntu-nexus7.conf b/debian/10-lubuntu-nexus7.conf deleted file mode 100644 index da4a43c..0000000 --- a/debian/10-lubuntu-nexus7.conf +++ /dev/null @@ -1,2 +0,0 @@ -[SeatDefaults] -user-session=lubuntu-nexus7 diff --git a/debian/10-lubuntu.conf b/debian/10-lubuntu.conf deleted file mode 100644 index 6a54688..0000000 --- a/debian/10-lubuntu.conf +++ /dev/null @@ -1,2 +0,0 @@ -[SeatDefaults] -user-session=Lubuntu diff --git a/debian/10-lxgames.conf b/debian/10-lxgames.conf deleted file mode 100644 index 91a24f9..0000000 --- a/debian/10-lxgames.conf +++ /dev/null @@ -1,2 +0,0 @@ -[SeatDefaults] -user-session=lxgames diff --git a/debian/10-qlubuntu.conf b/debian/10-qlubuntu.conf deleted file mode 100644 index 3c08a3d..0000000 --- a/debian/10-qlubuntu.conf +++ /dev/null @@ -1,2 +0,0 @@ -[SeatDefaults] -user-session=qlubuntu diff --git a/debian/20-lubuntu-nexus7.conf b/debian/20-lubuntu-nexus7.conf new file mode 100644 index 0000000..013420b --- /dev/null +++ b/debian/20-lubuntu-nexus7.conf @@ -0,0 +1,2 @@ +[SeatDefaults] +default-session=lubuntu-nexus7 diff --git a/debian/20-lubuntu.conf b/debian/20-lubuntu.conf new file mode 100644 index 0000000..cd86941 --- /dev/null +++ b/debian/20-lubuntu.conf @@ -0,0 +1,2 @@ +[SeatDefaults] +default-session=Lubuntu diff --git a/debian/20-lxgames.conf b/debian/20-lxgames.conf new file mode 100644 index 0000000..589ca70 --- /dev/null +++ b/debian/20-lxgames.conf @@ -0,0 +1,2 @@ +[SeatDefaults] +default-session=lxgames diff --git a/debian/20-qlubuntu.conf b/debian/20-qlubuntu.conf new file mode 100644 index 0000000..0a9d0b3 --- /dev/null +++ b/debian/20-qlubuntu.conf @@ -0,0 +1,2 @@ +[SeatDefaults] +default-session=qlubuntu diff --git a/debian/changelog b/debian/changelog index c0e54a2..bda60e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +lubuntu-default-settings (0.36) UNRELEASED; urgency=low + + * debian/20-* & debian/*.postrm & debian/*.postinst & + debian/*default-session.install: + - Use lightdm conf files to set default session (LP: #1259525). + * debian/control: + - Make lightdm requirement to >= 1.9.4 for the conf files mechanism. + + -- Julien Lavergne Fri, 13 Dec 2013 20:22:07 +0100 + lubuntu-default-settings (0.35) trusty; urgency=low [ Julien Lavergne ] diff --git a/debian/control b/debian/control index a0a3a0a..4a1a0da 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Depends: ${misc:Depends}, lubuntu-icon-theme, pcmanfm (>= 0.9.5) | pcmanfm-qt, ttf-ubuntu-font-family, - lightdm, + lightdm (>= 1.9.4), lxsession-logout, policykit-desktop-privileges Suggests: amixer, diff --git a/debian/lubuntu-default-session.install b/debian/lubuntu-default-session.install index d9075ee..58066fc 100644 --- a/debian/lubuntu-default-session.install +++ b/debian/lubuntu-default-session.install @@ -1 +1 @@ -debian/10-lubuntu.conf etc/lightdm/lightdm.conf.d/ +debian/20-lubuntu.conf etc/lightdm/lightdm.conf.d/ diff --git a/debian/lubuntu-nexus7-default-session.install b/debian/lubuntu-nexus7-default-session.install index 32ea39d..67f3f7e 100644 --- a/debian/lubuntu-nexus7-default-session.install +++ b/debian/lubuntu-nexus7-default-session.install @@ -1 +1 @@ -debian/10-lubuntu-nexus7.conf etc/lightdm/lightdm.conf.d/ +debian/20-lubuntu-nexus7.conf etc/lightdm/lightdm.conf.d/ diff --git a/debian/lxgames-default-session.install b/debian/lxgames-default-session.install index 4978310..4ec1d88 100644 --- a/debian/lxgames-default-session.install +++ b/debian/lxgames-default-session.install @@ -1 +1 @@ -debian/10-lxgames.conf etc/lightdm/lightdm.conf.d/ +debian/20-lxgames.conf etc/lightdm/lightdm.conf.d/ diff --git a/debian/qlubuntu-default-session.install b/debian/qlubuntu-default-session.install index f747d7e..604777a 100644 --- a/debian/qlubuntu-default-session.install +++ b/debian/qlubuntu-default-session.install @@ -1 +1 @@ -debian/10-qlubuntu.conf etc/lightdm/lightdm.conf.d/ +debian/20-qlubuntu.conf etc/lightdm/lightdm.conf.d/