qtubuntu-cameraplugin-fake

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

  1. remove_tests_fix_lintian
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Merged
Merged at revision: 35
Proposed branch: lp:~sil2100/qtubuntu-cameraplugin-fake/remove_tests_fix_lintian
Merge into: lp:qtubuntu-cameraplugin-fake
Diff against target: 59 lines (+7/-15)
4 files modified
debian/cameraplugin-fake-tests.install (+0/-1)
debian/cameraplugin-fake.install (+0/-2)
debian/control (+4/-9)
unittests/storagemanager/storagemanager.pro (+3/-3)
To merge this branch: bzr merge lp:~sil2100/qtubuntu-cameraplugin-fake/remove_tests_fix_lintian
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ken VanDine Approve
Review via email: mp+175329@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

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
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Great, thanks

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1usr/share/fakeCamera/tst_*
20
=== 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 @@
1usr/lib/*
2usr/share/fakeCamera/*.jpg
30
=== 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 @@
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Build-Depends: debhelper (>= 9),5Build-Depends: debhelper (>= 9),
6 libgl-dev,6 libgles2-mesa-dev | libgl1-mesa-dev,
7 libgles2-mesa-dev,
8 libpulse-dev,7 libpulse-dev,
9 pkg-config,8 pkg-config,
10 qt5-default,9 qt5-default,
@@ -17,15 +16,11 @@
17Vcs-Bzr: https://code.launchpad.net/~phablet-team/qtubuntu-cameraplugin-fake/trunk16Vcs-Bzr: https://code.launchpad.net/~phablet-team/qtubuntu-cameraplugin-fake/trunk
1817
19Package: cameraplugin-fake18Package: cameraplugin-fake
20Architecture: i386 amd64 armhf19Architecture: any
21Depends: ${misc:Depends},20Depends: ${misc:Depends},
22 ${shlibs:Depends},21 ${shlibs:Depends},
22Conflicts: cameraplugin-fake-tests
23Breaks: cameraplugin-fake-tests
23Description: Camera plugin for QtMultimedia faking with a photo file24Description: Camera plugin for QtMultimedia faking with a photo file
24 A plugin for QtMultimedia faking a real camera by using25 A plugin for QtMultimedia faking a real camera by using
25 an image from disk as source of the photo.26 an image from disk as source of the photo.
26
27Package: cameraplugin-fake-tests
28Architecture: i386 amd64 armhf
29Depends: ${misc:Depends},
30 ${shlibs:Depends},
31Description: Unit tests for cameraplugin-fake
3227
=== 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 @@
88
9INCLUDEPATH += ../../src9INCLUDEPATH += ../../src
1010
11target.path = /usr/share/fakeCamera11# The testcase config forces an INSTALLS of the tests, so we have to
1212# explicitly inform it that we do not want the tests installed
13INSTALLS += target13target.CONFIG += no_default_install

Subscribers

People subscribed via source and target branches