Ubuntu Calculator App

Merge lp:~dpm/ubuntu-calculator-app/fix-deb-build-bug-1551848 into lp:ubuntu-calculator-app

  1. fix-deb-build-bug-1551848
  2. Merge into trunk
Proposed by David Planella on 2016-03-01
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 🦄 on 2016-03-01
Approved revision: 279
Merged at revision: 279
Proposed branch: lp:~dpm/ubuntu-calculator-app/fix-deb-build-bug-1551848
Merge into: lp:ubuntu-calculator-app
Diff against target: 12 lines (+1/-1)
1 file modified
CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~dpm/ubuntu-calculator-app/fix-deb-build-bug-1551848
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve on 2016-03-01
Alan Pope 🍺🐧🐱 🦄 2016-03-01 Approve on 2016-03-01
Review via email: mp+287675@code.launchpad.net

Commit Message

Fix .deb package failure to build

Description of the Change

This fixes the failure of the .deb package to build.

To test it:

- Simply build the .deb package. Before the fix it fails to build.
- The change should not affect the click package in any way, but it wouldn't hurt to build it to be extra certain.

To post a comment you must log in.
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Built deb and click successfully here.

review: Approve
Jenkins Bot (ubuntu-core-apps-jenkins-bot) :
review: Approve (continuous-integration)
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
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 2016-01-13 23:37:57 +0000
3+++ CMakeLists.txt 2016-03-01 17:00:58 +0000
4@@ -85,7 +85,7 @@
5 DESTINATION ${CMAKE_INSTALL_BINDIR})
6 endif(CLICK_MODE)
7
8-install(FILES app/${ICON} DESTINATION ${UBUNTU-CALCULATOR-APP_DIR}/graphics)
9+install(FILES app/${ICON_FILE} DESTINATION ${UBUNTU-CALCULATOR-APP_DIR}/graphics)
10
11 file(GLOB_RECURSE I18N_SRC_FILES
12 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po

Subscribers

People subscribed via source and target branches