Merge lp:~dbarth/cordova-ubuntu/re-enable-plugins-armhf into lp:cordova-ubuntu/2.8

Proposed by David Barth on 2014-01-31
Status: Merged
Approved by: Alexandre Abreu on 2014-01-31
Approved revision: 257
Merged at revision: 257
Proposed branch: lp:~dbarth/cordova-ubuntu/re-enable-plugins-armhf
Merge into: lp:cordova-ubuntu/2.8
Diff against target: 85 lines (+7/-61)
3 files modified
debian/changelog (+7/-0)
debian/patches/arm-disable-some-plugins.patch (+0/-60)
debian/patches/series.armhf (+0/-1)
To merge this branch: bzr merge lp:~dbarth/cordova-ubuntu/re-enable-plugins-armhf
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) 2014-01-31 Approve on 2014-01-31
PS Jenkins bot continuous-integration Approve on 2014-01-31
Review via email: mp+204270@code.launchpad.net

Commit message

re-enable all plugins on armhf

Description of the change

re-enable all plugins on armhf

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

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-01-30 17:52:54 +0000
3+++ debian/changelog 2014-01-31 15:50:01 +0000
4@@ -1,3 +1,10 @@
5+cordova-ubuntu (2.8.0+14.04.20140130.3-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * Re-enable all plugins on armhf, notably camera now that the workaround
8+ is in place.
9+
10+ -- David Barth <david.barth@canonical.com> Fri, 31 Jan 2014 15:47:47 +0000
11+
12 cordova-ubuntu (2.8.0+14.04.20140130.3-0ubuntu1) trusty; urgency=low
13
14 [ Alexandre Abreu ]
15
16=== removed file 'debian/patches/arm-disable-some-plugins.patch'
17--- debian/patches/arm-disable-some-plugins.patch 2013-10-09 11:41:33 +0000
18+++ debian/patches/arm-disable-some-plugins.patch 1970-01-01 00:00:00 +0000
19@@ -1,60 +0,0 @@
20-=== modified file 'CMakeLists.txt'
21---- a/CMakeLists.txt 2013-09-02 14:31:46 +0000
22-+++ b/CMakeLists.txt 2013-10-02 10:56:35 +0000
23-@@ -29,15 +29,15 @@
24- src/js/connection.js
25- src/js/device.js
26- src/js/file.js
27-- src/js/geolocation.js
28-+# src/js/geolocation.js
29- src/js/notification.js
30-- src/js/compass.js
31-- src/js/accelerometer.js
32-- src/js/camera.js
33-- src/js/contacts.js
34-- src/js/media.js
35-+# src/js/compass.js
36-+# src/js/accelerometer.js
37-+# src/js/camera.js
38-+# src/js/contacts.js
39-+# src/js/media.js
40- src/js/globalization.js
41-- src/js/capture.js
42-+# src/js/capture.js
43- src/js/app.js
44- src/js/splashscreen.js
45- src/js/inappbrowser.js
46-
47-=== modified file 'src/coreplugins.cpp'
48---- a/src/coreplugins.cpp 2013-05-23 17:05:41 +0000
49-+++ b/src/coreplugins.cpp 2013-10-02 10:55:48 +0000
50-@@ -27,21 +27,21 @@
51- Q_DECL_EXPORT QList<QSharedPointer<CPlugin>> cordovaGetPluginInstances(const QList<QString> &pluginNames, Cordova *cordova) {
52- QList<QSharedPointer<CPlugin>> res;
53-
54-- CHECK_PLUGIN(Accelerometer);
55-+// CHECK_PLUGIN(Accelerometer);
56- CHECK_PLUGIN(App);
57-- CHECK_PLUGIN(Camera);
58-- CHECK_PLUGIN(Capture);
59-- CHECK_PLUGIN(Compass);
60-+// CHECK_PLUGIN(Camera);
61-+// CHECK_PLUGIN(Capture);
62-+// CHECK_PLUGIN(Compass);
63- CHECK_PLUGIN(Connection);
64- CHECK_PLUGIN(Console);
65-- CHECK_PLUGIN(Contacts);
66-+// CHECK_PLUGIN(Contacts);
67- CHECK_PLUGIN(Device);
68- CHECK_PLUGIN(Events);
69- CHECK_PLUGIN(FileAPI);
70-- CHECK_PLUGIN(Geolocation);
71-+// CHECK_PLUGIN(Geolocation);
72- CHECK_PLUGIN(Globalization);
73- CHECK_PLUGIN(InAppBrowser);
74-- CHECK_PLUGIN(Media);
75-+// CHECK_PLUGIN(Media);
76- CHECK_PLUGIN(Notification);
77- CHECK_PLUGIN(Splashscreen);
78-
79-
80
81=== removed file 'debian/patches/series.armhf'
82--- debian/patches/series.armhf 2013-10-07 14:02:25 +0000
83+++ debian/patches/series.armhf 1970-01-01 00:00:00 +0000
84@@ -1,1 +0,0 @@
85-arm-disable-some-plugins.patch

Subscribers

People subscribed via source and target branches