Merge lp:~vanvugt/mir/explicit-protobuf-version into lp:mir

[Daniel van Vugt]

Fix protobuf3 syntax warnings (LP: #1624971)

Although if vivid fails to build with this (protobuf2) then we will
need to just say "Won't Fix".

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:3708
https://mir-jenkins.ubuntu.com/job/mir-ci/1751/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/2195
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2258
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2249
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2249
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2249
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2223
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2223/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2223
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2223/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2223
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2223/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2223
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2223/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2223
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2223/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1751/rebuild

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[Kevin DuBois (kdub)]

review: Approve

=== modified file 'src/protobuf/mir_protobuf.proto'
--- src/protobuf/mir_protobuf.proto	2016-09-16 15:18:36 +0000
+++ src/protobuf/mir_protobuf.proto	2016-09-19 07:13:05 +0000
@@ -1,3 +1,4 @@
+syntax = "proto2";
 option optimize_for = LITE_RUNTIME;
 
 package mir.protobuf;

=== modified file 'src/protobuf/mir_protobuf_wire.proto'
--- src/protobuf/mir_protobuf_wire.proto	2016-01-29 08:18:22 +0000
+++ src/protobuf/mir_protobuf_wire.proto	2016-09-19 07:13:05 +0000
@@ -1,3 +1,4 @@
+syntax = "proto2";
 option optimize_for = LITE_RUNTIME;
 
 package mir.protobuf.wire;

=== modified file 'tests/integration-tests/test_protobuf.proto'
--- tests/integration-tests/test_protobuf.proto	2016-03-30 01:12:38 +0000
+++ tests/integration-tests/test_protobuf.proto	2016-09-19 07:13:05 +0000
@@ -1,3 +1,4 @@
+syntax = "proto2";
 option optimize_for = LITE_RUNTIME;
 
 package mir.protobuf.test;