ubiquity

Merge lp:~jbicha/ubiquity/adapt-to-gsd325 into lp:ubiquity

  1. adapt-to-gsd325
  2. Merge into trunk
Proposed by Jeremy Bicha on 2017-08-30
Status: Merged
Merged at revision: 6554
Proposed branch: lp:~jbicha/ubiquity/adapt-to-gsd325
Merge into: lp:ubiquity
Diff against target: 28 lines (+7/-2)
2 files modified
bin/ubiquity-dm (+0/-2)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~jbicha/ubiquity/adapt-to-gsd325
Reviewer Review Type Date Requested Status
Ubuntu Installer Team 2017-08-30 Pending
Review via email: mp+329902@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/ubiquity-dm'
2--- bin/ubiquity-dm 2017-08-21 09:03:14 +0000
3+++ bin/ubiquity-dm 2017-08-30 11:21:55 +0000
4@@ -519,9 +519,7 @@
5 gsd = ['/usr/lib/gnome-settings-daemon/gsd-a11y-keyboard',
6 '/usr/lib/gnome-settings-daemon/gsd-a11y-settings',
7 '/usr/lib/gnome-settings-daemon/gsd-clipboard',
8- '/usr/lib/gnome-settings-daemon/gsd-orientation',
9 '/usr/lib/gnome-settings-daemon/gsd-power',
10- '/usr/lib/gnome-settings-daemon/gsd-xrandr',
11 '/usr/lib/gnome-settings-daemon/gsd-xsettings']
12
13 if osextras.find_on_path(msd):
14
15=== modified file 'debian/changelog'
16--- debian/changelog 2017-08-21 13:26:22 +0000
17+++ debian/changelog 2017-08-30 11:21:55 +0000
18@@ -1,3 +1,10 @@
19+ubiquity (17.10.5) UNRELEASED; urgency=medium
20+
21+ * bin/ubiquity-dm: Don't try to start binaries removed in
22+ gnome-settings-daemon 3.25. Thanks fossfreedom for the report.
23+
24+ -- Jeremy Bicha <jbicha@ubuntu.com> Wed, 30 Aug 2017 07:08:53 -0400
25+
26 ubiquity (17.10.4) artful; urgency=medium
27
28 [ Iain Lane ]

Subscribers

People subscribed via source and target branches

to status/vote changes: