Merge lp:~ivonunes/pantheon-greeter/deb-packaging-isis-fix into lp:~elementary-os/pantheon-greeter/deb-packaging

Proposed by Ivo Nunes
Status: Merged
Approved by: Cody Garver
Approved revision: 24
Merged at revision: 24
Proposed branch: lp:~ivonunes/pantheon-greeter/deb-packaging-isis-fix
Merge into: lp:~elementary-os/pantheon-greeter/deb-packaging
Diff against target: 12 lines (+3/-0)
2 files modified
debian/40-pantheon-greeter.conf (+2/-0)
debian/install (+1/-0)
To merge this branch: bzr merge lp:~ivonunes/pantheon-greeter/deb-packaging-isis-fix
Reviewer Review Type Date Requested Status
Sergey "Shnatsel" Davidoff (community) Approve
Ivo Nunes Abstain
Review via email: mp+206578@code.launchpad.net

Commit message

Fixes setting the default lightdm greeter in Isis, as lightdm-set-defaults no longer exists

Description of the change

Fixes setting the default lightdm greeter in Isis, as lightdm-set-defaults no longer exists.

To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) wrote :

How did you test this?

Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

lightdm-set-defaults never existed in Ubuntu. Greeter selection was handled by the alternatives system inherited from Debian.

Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

NO NO NO scratch that! It did exist if it's in my maintainer scripts...

But I think it should be handled by alternatives now. Maybe.

Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

Looking at Unity Greeter packaging, this is really the right thing to do. However:
 * The calls to lightdm-set-default should be removed from maintainer scripts, otherwise installation will fail because the binary doesn't exist
 * Add something along the lines of "rm_conffile /etc/lightdm/lightdm.conf.d/40-patheon-greeter.conf" to debian/postrm to avoid declaring the greeter as existing when the package is removed (but not purged)

review: Needs Fixing
Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

Actually scratch that too! The settings were moved to /usr/share so that dpkg won't treat them as config files anymore. So rm_conffile should be no longer needed.

But missing /usr/lib/lightdm/lightdm-set-defaults will be a problem, so ditch calls to it from maintainer scripts.

Sorry for the mess!

review: Needs Fixing
Revision history for this message
Ivo Nunes (ivonunes) wrote :

Actually, the scripts check if lightdm-set-defaults exists before calling it, so they don't fail.

This way it keeps compatibility with the older lightdm too.

review: Needs Resubmitting
Revision history for this message
Ivo Nunes (ivonunes) wrote :

Ups, I might have put a wrong review flag on my last comment. Ignore it.

Revision history for this message
Ivo Nunes (ivonunes) :
review: Abstain
Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

What a poor excuse for a reviewer am I...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/40-pantheon-greeter.conf'
2--- debian/40-pantheon-greeter.conf 1970-01-01 00:00:00 +0000
3+++ debian/40-pantheon-greeter.conf 2014-02-15 12:15:17 +0000
4@@ -0,0 +1,2 @@
5+[SeatDefaults]
6+greeter-session=pantheon-greeter
7
8=== added file 'debian/install'
9--- debian/install 1970-01-01 00:00:00 +0000
10+++ debian/install 2014-02-15 12:15:17 +0000
11@@ -0,0 +1,1 @@
12+debian/40-pantheon-greeter.conf /usr/share/lightdm/lightdm.conf.d/

Subscribers

People subscribed via source and target branches

to all changes: