Merge lp:~mvo/unity-webapps-qml/multiarch-fixes into lp:unity-webapps-qml

Proposed by Michael Vogt
Status: Needs review
Proposed branch: lp:~mvo/unity-webapps-qml/multiarch-fixes
Merge into: lp:unity-webapps-qml
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~mvo/unity-webapps-qml/multiarch-fixes
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
WebApps Pending
Review via email: mp+227756@code.launchpad.net

Description of the change

Trivial fix to update the dependencies from the transitional libqt5webkit5-qmlwebkitplugin to the real qml-module-qtwebkit. This fixes a multiarch install failure.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Unmerged revisions

129. By Michael Vogt

* debian/control:
  - update libqt5webkit5-qmlwebkitplugin -> qml-module-qtwebkit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-07-18 17:40:27 +0000
3+++ debian/changelog 2014-07-22 14:30:21 +0000
4@@ -1,3 +1,10 @@
5+unity-webapps-qml (0.1+14.10.20140718.1-0ubuntu2) utopic; urgency=low
6+
7+ * debian/control:
8+ - update libqt5webkit5-qmlwebkitplugin -> qml-module-qtwebkit
9+
10+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 Jul 2014 15:01:45 +0200
11+
12 unity-webapps-qml (0.1+14.10.20140718.1-0ubuntu1) utopic; urgency=low
13
14 [ Alexandre Abreu ]
15
16=== modified file 'debian/control'
17--- debian/control 2014-05-13 17:48:43 +0000
18+++ debian/control 2014-07-22 14:30:21 +0000
19@@ -28,7 +28,7 @@
20
21 Package: unity-webapps-qml
22 Architecture: any
23-Depends: libqt5webkit5-qmlwebkitplugin,
24+Depends: qml-module-qtwebkit,
25 liboxideqt-qmlplugin (>= 1.0),
26 qtdeclarative5-qtquick2-plugin,
27 qtdeclarative5-unity-action-plugin,

Subscribers

People subscribed via source and target branches

to all changes: