Merge lp:~xnox/ubuntukylin-default-settings/fix-ubiquity into lp:~ubuntukylin-members/ubuntukylin-default-settings/trunk

[Dimitri John Ledkov]

[ShuiLu Pi (pishuilu1128)]

review: Approve

=== modified file 'debian/20_ubuntukylin-default-settings.gschema.override'
--- debian/20_ubuntukylin-default-settings.gschema.override	2013-12-16 03:38:33 +0000
+++ debian/20_ubuntukylin-default-settings.gschema.override	2013-12-16 09:54:40 +0000
@@ -15,4 +15,4 @@
 theme="ubuntukylin-theme"
 
 [com.canonical.Unity.Launcher]
-favorites=['application://ubiquity-gtkui.desktop', 'application://nautilus.desktop', 'application://firefox.desktop', 'application://libreoffice-writer.desktop', 'application://libreoffice-calc.desktop', 'application://libreoffice-impress.desktop', 'application://ubuntu-software-center.desktop', 'application://youker-assistant.desktop', 'application://gnome-terminal.desktop', 'application://gnome-control-center.desktop', 'unity://desktop-icon', 'unity://running-apps', 'unity://expo-icon', 'unity://devices']
+favorites=['application://ubiquity.desktop', 'application://nautilus.desktop', 'application://firefox.desktop', 'application://libreoffice-writer.desktop', 'application://libreoffice-calc.desktop', 'application://libreoffice-impress.desktop', 'application://ubuntu-software-center.desktop', 'application://youker-assistant.desktop', 'application://gnome-terminal.desktop', 'application://gnome-control-center.desktop', 'unity://desktop-icon', 'unity://running-apps', 'unity://expo-icon', 'unity://devices']

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-06 15:44:10 +0000
+++ debian/changelog	2013-12-16 09:54:40 +0000
@@ -1,3 +1,11 @@
+ubuntukylin-default-settings (1.0.12ubuntu1) UNRELEASED; urgency=low
+
+  * Fix missing ubiquity desktop shortcut (LP: #1208386) as per fix
+    suggestion made on 2013-08-29 in
+    https://bugs.launchpad.net/ubuntu/+source/ubuntukylin-default-settings/+bug/1208386/comments/6
+
+ -- Dimitri John Ledkov <[e-mail]>  Mon, 16 Dec 2013 09:52:52 +0000
+
 ubuntukylin-default-settings (1.0.12) trusty; urgency=low
 
   [ Shuilu Pi ]