Merge lp:~abreu-alexandre/unity-webapps-qml/oxide-1.0 into lp:unity-webapps-qml

[Alexandre Abreu]

Update the oxide bits to account for oxide moving to 1.0

*** DO NOT TOP APPROVE UNTIL OXIDE 1.0 HAS BEEN RELEASED ***

Update the oxide bits to account for oxide moving to 1.0

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:106
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/107/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-armhf-ci/55

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/107/rebuild

review: Approve (continuous-integration)

[lp:~abreu-alexandre/unity-webapps-qml/oxide-1.0]

107. By Alexandre Abreu on 2014-04-03

switch to oxide 1.0

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/108/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-armhf-ci/56

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/108/rebuild

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

+ liboxideqt-qmlplugin (>= 1.0),

I don’t think the version number is necessary here (nor meaningful, because the current release is 1.0.0~bzr452-0ubuntu1 for which imports version is 0.1).

[Olivier Tilloy (osomon)]

Approving anyway, as the version number requirement doesn’t hurt (it can be removed later).

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-03-25 18:14:09 +0000
+++ debian/control	2014-04-03 14:17:34 +0000
@@ -27,6 +27,7 @@
 Package: unity-webapps-qml
 Architecture: any
 Depends: libqt5webkit5-qmlwebkitplugin,
+         liboxideqt-qmlplugin (>= 1.0),
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-unity-action-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin,
@@ -34,7 +35,6 @@
          ${misc:Depends},
          ${shlibs:Depends},
 Suggests: qtdeclarative5-ubuntu-content0.1,
-          liboxideqt-qmlplugin,
 Description: Unity Webapps QML component
  Unity Webapps QML is a QML component that binds to a QML WebView and allows
  running javascript code to access Ubuntu stack components.
 
=== modified file 'src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js'
--- src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-03-20 18:35:00 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-04-03 14:17:34 +0000
@@ -69,7 +69,7 @@
         var context = this.webview.context;
 
         for (var i = 0; i < userScriptUrls.length; ++i) {
-            var scriptStart = "import com.canonical.Oxide 0.1 as Oxide; Oxide.UserScript { context:";
+            var scriptStart = "import com.canonical.Oxide 1.0 as Oxide; Oxide.UserScript { context:";
             var scriptEnd = "}";
             var statement = scriptStart +
                     '"' + this._WEBAPPS_USER_SCRIPT_CONTEXT + '"' +
@@ -96,7 +96,7 @@
             onMessageReceived(msg.args);
         }
 
-        var script = 'import com.canonical.Oxide 0.1 as Oxide; ' +
+        var script = 'import com.canonical.Oxide 1.0 as Oxide; ' +
                 ' Oxide.ScriptMessageHandler { msgId: "UnityWebappApi-Message"; contexts: ["' +
                 this._WEBAPPS_USER_SCRIPT_CONTEXT +
                 '"]; ' +