Merge lp:~seb128/ubiquity/new-gsd-binaries into lp:ubiquity

[Sebastien Bacher]

Update ubiquity-dm for the new gnome-settings-daemon (lp: #1702892)

Update ubiquity-dm for the new gnome-settings-daemon (lp: #1702892)

The list of binaries is something that could be argued over, some are not very useful but could be used in some cases...

[Didier Roche (didrocks)]

LGTM, I think the list makes sense (at least, I wouldn't remove any binaries from it) without looking if more is needed.

Didn't spot anything bad python-side wide.

review: Approve

[Iain Lane (laney)]

Looks good, just one comment inline that you might or might not want to do. (I'm not a reviewer though).

review: Approve

[Mathieu Trudel-Lapierre (cyphermox)]

Looks fine to me. I added a comment on Laney's comment. I leave the decision for this particular thing to you.

review: Approve

[lp:~seb128/ubiquity/new-gsd-binaries]

6541. By Sebastien Bacher on 2017-07-27

check for the gsd directory rather than a specific binary

[Sebastien Bacher (seb128)]

new commit up for review

[lp:~seb128/ubiquity/new-gsd-binaries]

6542. By Sebastien Bacher on 2017-07-27

Rebase on trunk

[Iain Lane (laney)]

I'm good with that, thanks.

Only concern is that if we move to multiarch paths there it'll stop working, but the full path to the binaries is given in any case, so that will already break.

review: Approve

=== modified file 'bin/ubiquity-dm'
--- bin/ubiquity-dm	2017-03-23 12:30:39 +0000
+++ bin/ubiquity-dm	2017-07-27 07:51:38 +0000
@@ -516,7 +516,13 @@
 
                 msd = '/usr/bin/mate-settings-daemon'
                 usd = '/usr/lib/unity-settings-daemon/unity-settings-daemon'
-                gsd = '/usr/lib/gnome-settings-daemon/gnome-settings-daemon'
+                gsd = ['/usr/lib/gnome-settings-daemon/gsd-a11y-keyboard',
+                       '/usr/lib/gnome-settings-daemon/gsd-a11y-settings',
+                       '/usr/lib/gnome-settings-daemon/gsd-clipboard',
+                       '/usr/lib/gnome-settings-daemon/gsd-orientation',
+                       '/usr/lib/gnome-settings-daemon/gsd-power',
+                       '/usr/lib/gnome-settings-daemon/gsd-xrandr',
+                       '/usr/lib/gnome-settings-daemon/gsd-xsettings']
 
                 if osextras.find_on_path(msd):
                     extras.append(subprocess.Popen(
@@ -535,10 +541,12 @@
                     # At this point we're sure the usd xsettings plugin is
                     # available, we can continue setting up the session.
 
-                elif osextras.find_on_path(gsd):
-                    extras.append(subprocess.Popen(
-                        [gsd], stdin=null, stdout=logfile, stderr=logfile,
-                        preexec_fn=self.drop_privileges))
+                elif os.path.isdir("/usr/lib/gnome-settings-daemon"):
+                    for gsdbinary in gsd:
+                        if osextras.find_on_path(gsdbinary):
+                            extras.append(subprocess.Popen(
+                                [gsdbinary], stdin=null, stdout=logfile, stderr=logfile,
+                                preexec_fn=self.drop_privileges))
 
                 elif background_image and osextras.find_on_path('feh'):
                     subprocess.call(

=== modified file 'debian/changelog'
--- debian/changelog	2017-07-25 21:27:37 +0000
+++ debian/changelog	2017-07-27 07:51:38 +0000
@@ -1,3 +1,9 @@
+ubiquity (17.10.3) UNRELEASED; urgency=medium
+
+  * Update ubiquity-dm for the new gnome-settings-daemon (lp: #1702892)
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 27 Jul 2017 09:50:30 +0200
+
 ubiquity (17.10.2) artful; urgency=medium
 
   * Depend/build-depend on python3-debconf rather than debconf for the