Merge lp:~michael-sheldon/click-webapps/file-upload into lp:click-webapps

[Michael Sheldon]

Update click packages to ensure that Oxide is used in the webapp-container and add appropriate permissions to allow for file upload in apps.

Updates click packages to ensure that Oxide is used in the webapp-container and adds appropriate permissions to allow for file upload in apps.

[David Barth (dbarth)]

Thanks for the heads up Michael. I have transferred this over to webapps-core: https://code.launchpad.net/~dbarth/webapps-core/googleplus/+merge/234073

Unmerged revisions

14. By Michael Sheldon on 2014-06-23

Switch to using oxide webapp-container and add appropriate permissions for file upload

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-12 20:59:07 +0000
+++ debian/changelog	2014-06-23 09:40:05 +0000
@@ -1,3 +1,10 @@
+click-webapps (6) UNRELEASED; urgency=medium
+
+  * Update policy and framework to use Oxide webapp-container.
+  * Add permissions for file uploads.
+
+ -- Michael Sheldon <[e-mail]>  Mon, 23 Jun 2014 10:15:24 +0100
+
 click-webapps (5) UNRELEASED; urgency=medium
 
   * Switch to webapp-container.

=== modified file 'debian/template/app.json'
--- debian/template/app.json	2014-02-02 03:41:44 +0000
+++ debian/template/app.json	2014-06-23 09:40:05 +0000
@@ -4,7 +4,9 @@
         "networking",
         "audio",
         "video",
-        "location"
+        "location",
+        "webview",
+        "content_exchange"
     ],
-    "policy_version": 1.0
+    "policy_version": 1.1
 }

=== modified file 'debian/template/manifest.json'
--- debian/template/manifest.json	2013-09-06 08:32:28 +0000
+++ debian/template/manifest.json	2014-06-23 09:40:05 +0000
@@ -1,6 +1,6 @@
 {
     "description": "Ubuntu Touch app for #APPNAME#",
-    "framework": "ubuntu-sdk-13.10",
+    "framework": "ubuntu-sdk-14.04",
     "hooks": {
         "#APPID#": {
             "apparmor": "app.json",