Merge lp:~nskaggs/ubuntu-docviewer-app/manifest-tweaks into lp:ubuntu-docviewer-app/trunk

[Nicholas Skaggs]

fix manifest for builds

fix manifest for builds

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

PASSED: Continuous integration, rev:41
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/103/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/125
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/125/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-vivid-amd64-ci/6

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

review: Approve (continuous-integration)

=== modified file 'manifest.json.in'
--- manifest.json.in	2014-11-07 22:02:18 +0000
+++ manifest.json.in	2014-11-10 21:15:20 +0000
@@ -1,16 +1,24 @@
 {
+    "name": "com.ubuntu.docviewer",
+    "title": "Document Viewer",
     "description": "Document Viewer application for Ubuntu devices",
     "framework": "ubuntu-sdk-14.10-qml-dev3",
     "architecture": "@CLICK_ARCH@",
+    "icon": "@ICON@",
     "hooks": {
         "docviewer": {
             "apparmor": "docviewer.apparmor",
             "desktop": "com.ubuntu.docviewer.desktop",
-	    "content-hub": "docviewer-content.json"
+        "content-hub": "docviewer-content.json"
         }
     },
+    "version": "0.1.@BZR_REVNO@",
     "maintainer": "Ubuntu App Cats <[e-mail]>",
-    "name": "com.ubuntu.docviewer",
-    "title": "Document viewer",
-    "version": "0.1.@BZR_REVNO@"
+    "x-source": {
+        "vcs-bzr": "@BZR_SOURCE@",
+        "vcs-bzr-revno": "@BZR_REVNO@"
+    },
+    "x-test": {
+        "autopilot": "@AUTOPILOT_DIR@"
+    }
 }