1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2017-05-25 08:58:03 +0000
3
+++ CMakeLists.txt	2017-08-07 08:32:21 +0000
4
@@ -27,8 +27,8 @@
5
27
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
27
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
6
28
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
28
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
7
29
29
10
30
set(MIR_VERSION_MAJOR 0)
30
set(MIR_VERSION_MAJOR 1)
11
31
set(MIR_VERSION_MINOR 27)
31
set(MIR_VERSION_MINOR 0)
12
32
set(MIR_VERSION_PATCH 0)
32
set(MIR_VERSION_PATCH 0)
13
33
33
14
34
add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
34
add_definitions(-DMIR_VERSION_MAJOR=${MIR_VERSION_MAJOR})
15
35
35
16
=== modified file 'debian/control'
17
--- debian/control	2017-05-25 08:58:03 +0000
18
+++ debian/control	2017-08-07 08:32:21 +0000
19
@@ -67,7 +67,7 @@
20
67
67
21
68
#TODO: Packaging infrastructure for better dependency generation,
68
#TODO: Packaging infrastructure for better dependency generation,
22
69
#      ala pkg-xorg's xviddriver:Provides and ABI detection.
69
#      ala pkg-xorg's xviddriver:Provides and ABI detection.
24
70
Package: libmirserver44
70
Package: libmirserver45
25
71
Section: libs
71
Section: libs
26
72
Architecture: linux-any
72
Architecture: linux-any
27
73
Multi-Arch: same
73
Multi-Arch: same
28
@@ -146,7 +146,7 @@
29
146
Architecture: linux-any
146
Architecture: linux-any
30
147
Multi-Arch: same
147
Multi-Arch: same
31
148
Pre-Depends: ${misc:Pre-Depends}
148
Pre-Depends: ${misc:Pre-Depends}
33
149
Depends: libmirserver44 (= ${binary:Version}),
149
Depends: libmirserver45 (= ${binary:Version}),
34
150
         libmirplatform-dev (= ${binary:Version}),
150
         libmirplatform-dev (= ${binary:Version}),
35
151
         libmircommon-dev (= ${binary:Version}),
151
         libmircommon-dev (= ${binary:Version}),
36
152
         libglm-dev,
152
         libglm-dev,
37
153
153
38
=== renamed file 'debian/libmirserver44.install' => 'debian/libmirserver45.install'
39
--- debian/libmirserver44.install	2017-05-08 03:04:26 +0000
40
+++ debian/libmirserver45.install	2017-08-07 08:32:21 +0000
41
@@ -1,1 +1,1 @@
43
1
usr/lib/*/libmirserver.so.44
1
usr/lib/*/libmirserver.so.45
44
2
2
45
=== modified file 'src/server/CMakeLists.txt'
46
--- src/server/CMakeLists.txt	2017-05-08 03:04:26 +0000
47
+++ src/server/CMakeLists.txt	2017-08-07 08:32:21 +0000
48
@@ -132,7 +132,7 @@
49
132
  ${CMAKE_SOURCE_DIR}/include/server/mir DESTINATION "include/mirserver"
132
  ${CMAKE_SOURCE_DIR}/include/server/mir DESTINATION "include/mirserver"
