Merge lp:~dpm/reminders-app/qtc-changes into lp:reminders-app

[David Planella]

Fix Qt Creator running and packaging issues

Fixes launching from Qt Creator. The reason it doesn't work is because it's looking for a .desktop file named $PROJECT.desktop, whereas our file is named $PROJECT_$APP.desktop. This is something that will need to be fixed at some point on Qt Creator, but in the meantime we can work around it by removing the $APP suffix.

Some other fixes include the manifest, to adapt it to the location and the format where Qt Creator expects it, so that a click package can be created. This has unfortunately meant the values in the manifest are now hardcoded.

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

PASSED: Continuous integration, rev:104
http://91.189.93.70:8080/job/reminders-app-ci/255/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2014
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/255
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/255

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/255/rebuild

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:105
http://91.189.93.70:8080/job/reminders-app-ci/257/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2016/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/257/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/257/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/257/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dpm/reminders-app/qtc-changes]

106. By David Planella on 2014-04-09

Fix manifest installation for debian packages

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

PASSED: Continuous integration, rev:106
http://91.189.93.70:8080/job/reminders-app-ci/258/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2018
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/258
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/258

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/258/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Works as expected, thanks!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-15 17:06:12 +0000
+++ CMakeLists.txt	2014-04-09 19:09:30 +0000
@@ -11,7 +11,7 @@
 option(CLICK_MODE "Installs to a contained location" off)
 
 set(APP_NAME reminders)
-set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
+set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
 set(ICON ${APP_NAME}.png)
 set(AUTOPILOT_DIR reminders)
 set(APP_HARDCODE reminders)
@@ -20,40 +20,40 @@
 
 if(CLICK_MODE)
     if(NOT DEFINED BZR_SOURCE)
-		set(BZR_SOURCE "lp:${APP_HARDCODE}")
-		message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
+        set(BZR_SOURCE "lp:${APP_HARDCODE}")
+        message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
     endif(NOT DEFINED BZR_SOURCE)
     execute_process(
-		COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
-        OUTPUT_VARIABLE ARCH_TRIPLET
-        OUTPUT_STRIP_TRAILING_WHITESPACE
+        COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+            OUTPUT_VARIABLE ARCH_TRIPLET
+            OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     set(CMAKE_INSTALL_PREFIX /)
     set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
-	set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)
-	set(DATA_DIR /)
-	set(DESKTOP_DIR ${DATA_DIR})
+    set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)
+    set(DATA_DIR /)
+    set(DESKTOP_DIR ${DATA_DIR})
+    install(FILES manifest.json apparmor.json DESTINATION ${CMAKE_INSTALL_PREFIX})
 else(CLICK_MODE)
-	# components PATH
-	execute_process(
-		COMMAND qmake -query QT_INSTALL_QML
-		OUTPUT_VARIABLE QT_IMPORTS_DIR
-		OUTPUT_STRIP_TRAILING_WHITESPACE
-	)
-	set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
-	set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")
-	set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
+    # components PATH
+    execute_process(
+        COMMAND qmake -query QT_INSTALL_QML
+            OUTPUT_VARIABLE QT_IMPORTS_DIR
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
+    set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")
+    set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
 endif(CLICK_MODE)
 
 file(GLOB_RECURSE I18N_SRC_FILES
-     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     src/app/qml/*.qml *.desktop.in)
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    src/app/qml/*.qml *.desktop.in)
 list(SORT I18N_SRC_FILES)
 
-
 file(GLOB SRC_FILES
-     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     *.qml *.js *.png *.js)
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    *.qml *.js *.png *.js)
 install(FILES ${SRC_FILES}  DESTINATION ${DATA_DIR})
 
 configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
@@ -62,7 +62,6 @@
 # Tests
 enable_testing()
 
-add_subdirectory(click)
 add_subdirectory(po)
 add_subdirectory(tests)
 add_subdirectory(3rdParty)

=== renamed file 'click/apparmor.json' => 'apparmor.json'
--- click/apparmor.json	2014-02-16 10:51:11 +0000
+++ apparmor.json	2014-04-09 19:09:30 +0000
@@ -5,5 +5,5 @@
         "content_exchange",
         "audio"
     ],
-    "policy_version": 1
+    "policy_version": 1.1
 }

=== removed directory 'click'
=== removed file 'click/CMakeLists.txt'
--- click/CMakeLists.txt	2014-01-19 13:59:12 +0000
+++ click/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-if(CLICK_MODE)
-    if(NOT BZR_REVNO)
-        set(BZR_REVNO "latest")
-    endif(NOT BZR_REVNO)
-    configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json
-            DESTINATION ${CMAKE_INSTALL_PREFIX})
-endif(CLICK_MODE)

=== renamed file 'com.ubuntu.reminders_reminders.desktop.in' => 'com.ubuntu.reminders.desktop.in'
=== renamed file 'click/manifest.json.in' => 'manifest.json'
--- click/manifest.json.in	2014-02-10 14:36:59 +0000
+++ manifest.json	2014-04-09 19:09:30 +0000
@@ -1,22 +1,22 @@
 {
     "description": "Ubuntu Reminders app, powered by Evernote",
-    "framework": "ubuntu-sdk-13.10",
+    "framework": "ubuntu-sdk-14.04-dev1",
     "architecture": "armhf",
     "hooks": {
-        "@APP_NAME@": {
+        "reminders": {
             "apparmor": "apparmor.json",
-            "desktop": "@DESKTOP_FILE@"
+            "desktop": "com.ubuntu.reminders.desktop"
         }
     },
     "maintainer": "Ubuntu Reminders app developers <[e-mail]>",
-    "name": "@PROJECT_NAME@",
+    "name": "com.ubuntu.reminders",
     "title": "Reminders",
-    "version": "0.4.@BZR_REVNO@",
+    "version": "0.5",
     "x-source": {
-        "vcs-bzr": "@BZR_SOURCE@", 
-        "vcs-bzr-revno": "@BZR_REVNO@"
+        "vcs-bzr": "lp:reminders",
+        "vcs-bzr-revno": "latest"
     },
     "x-test": {
-        "autopilot": "@AUTOPILOT_DIR@"
-	}
-}
+        "autopilot": "reminders"
+    }
+}
\ No newline at end of file