Merge lp:~ricmm/qtubuntu/drop-sensors-desktop into lp:qtubuntu

[Ricardo Mendoza]

Drop qtubuntu-sensors dep from desktop, it is unused and causes issues in other Qt packages.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:232
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/145/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-utopic-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-utopic-armhf-ci/11/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/145/rebuild

review: Approve (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:232
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-1-ci/7/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-1-ci/7/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

232. By Ricardo Mendoza on 2014-06-13

Drop qtubuntu-sensors from the desktop QPA

=== modified file 'debian/control'
--- debian/control	2014-05-29 10:28:33 +0000
+++ debian/control	2014-06-13 15:02:47 +0000
@@ -54,16 +54,17 @@
 Package: qtubuntu-desktop
 Architecture: any
 Multi-Arch: same
-Conflicts: qtubuntu-android
+Conflicts: qtubuntu-android,
+           qtubuntu-sensors
 Replaces: qtubuntu (<< 0.52),
-          qtubuntu-android
+          qtubuntu-android,
+          qtubuntu-sensors
 Breaks: qthybris (<< 0.37),
         unity8 (<< 7.85),
 Provides: qtubuntu,
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libqt5sensors5,
-         qtubuntu-sensors,
          ubuntu-application-api2-desktop,
 Description: Qt plugins for Ubuntu Platform API (desktop)
  QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a