Ubuntu Calculator App

Merge lp:~popey/ubuntu-calculator-app/new-icon into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

  1. new-icon
  2. Merge into old_trunk
Proposed by Alan Pope 🍺🐧🐱 🦄
Status: Merged
Approved by: Mihir Soni
Approved revision: 219
Merged at revision: 218
Proposed branch: lp:~popey/ubuntu-calculator-app/new-icon
Merge into: lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk
Diff against target: 34 lines (+7/-3)
2 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+6/-2)
To merge this branch: bzr merge lp:~popey/ubuntu-calculator-app/new-icon
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Mihir Soni Approve
Review via email: mp+207033@code.launchpad.net

Commit message

New icon

To post a comment you must log in.
lp:~popey/ubuntu-calculator-app/new-icon updated
219. By Alan Pope 🍺🐧🐱 🦄

Add the actual icon

Revision history for this message
Mihir Soni (mihirsoni) wrote :

Looks good.

Thank you popey.

review: Approve
Revision history for this message
Mihir Soni (mihirsoni) wrote :

Pope*

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-01-18 21:16:35 +0000
3+++ CMakeLists.txt 2014-02-18 21:07:34 +0000
4@@ -9,7 +9,7 @@
5
6 set(APP_NAME calculator)
7 set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
8-set(ICON calculator64.png)
9+set(ICON calculator-app@30.png)
10 set(AUTOPILOT_DIR ubuntu_calculator_app)
11 set(APP_HARDCODE ubuntu-calculator-app)
12 set(MAIN_QML ${APP_HARDCODE}.qml)
13
14=== added file 'calculator-app@30.png'
15Binary files calculator-app@30.png 1970-01-01 00:00:00 +0000 and calculator-app@30.png 2014-02-18 21:07:34 +0000 differ
16=== removed file 'calculator64.png'
17Binary files calculator64.png 2013-04-11 20:41:17 +0000 and calculator64.png 1970-01-01 00:00:00 +0000 differ
18=== modified file 'debian/changelog'
19--- debian/changelog 2014-01-17 20:50:29 +0000
20+++ debian/changelog 2014-02-18 21:07:34 +0000
21@@ -1,8 +1,12 @@
22-ubuntu-calculator-app (0.1.3ubuntu1) UNRELEASED; urgency=medium
23+ubuntu-calculator-app (0.1.3ubuntu2) UNRELEASED; urgency=medium
24
25+ [ Sergio Schvezov ]
26 * Adding cmake
27
28- -- Sergio Schvezov <sergio.schvezov@canonical.com> Thu, 16 Jan 2014 20:24:17 -0300
29+ [ Alan Pope ]
30+ * Update icon
31+
32+ -- Alan Pope <alan.pope@canonical.com> Tue, 18 Feb 2014 20:59:45 +0000
33
34 ubuntu-calculator-app (0.1.3) raring; urgency=low
35

Subscribers

People subscribed via source and target branches