Merge lp:~sergiusens/notes-app/click-fixes into lp:notes-app

[Sergio Schvezov]

Description fix, easier version tracking, missing network apparmor policy and adding emulator for tests to run.

Description fix, easier version tracking, missing network apparmor policy and adding emulator for tests to run.

http://paste.ubuntu.com/6211435/

[lp:~sergiusens/notes-app/click-fixes]

209. By Sergio Schvezov on 2013-10-08

Removing encoding

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:208
http://jenkins.qa.ubuntu.com/job/notes-app-ci/211/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4804
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2644
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/109
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/109/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-ci/106
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/984
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/679
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/679/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2646
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2646/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2191
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2204

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notes-app-ci/211/rebuild

review: Needs Fixing (continuous-integration)

[lp:~sergiusens/notes-app/click-fixes]

210. By Sergio Schvezov on 2013-10-08

Path in desktop conditionalized

[Jamie Strandboge (jdstrand)]

Looks reasonable

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:209
http://jenkins.qa.ubuntu.com/job/notes-app-ci/212/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4805
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2646
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/110
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/110/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/985
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/680
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/680/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2648
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2648/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2206

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notes-app-ci/212/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:210
http://jenkins.qa.ubuntu.com/job/notes-app-ci/213/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4807
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2648
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-amd64-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/111
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-armhf-ci/111/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-saucy-i386-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/987
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/682
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/682/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2650
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2650/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2208

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/notes-app-ci/213/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-08 13:00:40 +0000
+++ CMakeLists.txt	2013-10-08 22:43:00 +0000
@@ -44,10 +44,12 @@
 
 if(NOT CLICK_MODE)
     set(NOTES_APP_DIR ${CMAKE_INSTALL_DATADIR}/${NOTES_APP})
+    set(DESKTOP_PATH "Path=${CMAKE_INSTALL_FULL_DATADIR}/${NOTES_APP}") 
     set(DESKTOP_EXEC 
 	"qmlscene ${CMAKE_INSTALL_FULL_DATADIR}/${NOTES_APP}/NotesApp.qml")
 else(NOT CLICK_MODE)
     set(NOTES_APP_DIR "/")
+    set(DESKTOP_PATH "")
     set(DESKTOP_EXEC 
     "qmlscene $@ -I ./usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/qml NotesApp.qml")
 endif(NOT CLICK_MODE)
@@ -72,6 +74,7 @@
 foreach(LINE ${DESKTOP_FILE_CONTENTS})
     string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
     string(REGEX REPLACE "\@DESKTOP_EXEC\@" "${DESKTOP_EXEC}" LINE "${LINE}")
+    string(REGEX REPLACE "\@DESKTOP_PATH\@" "${DESKTOP_PATH}" LINE "${LINE}")
     file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
 endforeach(LINE)
 

=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2013-09-23 13:47:21 +0000
+++ click/manifest.json.in	2013-10-08 22:43:00 +0000
@@ -1,7 +1,7 @@
 {
     "architecture": "armhf",
     "description": 
-        "An application to take pictures and videos with the device cameras",
+        "Note taking application for the Ubuntu platform",
     "framework": "ubuntu-sdk-13.10", 
     "hooks": {
         "notes": {
@@ -13,7 +13,7 @@
     "maintainer": "Ubuntu Developers <[e-mail]>",
     "name": "com.ubuntu.notes", 
     "title": "Notes", 
-    "version": "1.4",
+    "version": "1.4.@BZR_REVNO@",
     "x-source": {
         "vcs-bzr": "lp:notes-app", 
         "vcs-bzr-revno": "@BZR_REVNO@"

=== modified file 'click/notes-apparmor.json'
--- click/notes-apparmor.json	2013-09-23 13:47:21 +0000
+++ click/notes-apparmor.json	2013-10-08 22:43:00 +0000
@@ -1,4 +1,4 @@
 {
-    "policy_groups": [], 
+    "policy_groups": ["networking"], 
     "policy_version": 1.0
 }

=== modified file 'notes-app.desktop.in'
--- notes-app.desktop.in	2013-10-08 09:52:53 +0000
+++ notes-app.desktop.in	2013-10-08 22:43:00 +0000
@@ -1,12 +1,11 @@
 [Desktop Entry]
-Encoding=UTF-8
 Type=Application
 Exec=@DESKTOP_EXEC@
-Path=/usr/share/notes-app/
 Name=tr("Notes")
 GenericName=tr("Notes application for Ubuntu")
 Icon=notepad
 Terminal=false
+@DESKTOP_PATH@
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage
 X-Ubuntu-Gettext-Domain=com.ubuntu.notes

=== modified file 'tests/autopilot/notes_app/tests/__init__.py'
--- tests/autopilot/notes_app/tests/__init__.py	2013-10-08 13:00:40 +0000
+++ tests/autopilot/notes_app/tests/__init__.py	2013-10-08 22:43:00 +0000
@@ -79,7 +79,8 @@
 
     def launch_click_installed(self):
         self.app = self.launch_click_package(
-            "com.ubuntu.notes")
+            "com.ubuntu.notes",
+            emulator_base=UbuntuUIToolkitEmulatorBase)
 
     def launch_and_quit_app(self):
         self.launch_app()