Ubuntu Calendar App

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

  1. new-icon
  2. Merge into trunk
Proposed by Alan Pope 🍺🐧🐱 🦄
Status: Merged
Merge reported by: Dimitri John Ledkov
Merged at revision: not available
Proposed branch: lp:~popey/ubuntu-calendar-app/new-icon
Merge into: lp:ubuntu-calendar-app
Diff against target: 32 lines (+7/-3)
2 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+6/-2)
To merge this branch: bzr merge lp:~popey/ubuntu-calendar-app/new-icon
Reviewer Review Type Date Requested Status
Dimitri John Ledkov (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Mihir Soni Approve
Review via email: mp+207035@code.launchpad.net

Commit message

New icon

To post a comment you must log in.
Revision history for this message
Mihir Soni (mihirsoni) wrote :

Looks good.
Thank you Alan.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/101/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1371
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/101
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/101
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/41

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

FAILED: Continuous integration, rev:203
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/288/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1377
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/288
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/288
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/122

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

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

FAILED: Continuous integration, rev:203
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/289/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1381
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/289
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/289
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/123

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

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/102/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1391
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/102
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/102
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/42

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Added back qtorganizer-eds, lets try again.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/104/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1405
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/104
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/104
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/44

review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

It would appear this bug is blocking the landing:

https://bugs.launchpad.net/ubuntu/+source/qtorganizer5-eds/+bug/1282129

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Got merged as part of https://code.launchpad.net/~dpm/ubuntu-calendar-app/fixes-1282500/+merge/207400

review: Approve

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-01-27 14:50:56 +0000
3+++ CMakeLists.txt 2014-02-18 21:08:28 +0000
4@@ -11,7 +11,7 @@
5 set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
6 set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
7 set(MAIN_QML calendar.qml)
8-set(ICON calendar64.png)
9+set(ICON calendar-app@30.png)
10 set(AUTOPILOT_DIR calendar_app)
11 set(APP_HARDCODE calendar-app)
12
13
14=== added file 'calendar-app@30.png'
15Binary files calendar-app@30.png 1970-01-01 00:00:00 +0000 and calendar-app@30.png 2014-02-18 21:08:28 +0000 differ
16=== modified file 'debian/changelog'
17--- debian/changelog 2014-01-18 23:29:11 +0000
18+++ debian/changelog 2014-02-18 21:08:28 +0000
19@@ -1,8 +1,12 @@
20-calendar-app (0.4ubuntu1) UNRELEASED; urgency=medium
21+calendar-app (0.4ubuntu2) UNRELEASED; urgency=medium
22
23+ [ Sergio Schvezov ]
24 * Adding cmake
25
26- -- Sergio Schvezov <sergio.schvezov@canonical.com> Sat, 18 Jan 2014 17:05:03 -0300
27+ [ Alan Pope ]
28+ * New icon
29+
30+ -- Alan Pope <alan.pope@canonical.com> Tue, 18 Feb 2014 21:06:18 +0000
31
32 calendar-app (0.4) raring; urgency=low
33

Subscribers

People subscribed via source and target branches

to status/vote changes: