← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

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

 

David Planella has proposed merging lp:~dpm/ubuntu-calculator-app/fix-deb-build-bug-1551848 into lp:ubuntu-calculator-app.

Commit message:
Fix .deb package failure to build

Requested reviews:
  Ubuntu Calculator Developers (ubuntu-calculator-dev)
Related bugs:
  Bug #1551848 in Ubuntu Calculator App: "Debian package fails to build"
  https://bugs.launchpad.net/ubuntu-calculator-app/+bug/1551848

For more details, see:
https://code.launchpad.net/~dpm/ubuntu-calculator-app/fix-deb-build-bug-1551848/+merge/287675

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.
-- 
Your team Ubuntu Calculator Developers is requested to review the proposed merge of lp:~dpm/ubuntu-calculator-app/fix-deb-build-bug-1551848 into lp:ubuntu-calculator-app.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-01-13 23:37:57 +0000
+++ CMakeLists.txt	2016-03-01 17:00:58 +0000
@@ -85,7 +85,7 @@
     DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(CLICK_MODE)
 
-install(FILES app/${ICON} DESTINATION ${UBUNTU-CALCULATOR-APP_DIR}/graphics)
+install(FILES app/${ICON_FILE} DESTINATION ${UBUNTU-CALCULATOR-APP_DIR}/graphics)
 
 file(GLOB_RECURSE I18N_SRC_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po


Follow ups