1
=== modified file 'debian/control'
2
--- debian/control	2016-08-01 14:43:19 +0000
3
+++ debian/control	2016-08-09 07:23:07 +0000
4
@@ -52,7 +52,7 @@
5
52
# just go ahead. ~mir-team will notice and sync up the code again.
52
# just go ahead. ~mir-team will notice and sync up the code again.
6
53
Vcs-Bzr: https://code.launchpad.net/mir
53
Vcs-Bzr: https://code.launchpad.net/mir
7
54
54
9
55
Package: libmirprotobuf3
55
Package: libmirprotobuf4
10
56
Section: libs
56
Section: libs
11
57
Architecture: linux-any
57
Architecture: linux-any
12
58
Multi-Arch: same
58
Multi-Arch: same
13
59
59
14
=== renamed file 'debian/libmirprotobuf3.install' => 'debian/libmirprotobuf4.install'
15
--- debian/libmirprotobuf3.install	2016-01-29 08:18:22 +0000
16
+++ debian/libmirprotobuf4.install	2016-08-09 07:23:07 +0000
17
@@ -1,1 +1,1 @@
19
1
usr/lib/*/libmirprotobuf.so.3
1
usr/lib/*/libmirprotobuf.so.4
20
2
2
21
=== modified file 'src/client/mirclient.pc.in'
22
--- src/client/mirclient.pc.in	2016-01-29 08:18:22 +0000
23
+++ src/client/mirclient.pc.in	2016-08-09 07:23:07 +0000
24
@@ -8,6 +8,6 @@
25
8
Name: mirclient
8
Name: mirclient
26
9
Description: Mir client library
9
Description: Mir client library
27
10
Version: @MIR_VERSION@
10
Version: @MIR_VERSION@
29
11
Requires.private: protobuf-lite >= 2.4.1, mircookie
11
Requires.private: protobuf >= 2.4.1, mircookie
30
12
Libs: -L${libdir} -lmirclient -lmircommon
12
Libs: -L${libdir} -lmirclient -lmircommon
31
13
Cflags: -I${includedir} -I${common_includedir} 
13
Cflags: -I${includedir} -I${common_includedir} 
32
14
14
33
=== modified file 'src/protobuf/CMakeLists.txt'
34
--- src/protobuf/CMakeLists.txt	2016-08-04 16:49:58 +0000
35
+++ src/protobuf/CMakeLists.txt	2016-08-09 07:23:07 +0000
36
@@ -23,10 +23,10 @@
37
23
23
38
24
target_link_libraries(
24
target_link_libraries(
39
25
  mirprotobuf
25
  mirprotobuf
41
26
  ${PROTOBUF_LITE_LIBRARIES}
26
  ${PROTOBUF_LIBRARIES}
42
27
)
27
)
43
28
28
45
29
set(MIRPROTOBUF_ABI 3)
29
set(MIRPROTOBUF_ABI 4)
46
30
30
47
31
set_target_properties(
31
set_target_properties(
48
32
  mirprotobuf
32
  mirprotobuf
49
33
33
50
=== modified file 'src/protobuf/mir_protobuf.proto'
51
--- src/protobuf/mir_protobuf.proto	2016-06-21 21:31:05 +0000
52
+++ src/protobuf/mir_protobuf.proto	2016-08-09 07:23:07 +0000
53
@@ -1,3 +1,6 @@
54
1
// We wish to maintain support for protobuf-lite into the future even if we
55
2
// presently access the Lite classes via the full libprotobuf to work around
56
3
// crashes (LP: #1535297)
57
1
option optimize_for = LITE_RUNTIME;
4
option optimize_for = LITE_RUNTIME;
58
2
5
59
3
package mir.protobuf;
6
package mir.protobuf;
60
4
7
61
=== modified file 'src/protobuf/mir_protobuf_wire.proto'
62
--- src/protobuf/mir_protobuf_wire.proto	2016-01-29 08:18:22 +0000
63
+++ src/protobuf/mir_protobuf_wire.proto	2016-08-09 07:23:07 +0000
64
@@ -1,3 +1,6 @@
65
1
// We wish to maintain support for protobuf-lite into the future even if we
66
2
// presently access the Lite classes via the full libprotobuf to work around
67
3
// crashes (LP: #1535297)
68
1
option optimize_for = LITE_RUNTIME;
4
option optimize_for = LITE_RUNTIME;
69
2
5
70
3
package mir.protobuf.wire;
6
package mir.protobuf.wire;
71
4
7
72
=== modified file 'tests/integration-tests/CMakeLists.txt'
73
--- tests/integration-tests/CMakeLists.txt	2016-08-01 07:24:32 +0000
74
+++ tests/integration-tests/CMakeLists.txt	2016-08-09 07:23:07 +0000
75
@@ -79,7 +79,7 @@
76
79
79
77
80
  mircommon
80
  mircommon
78
81
81
80
82
  ${PROTOBUF_LITE_LIBRARIES}
82
  ${PROTOBUF_LIBRARIES}
81
83
  ${Boost_LIBRARIES}
83
  ${Boost_LIBRARIES}
82
84
  ${GTEST_BOTH_LIBRARIES}
84
  ${GTEST_BOTH_LIBRARIES}
83
85
  ${GMOCK_LIBRARY}
85
  ${GMOCK_LIBRARY}
84
86
86
85
=== modified file 'tests/integration-tests/graphics/mesa/CMakeLists.txt'
86
--- tests/integration-tests/graphics/mesa/CMakeLists.txt	2016-08-01 07:24:32 +0000
87
+++ tests/integration-tests/graphics/mesa/CMakeLists.txt	2016-08-09 07:23:07 +0000
88
@@ -23,7 +23,7 @@
89
23
      mirsharedmesaservercommon-static
23
      mirsharedmesaservercommon-static
90
24
      mircommon
24
      mircommon
91
25
25
93
26
      ${PROTOBUF_LITE_LIBRARIES}
26
      ${PROTOBUF_LIBRARIES}
94
27
      # Mesa platform dependencies
27
      # Mesa platform dependencies
95
28
      ${DRM_LDFLAGS} ${DRM_LIBRARIES}
28
      ${DRM_LDFLAGS} ${DRM_LIBRARIES}
96
29
      ${GBM_LDFLAGS} ${GBM_LIBRARIES}
29
      ${GBM_LDFLAGS} ${GBM_LIBRARIES}
97
@@ -60,7 +60,7 @@
98
60
      mirsharedmesaservercommon-static
60
      mirsharedmesaservercommon-static
99
61
      mircommon
61
      mircommon
100
62
62
102
63
      ${PROTOBUF_LITE_LIBRARIES}
63
      ${PROTOBUF_LIBRARIES}
103
64
      # Mesa platform dependencies
64
      # Mesa platform dependencies
104
65
      ${DRM_LDFLAGS} ${DRM_LIBRARIES}
65
      ${DRM_LDFLAGS} ${DRM_LIBRARIES}
105
66
      ${GBM_LDFLAGS} ${GBM_LIBRARIES}
66
      ${GBM_LDFLAGS} ${GBM_LIBRARIES}
106
67
67
107
=== modified file 'tests/unit-tests/CMakeLists.txt'
108
--- tests/unit-tests/CMakeLists.txt	2016-08-04 18:53:11 +0000
109
+++ tests/unit-tests/CMakeLists.txt	2016-08-09 07:23:07 +0000
110
@@ -139,7 +139,7 @@
111
139
139
112
140
  mircommon
140
  mircommon
113
141
141
115
142
  ${PROTOBUF_LITE_LIBRARIES}
142
  ${PROTOBUF_LIBRARIES}
116
143
  ${GTEST_BOTH_LIBRARIES}
143
  ${GTEST_BOTH_LIBRARIES}
117
144
  ${GMOCK_LIBRARY}
144
  ${GMOCK_LIBRARY}
118
145
  ${GMOCK_MAIN_LIBRARY}
145
  ${GMOCK_MAIN_LIBRARY}
119
@@ -172,7 +172,7 @@
120
172
  mir-test-static
172
  mir-test-static
121
173
  mir-test-framework-static
173
  mir-test-framework-static
122
174
174
124
175
  ${PROTOBUF_LITE_LIBRARIES}
175
  ${PROTOBUF_LIBRARIES}
125
176
  ${GTEST_BOTH_LIBRARIES}
176
  ${GTEST_BOTH_LIBRARIES}
126
177
  ${GMOCK_LIBRARY}
177
  ${GMOCK_LIBRARY}
127
178
  ${GMOCK_MAIN_LIBRARY}
178
  ${GMOCK_MAIN_LIBRARY}
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Needs Fixing on 2016-08-09
Alan Griffiths		2016-08-08	Needs Information on 2016-08-08
Review via email: mp+302252@code.launchpad.net