ubuntu-touch-coreapps-reviewers team mailing list archive
-
ubuntu-touch-coreapps-reviewers team
-
Mailing list archive
-
Message #02892
[Merge] lp:~nik90/ubuntu-clock-app/upversion-3.4 into lp:ubuntu-clock-app
Nekhelesh Ramananthan has proposed merging lp:~nik90/ubuntu-clock-app/upversion-3.4 into lp:ubuntu-clock-app.
Commit message:
Updated version to 3.4 to mark transition to vivid.
Requested reviews:
Ubuntu Clock Developers (ubuntu-clock-dev)
For more details, see:
https://code.launchpad.net/~nik90/ubuntu-clock-app/upversion-3.4/+merge/262376
Updated version to 3.4 to mark transition to vivid.
--
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~nik90/ubuntu-clock-app/upversion-3.4 into lp:ubuntu-clock-app.
=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml 2015-02-26 21:19:34 +0000
+++ app/worldclock/WorldCityList.qml 2015-06-18 18:14:57 +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.3.x")
+ .arg("&app=com.ubuntu.clock&version=3.4.x")
console.log("Online URL: " + url)
if (jsonTimeZoneModelLoader.status === Loader.Ready) {
jsonTimeZoneModel.source = Qt.resolvedUrl(url)
=== modified file 'debian/changelog'
--- debian/changelog 2015-06-14 17:15:55 +0000
+++ debian/changelog 2015-06-18 18:14:57 +0000
@@ -1,3 +1,10 @@
+ubuntu-clock-app (3.4) vivid; urgency=medium
+
+ [Nekhelesh Ramananthan]
+ * Updated version to 3.4 to mark transition to vivid framework
+
+ -- Nekhelesh Ramananthan <krnekhelesh@xxxxxxxxx> Thu, 18 Jun 2015 20:08:59 +0200
+
ubuntu-clock-app (3.3) utopic; urgency=medium
[Nekhelesh Ramananthan]
=== modified file 'manifest.json.in'
--- manifest.json.in 2015-01-21 20:14:52 +0000
+++ manifest.json.in 2015-06-18 18:14:57 +0000
@@ -12,7 +12,7 @@
"urls": "share/url-dispatcher/urls/com.ubuntu.clock_clock.url-dispatcher"
}
},
- "version": "3.3.@BZR_REVNO@",
+ "version": "3.4.@BZR_REVNO@",
"maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@xxxxxxxxxxxxxxxxxxx>",
"x-test": {
"autopilot": "ubuntu_clock_app"
=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot 2015-06-14 14:24:23 +0000
+++ po/com.ubuntu.clock.pot 2015-06-18 18:14:57 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-14 16:23+0200\n"
+"POT-Creation-Date: 2015-06-18 18:12+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
Follow ups