Merge lp:~pete-woods/camera-app/file-based-infographics into lp:camera-app

[Pete Woods]

Enable the infographic source hook for file based infographics

Enable the infographic source hook for file based infographics

[Pete Woods (pete-woods)]

Depends on https://code.launchpad.net/~unity-team/libusermetrics/end-to-end/+merge/210435.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:255
http://jenkins.qa.ubuntu.com/job/camera-app-ci/171/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-amd64-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-i386-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3846/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3431/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3870/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3433/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/171/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:256
http://jenkins.qa.ubuntu.com/job/camera-app-ci/172/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-amd64-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-i386-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3847/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3432/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3871/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3434/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/172/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:260
http://jenkins.qa.ubuntu.com/job/camera-app-ci/177/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-amd64-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-armhf-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-trusty-i386-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4503/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4612/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/177/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:266
http://jenkins.qa.ubuntu.com/job/camera-app-ci/190/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/6/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/11
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/77/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/12
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6941
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/117/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/190/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:271
http://jenkins.qa.ubuntu.com/job/camera-app-ci/191/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/7/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/18
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/224/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/19
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7219
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/279/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/191/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:272
http://jenkins.qa.ubuntu.com/job/camera-app-ci/194/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/10/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/29
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/326/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/180
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/39
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7449
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/423/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/194/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:288
http://jenkins.qa.ubuntu.com/job/camera-app-ci/203/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/19/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/107
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/973/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/149
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8710
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1116/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/203/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:289
http://jenkins.qa.ubuntu.com/job/camera-app-ci/204/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/977/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/150/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1120/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/204/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:303
http://jenkins.qa.ubuntu.com/job/camera-app-ci/229/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/154/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1379/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/225/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1546/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/229/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:309
http://jenkins.qa.ubuntu.com/job/camera-app-ci/233/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/180/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1630/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/260/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1833/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/233/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:326
http://jenkins.qa.ubuntu.com/job/camera-app-ci/246/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/62/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/62/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/62/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/224/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2125/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/340/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2382/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/246/rebuild

review: Needs Fixing (continuous-integration)

[Florian Boucault (fboucault)]

Who reviewed this?

[Michał Sawicz (saviq)]

As you can see, no one. But please do, we want to land the new style infographics finally.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:344
http://jenkins.qa.ubuntu.com/job/camera-app-ci/270/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/86/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/86/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/86/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/297/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3152/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/486/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3439/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/camera-app-ci/270/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

344. By Pete Woods on 2014-07-29

Add support for file based infographics

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-31 18:41:17 +0000
+++ CMakeLists.txt	2014-08-06 11:39:49 +0000
@@ -43,6 +43,11 @@
     set(CAMERA_ICON "camera-app")
     set(CAMERA_APP_DIR ${CMAKE_INSTALL_DATADIR}/${CAMERA_APP})
     set(DESKTOP_EXEC ${CAMERA_APP})
+    install(
+        FILES "camera-usermetrics.json"
+        DESTINATION "${CMAKE_INSTALL_DATADIR}/libusermetrics/sources/"
+        RENAME "com.ubuntu.camera.json"
+    )
 endif(CLICK_MODE)
 
 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
@@ -119,6 +124,7 @@
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
             DESTINATION ${CMAKE_INSTALL_PREFIX})
     install(FILES camera-apparmor.json
+            camera-usermetrics.json
             DESTINATION ${CMAKE_INSTALL_PREFIX})
     install(FILES camera-contenthub.json
             DESTINATION ${CMAKE_INSTALL_PREFIX})

=== modified file 'camera-apparmor.json'
--- camera-apparmor.json	2014-07-31 18:41:17 +0000
+++ camera-apparmor.json	2014-08-06 11:39:49 +0000
@@ -5,7 +5,6 @@
         "camera",
         "audio",
         "video",
-        "usermetrics",
         "content_exchange",
         "content_exchange_source",
         "location"

=== added file 'camera-usermetrics.json'
=== modified file 'debian/camera-app.install'
--- debian/camera-app.install	2014-07-29 16:44:02 +0000
+++ debian/camera-app.install	2014-08-06 11:39:49 +0000
@@ -5,4 +5,5 @@
 usr/share/camera-app/*.js
 usr/share/camera-app/assets/*
 usr/share/icons
+usr/share/libusermetrics
 usr/share/locale/*/LC_MESSAGES/camera-app.mo

=== modified file 'debian/control'
--- debian/control	2014-07-16 14:24:12 +0000
+++ debian/control	2014-08-06 11:39:49 +0000
@@ -18,7 +18,7 @@
                qtdeclarative5-usermetrics0.1,
                qtdeclarative5-ubuntu-content0.1,
                qtmultimedia5-dev,
-               libusermetricsinput1-dev,
+               libusermetricsinput1-dev (>= 1.2.0),
                gettext,
                dh-translations,
 Standards-Version: 3.9.5

=== modified file 'manifest.json'
--- manifest.json	2014-07-31 18:41:17 +0000
+++ manifest.json	2014-08-06 11:39:49 +0000
@@ -6,7 +6,8 @@
         "camera": {
             "apparmor": "camera-apparmor.json",
             "desktop": "@DESKTOP_FILE@",
-            "content-hub": "camera-contenthub.json"
+            "content-hub": "camera-contenthub.json",
+            "usermetrics": "camera-usermetrics.json"
         }
     },
     "icon": "@CAMERA_ICON@",
@@ -21,4 +22,4 @@
     "x-test": {
         "autopilot": "@AUTOPILOT_DIR@"
     }
-}
\ No newline at end of file
+}