Merge lp:~jibel/ubiquity/lp1741690_remove_separate_greetee_a11y_icon into lp:ubiquity

[Jean-Baptiste Lallement]

data/ubiquity.json: The separate greeter universal icon has been removed and the gnome-shell mode updated accordingly.

[Dimitri John Ledkov (xnox)]

Change matches changes in gnome-shell between artful and bionic (3.26 vs 3.28)

review: Approve

[lp:~jibel/ubiquity/lp1741690_remove_separate_greetee_a11y_icon]

6611. By Jean-Baptiste Lallement on 2018-04-24

Rebased on trunk

=== modified file 'data/ubiquity.json'
--- data/ubiquity.json	2017-09-05 14:45:15 +0000
+++ data/ubiquity.json	2018-04-24 10:13:36 +0000
@@ -4,7 +4,7 @@
     "stylesheetName": "ubuntu.css",
     "panel": { "left": [],
                "center": ["dateMenu"],
-               "right": ["a11yGreeter", "keyboard", "aggregateMenu"]
+               "right": ["a11y", "keyboard", "aggregateMenu"]
     }
 }
 

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-23 17:10:58 +0000
+++ debian/changelog	2018-04-24 10:13:36 +0000
@@ -8,6 +8,10 @@
   * ubiquity.desktop.in, misc.py: Pass through the ubuntu user's D-Bus session
     bus, if set, so that we can communicate with it.
 
+  [ Jean-Baptiste Lallement ]
+  * data/ubiquity.json: The separate greeter universal icon has been removed
+    and the gnome-shell mode updated accordingly.
+
  -- Iain Lane <[e-mail]>  Mon, 23 Apr 2018 17:42:27 +0100
 
 ubiquity (18.04.10) bionic; urgency=medium