Merge lp:~popey/ubuntu-clock-app/new-icon into lp:ubuntu-clock-app/saucy

Status: Merged
Approved by: Francis Ginther
Approved revision: 346
Merged at revision: 345
Proposed branch: lp:~popey/ubuntu-clock-app/new-icon
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 30 lines (+7/-1)
2 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~popey/ubuntu-clock-app/new-icon
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Nekhelesh Ramananthan Approve
Riccardo Padovani Approve
Review via email: mp+207037@code.launchpad.net

Commit message

New icon

To post a comment you must log in.
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Wow, nice icon!
lgtm

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

lgtm! Thanks popey :)

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

The test http://91.189.93.70:8080/job/generic-mediumtests-trusty/1376 is failing due to what looks like a change to a dependency (qtorganizer5-eds). I'm investigating and will rebuild this if I find a fix/workaround.

Revision history for this message
Francis Ginther (fginther) wrote :

I think the tests are working now after removing qtorganizer5-eds from the test environment. Re-approving to retest.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-02-12 23:36:09 +0000
3+++ CMakeLists.txt 2014-02-18 21:17:05 +0000
4@@ -12,7 +12,7 @@
5 set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
6 set(APP_HARDCODE ubuntu-clock-app)
7 set(MAIN_QML ${APP_HARDCODE}.qml)
8-set(ICON clock64.png)
9+set(ICON clock-app@30.png)
10 set(AUTOPILOT_DIR ubuntu_clock_app)
11
12 if(CLICK_MODE)
13
14=== added file 'clock-app@30.png'
15Binary files clock-app@30.png 1970-01-01 00:00:00 +0000 and clock-app@30.png 2014-02-18 21:17:05 +0000 differ
16=== removed file 'clock64.png'
17Binary files clock64.png 2013-04-11 20:40:04 +0000 and clock64.png 1970-01-01 00:00:00 +0000 differ
18=== modified file 'debian/changelog'
19--- debian/changelog 2013-10-10 23:58:43 +0000
20+++ debian/changelog 2014-02-18 21:17:05 +0000
21@@ -1,3 +1,9 @@
22+ubuntu-clock-app (1.0ubuntu1) UNRELEASED; urgency=medium
23+
24+ * New icon
25+
26+ -- Alan Pope <alan.pope@canonical.com> Tue, 18 Feb 2014 21:11:01 +0000
27+
28 ubuntu-clock-app (1.0) saucy; urgency=low
29
30 [Nekhelesh Ramananthan]

Subscribers

People subscribed via source and target branches