Merge lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-desktop-install-fix into lp:ubuntu-calculator-app

[Bartosz Kosiorek]

Fix installation on Ubuntu Desktop

Fix installation on Ubuntu Desktop

[lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-desktop-install-fix]

199. By Bartosz Kosiorek on 2015-06-23

Update changelog
[ Bartosz Kosiorek ]
* Do not allow swiping in Landscape mode.
  Fixes: https://bugs.launchpad.net/bugs/1466635.
* Fix keyboard shortcuts (eg. Ctrl+C).
  Fixes: https://bugs.launchpad.net/bugs/1466634.
* Add additional comments to logaritm and modulo
  to avoid confusion during translation.
  Fixes: https://bugs.launchpad.net/bugs/1465297.
* Fix display issue.
  Fixes: https://bugs.launchpad.net/bugs/1465996.
[ Nicholas Skaggs ]
* Fix testability for screen components.
[ Niklas Wenzel ]
* Use longer swipe in autopilot tests for revealing the scientific keyboard.
  Fixes: https://bugs.launchpad.net/bugs/1464571.
* Fix typing special characters on hardware keyboards.
  Fixes: https://bugs.launchpad.net/bugs/1449037.
[ Victor Thompson ]
* Change favorites translatable string.
  Fixes: https://bugs.launchpad.net/bugs/1464463.
* Add haptic feedback to buttons
* Update math.js library. http://pad.lv/1439846
* Enable 'bug number' support to fix floating point math.
  http://pad.lv/1445152
* Modify splash screen. http://pad.lv/1377638
* Fix keyboard focus and disappearing cursor bug. http://pad.lv/1431548
* Fix directory layout for AP tests. http://pad.lv/1443680
* Modified layout to fit design
* Fix issue with building which corrupted translations
* Updated translations

200. By Bartosz Kosiorek on 2015-06-23

Add binary for running Calculator

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:198
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/343/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3005
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3005/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/122
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/65

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

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:200
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/344/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3006/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/123/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/66/console

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

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

Hi Bartosz,

Thanks so much for looking into this! As you asked me for a review, I'll try to be thorough:

1. On the commit message for r199, there is no need to duplicate the Debian changelog on the commit message itself. Commit messages should be concise and to the point (e.g. "Updated Debian changelog"), in particular when the exact information can be seen in the commit (debian/changelog diff). This is not something that can be fixed now, or even an issue, it's just a recommendation for future commits.

2. In general, for each merge proposal, please only limit the changes related to the fix. This fix should only be a few lines and self-contained. I see many changes on this one that are not related, which make it difficult to review and make it more prone to introduce other issues.

3. I'm not sure why the change in r200 was introduced: as far as I know, there is no calculator app binary, and it makes the tests in Jenkins fail.

4. The rest of comments I've added inline in the merge proposal.

review: Needs Fixing

[Bartosz Kosiorek (gang65)]

Thanks for comments.
I will try apply your remarks today evening.

I explained my intention in diff comments below.

[David Planella (dpm)]

Added my replies inline, thanks!

[Bartosz Kosiorek (gang65)]

I have added new bug which I solved accidentely

[lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-desktop-install-fix]

201. By Bartosz Kosiorek on 2015-06-24

Remove cleanup changes from MR

202. By Bartosz Kosiorek on 2015-06-24

Fix autopilot tests

[Bartosz Kosiorek (gang65)]

All remarks was implemented.
I added some inline comments to better describe these changes.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:202
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/345/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3007
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3007/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/124
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/67

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

A comment on naming.

[David Planella (dpm)]

Just a few additional comments on debian/changelog and the launcher script. Looking good now, though!

review: Needs Fixing

[Bartosz Kosiorek (gang65)]

Response for comments.

[lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-desktop-install-fix]

203. By Bartosz Kosiorek on 2015-06-25

Fixes after review

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:203
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/347/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3015
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3015/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/126
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/69

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Added an inline comment to the debian/changelog, but approving nevertheless. Good work!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-04-14 16:42:56 +0000
+++ CMakeLists.txt	2015-06-25 20:39:01 +0000
@@ -31,18 +31,17 @@
 set(APP_HARDCODE                    ubuntu-calculator-app)
 set(AUTOPILOT_DIR                   ubuntu_calculator_app)
 set(MAIN_QML                        ${APP_HARDCODE}.qml)
-set(ICON                            "${APP_HARDCODE}.png")
+set(ICON_FILE                       "${APP_HARDCODE}.png")
 set(DESKTOP_FILE                    "${APP_HARDCODE}.desktop")
