Merge lp:~raof/mir/fix-0.6-rdepends into lp:mir/0.6

[Chris Halse Rogers]

Fix the dependencies of mirclient-dev and mirserver-dev

Both mirclient.pc and mirserver.pc Require.Private protobuf >= 2.4.1, so add the needed dependency to libmirclient-dev and libmirserver-dev.

Fixes: https://bugs.launchpad.net/mir/+bug/1351133

Fix the build of our reverse dependencies.

[Daniel van Vugt (vanvugt)]

Sounds like a significant fix. Got a bug#?

review: Needs Information

[Chris Halse Rogers (raof)]

Ask Kevin?

[Daniel van Vugt (vanvugt)]

Needs a bug number and an entry in debian/changelog too.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Wrong indentation level :) s/ - / . /

7 . Added support for droping stale frames when a surface becomes exposed.
8 + - libmirprotobuf folded into new libmircommon library.

Arguably still needs a bug number too. Since we've branched 0.6 it's good to give fixes unique IDs like bug numbers.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Still wrong indentation level for an enhancement.

Also typo in bug number:
   Finish the removal of mirprotobuf library (LP: #1381133)

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Conflict with changes Cemil just made :P

[Cemil Azizoglu (cemil-azizoglu)]

Right... merge conflict... (I did give a heads up on IRC :-) ). And note that jenkins won't run against 0.6 (unless fginther config'ed 0.6 already, but I don't think so). So we'll have to TA without a jenkins review.

[Chris Halse Rogers (raof)]

For what it's worth I've built these packages locally and build platform-api against them.

[Daniel van Vugt (vanvugt)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1817
http://jenkins.qa.ubuntu.com/job/mir-0.6-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-0.6-utopic-amd64-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/mir-0.6-utopic-amd64-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-0.6-utopic-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/mir-0.6-utopic-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1164
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1152
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/87
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/87/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2274
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10825

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

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-01 04:39:59 +0000
+++ debian/changelog	2014-08-01 05:01:22 +0000
@@ -27,6 +27,7 @@
       . Added automated test cases for detecting ABI breakage.
       . examples/fingerpaint: Enable frame dropping so it's faster and more
         responsive.
+      . mirprotobuf folded into new libmircommon
     - Bugs fixed:
       . Mir servers crash with SIGABRT - assertion failed at
         buffer_queue.cpp:136 - "!pending_client_notifications.empty()"
@@ -59,6 +60,7 @@
       . Building Mir outputs lots of warnings about Android logging functions
         in 3rd_party/ (LP: #1348467)
       . The "shared" code should be a shared library (LP: #1341502)
+      . Finish the removal of mirprotobuf library (LP: #1351133)
       . Release overlay buffers when screen is turned off (LP: #1350961)
 
  -- Cemil Azizoglu <[e-mail]>  Wed, 30 Jul 2014 16:35:00 +0300

=== modified file 'debian/control'
--- debian/control	2014-07-31 15:16:17 +0000
+++ debian/control	2014-08-01 05:01:22 +0000
@@ -131,6 +131,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libmirserver24 (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
+         libprotobuf-dev (>= 2.4.1),
          libglm-dev,
          libboost-program-options-dev,
          ${misc:Depends},
@@ -162,6 +163,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libmirclient8 (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
+         libprotobuf-dev (>= 2.4.1),
          ${misc:Depends},
 Description: Display server for Ubuntu - development headers
  Mir is a display server running on linux systems, with a focus on efficiency,

=== modified file 'src/client/mirclient.pc.in'
--- src/client/mirclient.pc.in	2013-04-24 05:22:20 +0000
+++ src/client/mirclient.pc.in	2014-08-01 05:01:22 +0000
@@ -8,5 +8,5 @@
 Version: @MIR_VERSION_MAJOR@.@MIR_VERSION_MINOR@.@MIR_VERSION_PATCH@
 Requires.private: protobuf >= 2.4.1
 Requires: mircommon
-Libs: -L@LIBDIR@ -lmirclient -lmirprotobuf -lprotobuf
+Libs: -L@LIBDIR@ -lmirclient
 Cflags: -I@INCLUDEDIR@