Merge lp:~nik90/ubuntu-clock-app/add-utc-city into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Added UTC to the local city list.

Added UTC to the local city list.

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

PASSED: Continuous integration, rev:79
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/269/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/164
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/164/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/269

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/269/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:79
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/440/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/165
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/165/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/87

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/440/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-clock-app-autolanding/49/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/349/console
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/ubuntu-clock-app-utopic-amd64-autolanding/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/547/console

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/add-utc-city]

80. By Nekhelesh Ramananthan on 2014-09-04

merged trunk

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'app/worldclock/world-city-list.xml'
--- app/worldclock/world-city-list.xml	2014-07-22 14:50:43 +0000
+++ app/worldclock/world-city-list.xml	2014-09-04 20:21:16 +0000
@@ -1316,6 +1316,11 @@
 		<countryName>Mongolia</countryName>
 	</City>
 	<City>
+		<cityName>UTC</cityName>
+		<timezoneID>UTC</timezoneID>
+		<countryName>UTC</countryName>
+	</City>
+	<City>
 		<cityName>Vancouver</cityName>
 		<timezoneID>America/Vancouver</timezoneID>
 		<countryName>Canada</countryName>
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-09-04 19:58:32 +0000
+++ debian/changelog	2014-09-04 20:21:16 +0000
@@ -23,6 +23,7 @@
     next alarm when enabling an alarm.
   * Enabled one-time alarms in the UI (LP: #1358320)
   * Fixed the transition animation to alarms to be more smoother (LP: #1362081)
+  * Added utc as a city (LP: #1362763)
   * Increase size of alarm volume listitem and simplified alarm duration list model.
   * Added pressed visual state to the settings button (LP: #1364553)