-set(AUTOPILOT_DIR                   ubuntu_calculator_app)
 set(APP_VERSION                     2.0)
+set(AUTOPILOT_DIR                   ubuntu_calculator_app)
 
 if(CLICK_MODE)
   set(CMAKE_INSTALL_PREFIX "/")
   set(UBUNTU-CALCULATOR-APP_DIR    "${CMAKE_INSTALL_DATADIR}/qml")
 
   set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}")
-  set(EXEC "qmlscene $@ ${UBUNTU-CALCULATOR-APP_DIR}/${MAIN_QML}")
-  set(MODULE_PATH ${QT_IMPORTS_DIR})
+  set(EXEC "qmlscene -qt5 $@ ${UBUNTU-CALCULATOR-APP_DIR}/${MAIN_QML}")
   if(NOT BZR_REVNO)
     execute_process(
       COMMAND bzr revno
@@ -76,8 +75,14 @@
   configure_file(${UBUNTU_MANIFEST_PATH} ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
   install(FILES "${APP_HARDCODE}.apparmor" DESTINATION ${CMAKE_INSTALL_PREFIX})
+  set(ICON ${ICON_FILE})
 else(CLICK_MODE)
-  set(EXEC "qmlscene $@ -I ${MODULE_PATH}  ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR}/${MAIN_QML}")
+  set(ICON ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR}/${ICON_FILE})
+  set(EXEC ${APP_NAME})
+  configure_file(app/${APP_HARDCODE}.in
+    ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
+  install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
+    DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif(CLICK_MODE)
 
 file(GLOB_RECURSE I18N_SRC_FILES

=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2015-04-14 16:42:56 +0000
+++ app/CMakeLists.txt	2015-06-25 20:39:01 +0000
@@ -3,12 +3,8 @@
   add_custom_target(ubuntu-calculator-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
 endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 
-if(CLICK_MODE)
-  set(ICON ${ICON})
-  install(FILES graphics/${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
-endif(CLICK_MODE)
-
-install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-CALCULATOR-APP_DIR})
+install(FILES graphics/${ICON_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR})
+install(FILES ${MAIN_QML} DESTINATION ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR})
 
 add_subdirectory(engine)
 add_subdirectory(graphics)

=== added file 'app/ubuntu-calculator-app.in'
--- app/ubuntu-calculator-app.in	1970-01-01 00:00:00 +0000
+++ app/ubuntu-calculator-app.in	2015-06-25 20:39:01 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+export QT_SELECT=qt5
+exec qmlscene @CMAKE_INSTALL_PREFIX@/@UBUNTU-CALCULATOR-APP_DIR@/@MAIN_QML@

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-11 11:09:09 +0000
+++ debian/changelog	2015-06-25 20:39:01 +0000
@@ -1,3 +1,39 @@
+ubuntu-calculator-app (2.0.197) UNRELEASED; urgency=low
+
+  [ Bartosz Kosiorek ]
+  * Fixes in creating .deb package (LP: #1466518) (LP: #1466530) (LP: #1468385)
+  * Do not allow swiping in Landscape mode (LP: #1466635)
+  * Fix keyboard shortcuts (eg. Ctrl+C) (LP: #1466634)
+  * Add additional comments to logaritm and modulo 
+    to avoid confusion during translation (LP: #1465297)
+  * Fix display issue (LP: #1465996)
+
+  [ Nicholas Skaggs ]
+  * Fix testability for screen components.
+
+  [ Niklas Wenzel ]
+  * Use longer swipe in autopilot tests for 
+    revealing the scientific keyboard (LP: #1464571)
+  * Fix typing special characters on hardware keyboards (LP: #1449037)
+
+  [ Victor Thompson ]
+  * Change favorites translatable string (LP: #1464463)
+
+ -- Bartosz Kosiorek <[e-mail]>  Thu, 25 Jun 2015 19:56:42 +0200
+
+ubuntu-calculator-app (2.0.182) vivid; urgency=medium
+  * Add haptic feedback to buttons
+  * Update math.js library (LP: #1439846)
+  * Enable 'bug number' support to fix floating point math (LP: #1445152)
+  * Modify splash screen. (LP: #1377638)
+  * Fix keyboard focus and disappearing cursor bug. (LP: #1431548)
+  * Fix directory layout for AP tests. (LP: #1443680)
+  * Modified layout to fit design
+  * Fix issue with building which corrupted translations
+  * Updated translations
+
+ -- Bartosz Kosiorek <[e-mail]>  Thu, 15 Jun 2015 12:00:05 +0100
+
 ubuntu-calculator-app (0.1) vivid; urgency=low
 
   * Initial release