Merge lp:~popey/ubuntu-calculator-app/fix-1288885 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

Status: Merged
Approved by: Riccardo Padovani on 2014-03-10
Approved revision: 229
Merged at revision: 230
Proposed branch: lp:~popey/ubuntu-calculator-app/fix-1288885
Merge into: lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk
Diff against target: 31 lines (+4/-3)
2 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+3/-2)
To merge this branch: bzr merge lp:~popey/ubuntu-calculator-app/fix-1288885
Reviewer Review Type Date Requested Status
Riccardo Padovani 2014-03-10 Approve on 2014-03-10
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2014-03-10
Review via email: mp+210172@code.launchpad.net

Commit message

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-02-18 21:00:33 +0000
+++ CMakeLists.txt 2014-03-10 10:13:02 +0000
@@ -22,7 +22,7 @@
22 set(CMAKE_INSTALL_PREFIX /)22 set(CMAKE_INSTALL_PREFIX /)
23 set(CMAKE_INSTALL_BINDIR /)23 set(CMAKE_INSTALL_BINDIR /)
24 set(DATA_DIR /)24 set(DATA_DIR /)
25 set(EXEC "qmlscene ${MAIN_QML}")25 set(EXEC "qmlscene -qt5 ${MAIN_QML}")
26 set(DESKTOP_DIR ${DATA_DIR})26 set(DESKTOP_DIR ${DATA_DIR})
27else(CLICK_MODE)27else(CLICK_MODE)
28 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})28 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
2929
=== modified file 'debian/changelog'
--- debian/changelog 2014-02-18 21:00:33 +0000
+++ debian/changelog 2014-03-10 10:13:02 +0000
@@ -1,12 +1,13 @@
1ubuntu-calculator-app (0.1.3ubuntu2) UNRELEASED; urgency=medium1ubuntu-calculator-app (0.1.3ubuntu3) UNRELEASED; urgency=medium
22
3 [ Sergio Schvezov ]3 [ Sergio Schvezov ]
4 * Adding cmake 4 * Adding cmake
55
6 [ Alan Pope ]6 [ Alan Pope ]
7 * Update icon7 * Update icon
8 * Add -qt5 command line option (LP: #1288885)
89
9 -- Alan Pope <alan.pope@canonical.com> Tue, 18 Feb 2014 20:59:45 +000010 -- Alan Pope <popey@ubuntu.com> Mon, 10 Mar 2014 10:12:03 +0000
1011
11ubuntu-calculator-app (0.1.3) raring; urgency=low12ubuntu-calculator-app (0.1.3) raring; urgency=low
1213

Subscribers

People subscribed via source and target branches