Merge lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-store-name-fix into lp:ubuntu-calculator-app

[Bartosz Kosiorek]

Fix name of the Calculator in the system

Fix name of the Calculator in the system

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

PASSED: Continuous integration, rev:209
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/353/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3057
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/3057/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/132
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/75

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

LGTM. Should we start to use the debian/changelog file?

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-06-25 20:38:31 +0000
+++ CMakeLists.txt	2015-07-09 20:49:15 +0000
@@ -27,7 +27,7 @@
 
 include(GNUInstallDirs)
 
-set(APP_NAME                        ubuntu-calculator-app)
+set(APP_NAME                        Calculator)
 set(APP_HARDCODE                    ubuntu-calculator-app)
 set(AUTOPILOT_DIR                   ubuntu_calculator_app)
 set(MAIN_QML                        ${APP_HARDCODE}.qml)
@@ -78,7 +78,7 @@
   set(ICON ${ICON_FILE})
 else(CLICK_MODE)
   set(ICON ${CMAKE_INSTALL_PREFIX}/${UBUNTU-CALCULATOR-APP_DIR}/${ICON_FILE})
-  set(EXEC ${APP_NAME})
+  set(EXEC ${APP_HARDCODE})
   configure_file(app/${APP_HARDCODE}.in
     ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
   install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-25 20:38:31 +0000
+++ debian/changelog	2015-07-09 20:49:15 +0000
@@ -1,4 +1,4 @@
-ubuntu-calculator-app (2.0.197) UNRELEASED; urgency=low
+ubuntu-calculator-app (2.0.197ubuntu1) UNRELEASED; urgency=low
 
   [ Bartosz Kosiorek ]
   * Fixes in creating .deb package (LP: #1466518) (LP: #1466530) (LP: #1468385)
@@ -19,7 +19,12 @@
   [ Victor Thompson ]
   * Change favorites translatable string (LP: #1464463)
 
- -- Bartosz Kosiorek <[e-mail]>  Thu, 25 Jun 2015 19:56:42 +0200
+  [ Bartosz Kosiorek ]
+  * Fix calculator name in the store (LP: #1472559)
+  * Allow add comma without number (LP: #1465979)
+  * Fix confusing error messages (LP: #1469533)
+
+ -- Bartosz Kosiorek <[e-mail]>  Thu, 09 Jul 2015 22:41:57 +0200
 
 ubuntu-calculator-app (2.0.182) vivid; urgency=medium
   * Add haptic feedback to buttons

=== modified file 'manifest.json.in'
--- manifest.json.in	2015-01-26 22:56:40 +0000
+++ manifest.json.in	2015-07-09 20:49:15 +0000
@@ -1,6 +1,7 @@
 {
+    "name": "com.ubuntu.calculator",
     "architecture": "all",
-    "description": "A calculator for Ubuntu Touch",
+    "description": "Powerful and easy to use calculator.",
     "framework": "ubuntu-sdk-14.10",
     "hooks": {
         "@APP_HARDCODE@": {
@@ -9,7 +10,6 @@
         }
     },
     "maintainer": "Ubuntu App Cats <[e-mail]>",
-    "name": "com.ubuntu.calculator",
     "title": "@APP_NAME@",
     "icon": "@ICON@",
     "version": "@APP_VERSION@.@BZR_REVNO@",