Merge lp:~fginther/ubuntu-filemanager-app/use-bzr-revno-in-version into lp:ubuntu-filemanager-app

[Francis Ginther]

Move manifest.json to manifest.json.in to allow for cmake configure_file(), to correct the presence of @BZR_REVNO@ in the version string.

Move manifest.json to manifest.json.in to allow for cmake configure_file().

This should correct the problem seen populating of @BZR_REVNO@ in the version string.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

review: Approve

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

PASSED: Continuous integration, rev:228
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/285/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1037
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1037/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/83

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

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-13 19:46:32 +0000
+++ CMakeLists.txt	2014-07-16 16:00:20 +0000
@@ -42,7 +42,7 @@
     if(NOT BZR_REVNO)
         set(BZR_REVNO "latest")
     endif(NOT BZR_REVNO)
-    configure_file(manifest.json ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
+    configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json ${CONTENT_HUB_EXPORTER} DESTINATION ${CMAKE_INSTALL_PREFIX})
 else(CLICK_MODE)
     execute_process(

=== renamed file 'manifest.json' => 'manifest.json.in'