Merge lp:~nik90/ubuntu-clock-app/bump-version-3.3 into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Bump clock app version to v3.3 and prepare for store upload.

Bump clock app version to v3.3 and prepare for store upload.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml	2014-10-16 15:52:23 +0000
+++ app/worldclock/WorldCityList.qml	2015-01-21 20:15:49 +0000
@@ -125,7 +125,7 @@
                         var url = String("%1%2%3")
                         .arg("http://geoname-lookup.ubuntu.com/?query=")
                         .arg(searchField.text)
-                        .arg("&app=com.ubuntu.clock&version=3.2.x")
+                        .arg("&app=com.ubuntu.clock&version=3.3.x")
                         console.log("Online URL: " + url)
                         if (jsonTimeZoneModelLoader.status === Loader.Ready) {
                             jsonTimeZoneModel.source = Qt.resolvedUrl(url)

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-21 02:33:40 +0000
+++ debian/changelog	2015-01-21 20:15:49 +0000
@@ -1,3 +1,20 @@
+ubuntu-clock-app (3.3) utopic; urgency=medium
+
+  [Nekhelesh Ramananthan]
+  * Fixed alarm string not being translatable (LP: #1380248)
+  * Bumped framework version to ubuntu-sdk-14.10
+  * Fixed the incorrect overriding of alarm delegate model value.
+  * Fixed qml tests broken in vivid due to listitem behaviour change.
+  * Fixed one-time alarms not being able to be re-enabled using the alarm switch
+    after they have gone off once (LP: #1413027)
+  * OneTime alarms are not automatically dismissed after they are triggered (LP: #1362341)
+
+  [Brendan Donegan]
+  * Fixed AP failure by waiting for the bottom edge tip visible property to be true
+    before trying to swipe up the bottom edge.
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Wed, 21 Jan 2015 21:05:24 +0100
+
 ubuntu-clock-app (3.2) utopic; urgency=medium
 
   [Nekhelesh Ramananthan]
@@ -27,12 +44,6 @@
     now set to false to improve startup animation.
   * Customised splash screen (white background) (LP: #1377638)
   * Added manual test to check disabling of alarms.
-  * Fixed alarm string not being translatable (LP: #1380248)
-  * Fixed the incorrect overriding of alarm delegate model value.
-  * Fixed qml tests broken in vivid due to listitem behaviour change.
-  * Fixed one-time alarms not being able to be re-enabled using the alarm switch
-    after they have gone off once (LP: #1413027)
-  * OneTime alarms are not automatically dismissed after they are triggered (LP: #1362341)
 
   [Akiva Shammai Avraham]
   * Improved the analog clock performance by updating the clock hands every second

=== modified file 'manifest.json.in'
--- manifest.json.in	2014-11-11 14:17:01 +0000
+++ manifest.json.in	2015-01-21 20:15:49 +0000
@@ -12,7 +12,7 @@
             "urls": "share/url-dispatcher/urls/com.ubuntu.clock_clock.url-dispatcher"
         }
     },
-    "version": "3.2.@BZR_REVNO@",
+    "version": "3.3.@BZR_REVNO@",
     "maintainer": "Ubuntu App Cats <[e-mail]>",
     "x-test": {
         "autopilot": "ubuntu_clock_app"