Merge lp:~robert-ancell/mir/mir-client-platform-mesa-dev-depends into lp:mir

[Robert Ancell]

Update mir-client-platform-mesa pkgconfig and package depends.

The mir-client-platform-mesa headers use:
mir_toolkit/mir_native_buffer.h
mir_toolkit/client_types.h

The former is from libmircommon-dev, so add this to the package dependencies.
The latter is from libmirclient-dev so add the appropriate dependency into the
pkgconfig file so the include directories are passed to the compiler.

[lp:~robert-ancell/mir/mir-client-platform-mesa-dev-depends]

2999. By Robert Ancell on 2015-10-07

Use Requires.private, not Depends...

[Tiago Stürmer Daitx (tdaitx)]

review: Approve

[Daniel van Vugt (vanvugt)]

Seems like the right solution, and I assume it works.

In theory however external non-server projects should have zero visibility of libmircommon-things. So I wonder what did we mess up in Mir to violate that goal?...

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:2999
http://jenkins.qa.ubuntu.com/job/mir-ci/5184/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4329
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4271
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/229/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1338
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1338/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/229/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4272
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4272/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/6931
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24016
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/230/console

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

> In theory however external non-server projects should have zero visibility of
> libmircommon-things. So I wonder what did we mess up in Mir to violate that
> goal?...

That theory is clearly wrong. ;)

If we want to enforce that rule then there ought to be some tests for it - and there are not.

Also, do you mean "non-server" or "client" (we don't currently have external "platform" projects but I think they will need access to libmircommon).

PS I want to dig a little as to why these specific dependencies are visible before voting.

[Alan Griffiths (alan-griffiths)]

I think the correct solution is lp:~alan-griffiths/mir/fix-1503450/+merge/273668

review: Disapprove

[Chris Halse Rogers (raof)]

Alan's solution is approved; marking this one as rejected.

Unmerged revisions

2999. By Robert Ancell on 2015-10-07

Use Requires.private, not Depends...

2998. By Robert Ancell on 2015-10-07

Update mir-client-platform-mesa pkgconfig and package depends.

The mir-client-platform-mesa headers use:
mir_toolkit/mir_native_buffer.h
mir_toolkit/client_types.h

The former is from libmircommon-dev, so add this to the package dependencies.
The latter is from libmirclient-dev so add the appropriate dependency into the
pkgconfig file so the include directories are passed to the compiler.

=== modified file 'debian/control'
--- debian/control	2015-09-30 06:15:00 +0000
+++ debian/control	2015-10-07 01:29:18 +0000
@@ -364,7 +364,8 @@
 Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirclient-dev,
+Depends: libmircommon-dev,
+         libmirclient-dev,
          ${misc:Depends},
 Description: Display server for Ubuntu - client platform library for Mesa development files
  Mir is a display server running on linux systems, with a focus on efficiency,

=== modified file 'src/platforms/mesa/mir-client-platform-mesa.pc.in'
--- src/platforms/mesa/mir-client-platform-mesa.pc.in	2015-09-24 22:30:09 +0000
+++ src/platforms/mesa/mir-client-platform-mesa.pc.in	2015-10-07 01:29:18 +0000
@@ -4,4 +4,5 @@
 Name: mir-client-platform-mesa
 Description: Mir Mesa client platform development files
 Version: @MIR_VERSION@
+Requires.private: mirclient
 Cflags: -I${includedir} -I${common_includedir}