Mir

Merge lp:~alan-griffiths/mir/libmirserver-ABI-bump into lp:mir

libmirserver-ABI-bump
Merge into development-branch

Proposed by Alan Griffiths on 2015-02-23

Status:	Merged
Approved by:	Daniel van Vugt on 2015-02-26
Approved revision:	2338
Merged at revision:	2341
Proposed branch:	lp:~alan-griffiths/mir/libmirserver-ABI-bump
Merge into:	lp:mir
Diff against target:	69 lines (+6/-11) 4 files modified debian/control (+2/-2) debian/libmirserver31.install (+1/-1) src/server/CMakeLists.txt (+1/-1) src/server/symbols.map (+2/-7)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/libmirserver-ABI-bump
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel van Vugt			Approve on 2015-02-25
PS Jenkins bot	continuous-integration		Approve on 2015-02-25
Alexandros Frantzis (community)			Needs Fixing on 2015-02-24
Cemil Azizoglu (community)		2015-02-23	Approve on 2015-02-23
Review via email: mp+250602@code.launchpad.net

Commit Message

server: bump ABI

Description of the Change

server: bump ABI

We couldn't do this before lp:1423591 was resolved

PS Jenkins bot (ps-jenkins) wrote on 2015-02-23:

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

review: Approve (continuous-integration)

Cemil Azizoglu (cemil-azizoglu) wrote on 2015-02-23:

review: Approve

lp:~alan-griffiths/mir/libmirserver-ABI-bump updated on 2015-02-23

2336. By Alan Griffiths on 2015-02-23: Bump ABI to 31 (leaving 30 for 0.11.0)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-23:

FAILED: Continuous integration, rev:2336
http://jenkins.qa.ubuntu.com/job/mir-ci/3043/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/1389
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/1388
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/1345/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/1040/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/1345/console

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

review: Needs Fixing (continuous-integration)

lp:~alan-griffiths/mir/libmirserver-ABI-bump updated on 2015-02-23

2337. By Alan Griffiths on 2015-02-23: Bump ABI to 31 (leaving 30 for 0.11.0)

PS Jenkins bot (ps-jenkins) wrote on 2015-02-23:

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

review: Approve (continuous-integration)

Alexandros Frantzis (afrantzis) wrote on 2015-02-24:

48 +MIR_SERVER_30 {

31?

review: Needs Fixing

lp:~alan-griffiths/mir/libmirserver-ABI-bump updated on 2015-02-24

2338. By Alan Griffiths on 2015-02-24: 31

Alan Griffiths (alan-griffiths) wrote on 2015-02-24:

> 48 +MIR_SERVER_30 {
>
> 31?

PS Jenkins bot (ps-jenkins) wrote on 2015-02-25:

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

review: Approve (continuous-integration)

Daniel van Vugt (vanvugt) wrote on 2015-02-25:

Also needs noting in debian/changelog

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Alan Griffiths

Emanuele Antonio Faraone

Gerry Boland

Mir development team

1	=== modified file 'debian/control'
2	--- debian/control 2015-02-23 08:50:18 +0000
3	+++ debian/control 2015-02-24 18:02:48 +0000
4	@@ -61,7 +61,7 @@
5
6	#TODO: Packaging infrastructure for better dependency generation,
7	# ala pkg-xorg's xviddriver:Provides and ABI detection.
8	-Package: libmirserver29
9	+Package: libmirserver31
10	Section: libs
11	Architecture: i386 amd64 armhf arm64
12	Multi-Arch: same
13	@@ -127,7 +127,7 @@
14	Architecture: i386 amd64 armhf arm64
15	Multi-Arch: same
16	Pre-Depends: ${misc:Pre-Depends}
17	-Depends: libmirserver29 (= ${binary:Version}),
18	+Depends: libmirserver31 (= ${binary:Version}),
19	libmirplatform-dev (= ${binary:Version}),
20	libmircommon-dev (= ${binary:Version}),
21	libglm-dev,
22
23	=== renamed file 'debian/libmirserver29.install' => 'debian/libmirserver31.install'
24	--- debian/libmirserver29.install 2015-02-19 10:37:47 +0000
25	+++ debian/libmirserver31.install 2015-02-24 18:02:48 +0000
26	@@ -1,1 +1,1 @@
27	-usr/lib/*/libmirserver.so.29
28	+usr/lib/*/libmirserver.so.31
29
30	=== modified file 'src/server/CMakeLists.txt'
31	--- src/server/CMakeLists.txt 2015-02-19 13:21:15 +0000
32	+++ src/server/CMakeLists.txt 2015-02-24 18:02:48 +0000
33	@@ -106,7 +106,7 @@
34	${CMAKE_SOURCE_DIR}/include/server/mir DESTINATION "include/mirserver"
35	)
36
37	-set(MIRSERVER_ABI 29) # Be sure to increment MIR_VERSION_MINOR at the same time
38	+set(MIRSERVER_ABI 31) # Be sure to increment MIR_VERSION_MINOR at the same time
39	set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
40
41	set_target_properties(
42
43	=== modified file 'src/server/symbols.map'
44	--- src/server/symbols.map 2015-02-20 15:27:28 +0000
45	+++ src/server/symbols.map 2015-02-24 18:02:48 +0000
46	@@ -1,4 +1,4 @@
47	-MIR_SERVER_29 {
48	+MIR_SERVER_31 {
49	global:
50	extern "C++" {
51	# Symbols not yet picked up by script
52	@@ -226,6 +226,7 @@
53	mir::scene::SurfaceCoordinator::operator*;
54	mir::scene::SurfaceCoordinator::raise*;
55	mir::scene::SurfaceCoordinator::remove_surface*;
56	+ mir::scene::SurfaceCoordinator::surface_at*;
57	mir::scene::SurfaceCoordinator::?SurfaceCoordinator*;
58	mir::scene::SurfaceCoordinator::SurfaceCoordinator*;
59	mir::scene::SurfaceCreationParameters::of_buffer_usage*;
60	@@ -736,9 +737,3 @@
61	};
62	local: *;
63	};
64	-
65	-MIR_SERVER_29.1 {
66	- global:
67	- mir::scene::SurfaceCoordinator::surface_at*;
68	- local: *;
69	-} MIR_SERVER_29;