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

[David Barth]

re-enable all plugins on armhf

re-enable all plugins on armhf

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:257
http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-2.8-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-2.8-trusty-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cordova-ubuntu-2.8-trusty-armhf-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cordova-ubuntu-2.8-ci/10/rebuild

review: Approve (continuous-integration)

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-30 17:52:54 +0000
+++ debian/changelog	2014-01-31 15:50:01 +0000
@@ -1,3 +1,10 @@
+cordova-ubuntu (2.8.0+14.04.20140130.3-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Re-enable all plugins on armhf, notably camera now that the workaround
+    is in place.
+
+ -- David Barth <[e-mail]>  Fri, 31 Jan 2014 15:47:47 +0000
+
 cordova-ubuntu (2.8.0+14.04.20140130.3-0ubuntu1) trusty; urgency=low
 
   [ Alexandre Abreu ]
 
=== removed file 'debian/patches/arm-disable-some-plugins.patch'
--- debian/patches/arm-disable-some-plugins.patch	2013-10-09 11:41:33 +0000
+++ debian/patches/arm-disable-some-plugins.patch	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-=== modified file 'CMakeLists.txt'
---- a/CMakeLists.txt	2013-09-02 14:31:46 +0000
-+++ b/CMakeLists.txt	2013-10-02 10:56:35 +0000
-@@ -29,15 +29,15 @@
-   src/js/connection.js
-   src/js/device.js
-   src/js/file.js
--  src/js/geolocation.js
-+#  src/js/geolocation.js
-   src/js/notification.js
--  src/js/compass.js
--  src/js/accelerometer.js
--  src/js/camera.js
--  src/js/contacts.js
--  src/js/media.js
-+#  src/js/compass.js
-+#  src/js/accelerometer.js
-+#  src/js/camera.js
-+#  src/js/contacts.js
-+#  src/js/media.js
-   src/js/globalization.js
--  src/js/capture.js
-+#  src/js/capture.js
-   src/js/app.js
-   src/js/splashscreen.js
-   src/js/inappbrowser.js
-
-=== modified file 'src/coreplugins.cpp'
---- a/src/coreplugins.cpp	2013-05-23 17:05:41 +0000
-+++ b/src/coreplugins.cpp	2013-10-02 10:55:48 +0000
-@@ -27,21 +27,21 @@
- Q_DECL_EXPORT QList<QSharedPointer<CPlugin>> cordovaGetPluginInstances(const QList<QString> &pluginNames, Cordova *cordova) {
-     QList<QSharedPointer<CPlugin>> res;
- 
--    CHECK_PLUGIN(Accelerometer);
-+//    CHECK_PLUGIN(Accelerometer);
-     CHECK_PLUGIN(App);
--    CHECK_PLUGIN(Camera);
--    CHECK_PLUGIN(Capture);
--    CHECK_PLUGIN(Compass);
-+//    CHECK_PLUGIN(Camera);
-+//    CHECK_PLUGIN(Capture);
-+//    CHECK_PLUGIN(Compass);
-     CHECK_PLUGIN(Connection);
-     CHECK_PLUGIN(Console);
--    CHECK_PLUGIN(Contacts);
-+//    CHECK_PLUGIN(Contacts);
-     CHECK_PLUGIN(Device);
-     CHECK_PLUGIN(Events);
-     CHECK_PLUGIN(FileAPI);
--    CHECK_PLUGIN(Geolocation);
-+//    CHECK_PLUGIN(Geolocation);
-     CHECK_PLUGIN(Globalization);
-     CHECK_PLUGIN(InAppBrowser);
--    CHECK_PLUGIN(Media);
-+//    CHECK_PLUGIN(Media);
-     CHECK_PLUGIN(Notification);
-     CHECK_PLUGIN(Splashscreen);
- 
-
 
=== removed file 'debian/patches/series.armhf'
--- debian/patches/series.armhf	2013-10-07 14:02:25 +0000
+++ debian/patches/series.armhf	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-arm-disable-some-plugins.patch