Merge lp:~darkxst/ubiquity/lp1284983 into lp:ubiquity

[Tim Lunn]

[lp:~darkxst/ubiquity/lp1284983]

6124. By Tim Lunn on 2014-02-26

fix version

[Dimitri John Ledkov (xnox)]

review: Approve

=== modified file 'data/ubiquity.json'
--- data/ubiquity.json	2013-08-27 06:20:18 +0000
+++ data/ubiquity.json	2014-02-26 06:11:45 +0000
@@ -2,8 +2,8 @@
     "hasWindows": true,
     "components": ["polkitAgent", "networkAgent"],
     "panel": { "left": [],
-               "center": [],
-               "right": ["a11yGreeter", "keyboard", "volume", "network","battery", "powerMenu"]
+               "center": ["dateMenu"],
+               "right": ["a11yGreeter", "keyboard", "aggregateMenu"]
     }
 }
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-02-22 11:01:14 +0000
+++ debian/changelog	2014-02-26 06:11:45 +0000
@@ -4,7 +4,10 @@
   * Remove redundant placeholder text from fields on user-entry page (LP:
     #1283047)
 
- -- Dimitri John Ledkov <[e-mail]>  Sat, 22 Feb 2014 11:00:22 +0000
+  [ Tim Lunn ]
+  * Update ubiquity gnome-shell mode for 3.10 (LP: #1284983) 
+ 
+ -- Tim Lunn <[e-mail]>  Wed, 26 Feb 2014 16:59:12 +1100
 
 ubiquity (2.17.8) trusty; urgency=medium