50
133
)
133
)
51
134
134
53
135
set(MIRSERVER_ABI 44) # Be sure to increment MIR_VERSION_MINOR at the same time
135
set(MIRSERVER_ABI 45) # Be sure to increment MIR_VERSION_MINOR at the same time
54
136
set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
136
set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
55
137
137
56
138
set_target_properties(
138
set_target_properties(
57
139
139
58
=== modified file 'src/server/symbols.map'
59
--- src/server/symbols.map	2017-05-08 03:04:26 +0000
60
+++ src/server/symbols.map	2017-08-07 08:32:21 +0000
61
@@ -1,4 +1,4 @@
63
1
MIR_SERVER_0.27 {
1
MIR_SERVER_1.0 {
64
2
 global:
2
 global:
65
3
  extern "C++" {
3
  extern "C++" {
66
4
# Symbols not yet picked up by script
4
# Symbols not yet picked up by script
67
@@ -35,9 +35,6 @@
68
35
    mir::frontend::BufferStream::?BufferStream*;
35
    mir::frontend::BufferStream::?BufferStream*;
69
36
    mir::frontend::BufferStream::BufferStream*;
36
    mir::frontend::BufferStream::BufferStream*;
70
37
    mir::frontend::BufferStream::operator*;
37
    mir::frontend::BufferStream::operator*;
71
38
    mir::frontend::ClientBuffers::?ClientBuffers*;
72
39
    mir::frontend::ClientBuffers::ClientBuffers*;
73
40
    mir::frontend::ClientBuffers::operator*;
74
41
    mir::frontend::PromptSession::operator*;
38
    mir::frontend::PromptSession::operator*;
75
42
    mir::frontend::PromptSession::?PromptSession*;
39
    mir::frontend::PromptSession::?PromptSession*;
76
43
    mir::frontend::PromptSession::PromptSession*;
40
    mir::frontend::PromptSession::PromptSession*;
77
@@ -190,6 +187,7 @@
78
190
    mir::Server::override_the_gl_config*;
187
    mir::Server::override_the_gl_config*;
79
191
    mir::Server::override_the_host_lifecycle_event_listener*;
188
    mir::Server::override_the_host_lifecycle_event_listener*;
80
192
    mir::Server::override_the_input_dispatcher*;
189
    mir::Server::override_the_input_dispatcher*;
81
190
    mir::Server::override_the_input_targeter*;
82
193
    mir::Server::override_the_logger*;
191
    mir::Server::override_the_logger*;
83
194
    mir::Server::override_the_persistent_surface_store*;
192
    mir::Server::override_the_persistent_surface_store*;
84
195
    mir::Server::override_the_prompt_session_listener*;
193
    mir::Server::override_the_prompt_session_listener*;
85
@@ -427,7 +425,6 @@
86
427
    non-virtual?thunk?to?mir::Executor::?Executor*;
425
    non-virtual?thunk?to?mir::Executor::?Executor*;
87
428
    non-virtual?thunk?to?mir::frontend::BufferSink::?BufferSink*;
426
    non-virtual?thunk?to?mir::frontend::BufferSink::?BufferSink*;
88
429
    non-virtual?thunk?to?mir::frontend::BufferStream::?BufferStream*;
427
    non-virtual?thunk?to?mir::frontend::BufferStream::?BufferStream*;
89
430
    non-virtual?thunk?to?mir::frontend::ClientBuffers::?ClientBuffers*;
90
431
    non-virtual?thunk?to?mir::frontend::PromptSession::?PromptSession*;
428
    non-virtual?thunk?to?mir::frontend::PromptSession::?PromptSession*;
91
432
    non-virtual?thunk?to?mir::frontend::SessionAuthorizer::?SessionAuthorizer*;
429
    non-virtual?thunk?to?mir::frontend::SessionAuthorizer::?SessionAuthorizer*;
92
433
    non-virtual?thunk?to?mir::frontend::SessionMediatorObserver::?SessionMediatorObserver*;
430
    non-virtual?thunk?to?mir::frontend::SessionMediatorObserver::?SessionMediatorObserver*;
93
@@ -616,7 +613,6 @@
94
616
    typeinfo?for?mir::Executor;
613
    typeinfo?for?mir::Executor;
95
617
    typeinfo?for?mir::frontend::BufferSink;
614
    typeinfo?for?mir::frontend::BufferSink;
96
618
    typeinfo?for?mir::frontend::BufferStream;
615
    typeinfo?for?mir::frontend::BufferStream;
97
619
    typeinfo?for?mir::frontend::ClientBuffers;
98
620
    typeinfo?for?mir::frontend::PromptSession;
616
    typeinfo?for?mir::frontend::PromptSession;
99
621
    typeinfo?for?mir::frontend::Session;
617
    typeinfo?for?mir::frontend::Session;
100
622
    typeinfo?for?mir::frontend::SessionAuthorizer;
618
    typeinfo?for?mir::frontend::SessionAuthorizer;
101
@@ -704,7 +700,6 @@
102
704
    vtable?for?mir::Executor;
700
    vtable?for?mir::Executor;
103
705
    vtable?for?mir::frontend::BufferSink;
701
    vtable?for?mir::frontend::BufferSink;
104
706
    vtable?for?mir::frontend::BufferStream;
702
    vtable?for?mir::frontend::BufferStream;
105
707
    vtable?for?mir::frontend::ClientBuffers;
106
708
    vtable?for?mir::frontend::PromptSession;
703
    vtable?for?mir::frontend::PromptSession;
107
709
    vtable?for?mir::frontend::Session;
704
    vtable?for?mir::frontend::Session;
108
710
    vtable?for?mir::frontend::SessionAuthorizer;
705
    vtable?for?mir::frontend::SessionAuthorizer;
109
@@ -825,7 +820,7 @@
110
825
};
820
};
111
826
821
112
827
# these symbols are needed by the "throwback" tests and mir_proving_server but are not intended to be public
822
# these symbols are needed by the "throwback" tests and mir_proving_server but are not intended to be public
114
828
MIR_SERVER_DETAIL_FOR_TESTING_0.27 {
823
MIR_SERVER_DETAIL_FOR_TESTING_1.0 {
115
829
 global:
824
 global:
116
830
  extern "C++" {
825
  extern "C++" {
117
831
    mir::DefaultServerConfiguration::clock*;
826
    mir::DefaultServerConfiguration::clock*;
118
@@ -933,10 +928,10 @@
119
933
928
120
934
    mir::run_mir*;
929
    mir::run_mir*;
121
935
  };
930
  };
123
936
} MIR_SERVER_0.27;
931
} MIR_SERVER_1.0;
124
937
932
125
938
# these symbols are needed by mir_proving_server but are not intended to be public
933
# these symbols are needed by mir_proving_server but are not intended to be public
127
939
MIR_SERVER_DETAIL_FOR_PROVING_0.27 {
934
MIR_SERVER_DETAIL_FOR_PROVING_1.0 {
128
940
 global:
935
 global:
129
941
  extern "C++" {
936
  extern "C++" {
130
942
    mir::renderer::gl::ProgramFamily::add_program*;
937
    mir::renderer::gl::ProgramFamily::add_program*;
131
@@ -954,4 +949,4 @@
132
954
    typeinfo?for?mir::renderer::gl::Renderer;
949
    typeinfo?for?mir::renderer::gl::Renderer;
133
955
    vtable?for?mir::renderer::gl::Renderer;
950
    vtable?for?mir::renderer::gl::Renderer;
134
956
  };
951
  };
136
957
} MIR_SERVER_DETAIL_FOR_TESTING_0.27;
952
} MIR_SERVER_DETAIL_FOR_TESTING_1.0;
Status:	Merged
Merged at revision:	4223
Proposed branch:	lp:~alan-griffiths/mir/bump-mir-server-ABI
Merge into:	lp:mir
Diff against target:	136 lines (+12/-17) 5 files modified CMakeLists.txt (+2/-2) debian/control (+2/-2) debian/libmirserver45.install (+1/-1) src/server/CMakeLists.txt (+1/-1) src/server/symbols.map (+6/-11)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/bump-mir-server-ABI
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Needs Fixing on 2017-08-10
Brandon Schaefer (community)		2017-08-02	Approve on 2017-08-08
Review via email: mp+328444@code.launchpad.net