Merge lp:~xnox/ubuntu-calendar-app/ship-svg-assets into lp:ubuntu-calendar-app

[Dimitri John Ledkov]

Ship svg assets.

Ship svg assets.

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

FAILED: Continuous integration, rev:202
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/293/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1491/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/293/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/293/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/127

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

review: Needs Fixing (continuous-integration)

[lp:~xnox/ubuntu-calendar-app/ship-svg-assets]

203. By Dimitri John Ledkov on 2014-02-24

merge trunk

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

FAILED: Continuous integration, rev:203
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/294/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1492
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/294
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/294
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/128

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

review: Needs Fixing (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-20 11:26:49 +0000
+++ CMakeLists.txt	2014-02-24 13:34:04 +0000
@@ -47,7 +47,7 @@
 
 file(GLOB SRC_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     *.qml *.js *.png *.js)
+     *.qml *.js *.png *.js *.svg)
 install(FILES ${SRC_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
 
 configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})