Merge lp:~jhodapp/camera-app/qt5-0-1-update into lp:camera-app

[Jim Hodapp]

Update package names in debian/control for upgrade to Qt 5.0.1.

Update package names in debian/control for upgrade to Qt 5.0.1.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:109
http://s-jenkins:8080/job/camera-app-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-ci-builder/./build=panda-pbuilder,distribution=quantal,flavor=armhf/127/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-ci-builder/./build=pbuilder-master,distribution=quantal,flavor=i386/127/console
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner/73/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/camera-app-ci/11/rebuild

review: Approve (continuous-integration)

[Günter Schwann (schwann)]

ok

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-03-07 10:57:51 +0000
+++ debian/control	2013-03-18 18:21:25 +0000
@@ -7,8 +7,8 @@
                cmake,
                qtbase5-dev,
                qtmultimedia5-dev,
-	       qtdeclarative5-dev,
-	       qtdeclarative5-qtquick2-plugin,
+               qtdeclarative5-dev,
+               qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-test-plugin,
                pkg-config,
                libgl-dev,
@@ -27,9 +27,9 @@
          cameraplugin-aal [armel armhf],
          cameraplugin-fake [!armel !armhf],
          libqt5multimedia5,
-         libqt5declarative5-qtmultimedia-plugin,
+         qtdeclarative5-qtmultimedia-plugin | libqt5declarative5-qtmultimedia-plugin,
          qtdeclarative5-qtquick2-plugin,
-         libqt5sensors5,
+         qtdeclarative5-qtsensors-plugin | libqt5sensors5,
 Description: Camera application
  An application to take pictures and videos with the device camera(s)