Merge lp:~sil2100/qtubuntu-cameraplugin-fake/remove_tests_fix_lintian into lp:qtubuntu-cameraplugin-fake

[Łukasz Zemczak]

Fix lintian errors. Do not install tests, remove the -tests package as we don't need unit tests installed on the user's system

Fix lintian errors. Do not install tests, remove the -tests package as we don't need unit tests installed on the user's system

[Ken VanDine (ken-vandine)]

Since it's dropping a binary package, it would probably be best to force removal of that package for anyone that might have installed it.

review: Needs Fixing

[Ken VanDine (ken-vandine)]

Great, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:35
http://jenkins.qa.ubuntu.com/job/qtubuntu-cameraplugin-fake-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-cameraplugin-fake-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-cameraplugin-fake-saucy-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-cameraplugin-fake-saucy-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-cameraplugin-fake-saucy-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtubuntu-cameraplugin-fake-ci/9/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:36
http://jenkins.qa.ubuntu.com/job/qtubuntu-cameraplugin-fake-ci/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-cameraplugin-fake-saucy-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-cameraplugin-fake-saucy-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-cameraplugin-fake-saucy-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtubuntu-cameraplugin-fake-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/qtubuntu-cameraplugin-fake-autolanding/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-cameraplugin-fake-saucy-amd64-autolanding/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-cameraplugin-fake-saucy-armhf-autolanding/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-cameraplugin-fake-saucy-i386-autolanding/1/console

review: Needs Fixing (continuous-integration)

=== removed file 'debian/cameraplugin-fake-tests.install'
--- debian/cameraplugin-fake-tests.install	2013-03-28 18:32:22 +0000
+++ debian/cameraplugin-fake-tests.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/share/fakeCamera/tst_*

=== removed file 'debian/cameraplugin-fake.install'
--- debian/cameraplugin-fake.install	2013-03-28 18:32:22 +0000
+++ debian/cameraplugin-fake.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-usr/lib/*
-usr/share/fakeCamera/*.jpg

=== modified file 'debian/control'
--- debian/control	2013-04-25 13:41:29 +0000
+++ debian/control	2013-07-17 17:09:24 +0000
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
-               libgl-dev,
-               libgles2-mesa-dev,
+               libgles2-mesa-dev | libgl1-mesa-dev,
                libpulse-dev,
                pkg-config,
                qt5-default,
@@ -17,15 +16,11 @@
 Vcs-Bzr: https://code.launchpad.net/~phablet-team/qtubuntu-cameraplugin-fake/trunk
 
 Package: cameraplugin-fake
-Architecture: i386 amd64 armhf
+Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+Conflicts: cameraplugin-fake-tests
+Breaks: cameraplugin-fake-tests
 Description: Camera plugin for QtMultimedia faking with a photo file
  A plugin for QtMultimedia faking a real camera by using
  an image from disk as source of the photo.
-
-Package: cameraplugin-fake-tests
-Architecture: i386 amd64 armhf
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Unit tests for cameraplugin-fake

=== modified file 'unittests/storagemanager/storagemanager.pro'
--- unittests/storagemanager/storagemanager.pro	2013-03-28 18:32:22 +0000
+++ unittests/storagemanager/storagemanager.pro	2013-07-17 17:09:24 +0000
@@ -8,6 +8,6 @@
 
 INCLUDEPATH += ../../src
 
-target.path = /usr/share/fakeCamera
-
-INSTALLS += target
+# The testcase config forces an INSTALLS of the tests, so we have to
+# explicitly inform it that we do not want the tests installed
+target.CONFIG += no_default_install