Ubuntu Shorts App

Merge lp:~popey/ubuntu-rssreader-app/new-icon into lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk

  1. new-icon
  2. Merge into trunk
Proposed by Alan Pope 🍺🐧🐱 🦄
Status: Merged
Approved by: Francis Ginther
Approved revision: 176
Merged at revision: 176
Proposed branch: lp:~popey/ubuntu-rssreader-app/new-icon
Merge into: lp:~ubuntu-shorts-dev/ubuntu-rssreader-app/trunk
Diff against target: 31 lines (+7/-1)
2 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~popey/ubuntu-rssreader-app/new-icon
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Shorts Developers Pending
Review via email: mp+207043@code.launchpad.net

Commit message

New icon

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:176
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/177/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1374/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/177
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/177
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/64

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

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

PASSED: Continuous integration, rev:176
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/178/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1380
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-ci/178
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-ci/178
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-ci/65

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

review: Approve (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-rssreader-app-autolanding/110/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-raring-amd64-autolanding/110/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-saucy-amd64-autolanding/110
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-rssreader-app-trusty-amd64-autolanding/24

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

Let's try this after backing out the pep8 rules check.

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-13 04:16:00 +0000
3+++ CMakeLists.txt 2014-02-18 21:23:31 +0000
4@@ -12,7 +12,7 @@
5 set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
6 set(APP_HARDCODE shorts-app)
7 set(MAIN_QML shorts-app.qml)
8-set(ICON shorts64.png)
9+set(ICON rssreader-app@30.png)
10 set(AUTOPILOT_DIR shorts_app)
11
12 if(CLICK_MODE)
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2013-09-26 08:43:43 +0000
16+++ debian/changelog 2014-02-18 21:23:31 +0000
17@@ -1,3 +1,9 @@
18+ubuntu-rssreader-app (0.2ubuntu1) UNRELEASED; urgency=medium
19+
20+ * New icon
21+
22+ -- Alan Pope <alan.pope@canonical.com> Tue, 18 Feb 2014 21:22:12 +0000
23+
24 ubuntu-rssreader-app (0.2) saucy; urgency=low
25
26 * Added translations support, dropped ubuntu- prefix from desktop file
27
28=== added file 'rssreader-app@30.png'
29Binary files rssreader-app@30.png 1970-01-01 00:00:00 +0000 and rssreader-app@30.png 2014-02-18 21:23:31 +0000 differ
30=== removed file 'shorts64.png'
31Binary files shorts64.png 2014-02-13 22:57:49 +0000 and shorts64.png 1970-01-01 00:00:00 +0000 differ

Subscribers

People subscribed via source and target branches