1
=== modified file '.bzrignore'
2
--- .bzrignore	2017-05-08 03:04:26 +0000
3
+++ .bzrignore	2017-09-08 19:22:40 +0000
4
@@ -2,4 +2,6 @@
5
2
.project
2
.project
6
3
include/server/mir/version.h
3
include/server/mir/version.h
7
4
include/client/mir_toolkit/version.h
4
include/client/mir_toolkit/version.h
8
5
include/miral/version.h
9
5
build-*
6
build-*
10
7
cmake-*
11
6
8
12
=== modified file 'debian/changelog'
13
--- debian/changelog	2017-08-29 08:56:16 +0000
14
+++ debian/changelog	2017-09-08 19:22:40 +0000
15
@@ -1,4 +1,4 @@
17
1
mir (1:1.0.0-0ubuntu1) UNRELEASED; urgency=medium
1
mir (1.0.0-0ubuntu1) UNRELEASED; urgency=medium
18
2
2
19
3
  * New upstream release 1.0.0(https://launchpad.net/mir/+milestone/1.0.0)
3
  * New upstream release 1.0.0(https://launchpad.net/mir/+milestone/1.0.0)
20
4
    - ABI summary:
4
    - ABI summary:
21
5
5
22
=== modified file 'debian/control'
23
--- debian/control	2017-09-07 05:58:13 +0000
24
+++ debian/control	2017-09-08 19:22:40 +0000
25
@@ -197,6 +197,9 @@
26
197
Architecture: linux-any
197
Architecture: linux-any
27
198
Multi-Arch: same
198
Multi-Arch: same
28
199
Pre-Depends: ${misc:Pre-Depends}
199
Pre-Depends: ${misc:Pre-Depends}
29
200
Breaks: libmirclientcpp-dev
30
201
Replaces: libmirclientcpp-dev
31
202
Provides: libmirclientcpp-dev (=1.5)
32
200
Depends: libmirclient9 (= ${binary:Version}),
203
Depends: libmirclient9 (= ${binary:Version}),
33
201
         libmircommon-dev (= ${binary:Version}),
204
         libmircommon-dev (= ${binary:Version}),
34
202
         libmircookie-dev (= ${binary:Version}),
205
         libmircookie-dev (= ${binary:Version}),
35
@@ -256,9 +259,13 @@
36
256
259
37
257
Package: mir-demos
260
Package: mir-demos
38
258
Architecture: linux-any
261
Architecture: linux-any
39
262
Breaks: miral-examples
40
263
Replaces: miral-examples
41
264
Provides: miral-examples (=1.5)
42
259
Depends: ${misc:Depends},
265
Depends: ${misc:Depends},
43
260
         ${shlibs:Depends},
266
         ${shlibs:Depends},
45
261
Recommends: fonts-liberation
267
Recommends: dmz-cursor-theme,
46
268
            fonts-liberation
47
262
Description: Display server for Ubuntu - demonstration programs
269
Description: Display server for Ubuntu - demonstration programs
48
263
 Mir is a display server running on linux systems, with a focus on efficiency,
270
 Mir is a display server running on linux systems, with a focus on efficiency,
49
264
 robust operation and a well-defined driver model.
271
 robust operation and a well-defined driver model.
50
@@ -498,7 +505,7 @@
51
498
Architecture: linux-any
505
Architecture: linux-any
52
499
Multi-Arch: same
506
Multi-Arch: same
53
500
Pre-Depends: ${misc:Pre-Depends}
507
Pre-Depends: ${misc:Pre-Depends}
55
501
Depends: libmiral2 (= ${binary:Version}),
508
Depends: libmiral2 (= ${libmiral2:Version}),
56
502
         libmirclientcpp-dev (= ${binary:Version}),
509
         libmirclientcpp-dev (= ${binary:Version}),
57
503
         ${misc:Depends},
510
         ${misc:Depends},
58
504
Description: Developer files for the Mir ABI-stable abstraction layer
511
Description: Developer files for the Mir ABI-stable abstraction layer
59
@@ -507,25 +514,3 @@
60
507
 .
514
 .
61
508
 Contains header files required for development using the MirAL abstraction
515
 Contains header files required for development using the MirAL abstraction
62
509
 layer.
516
 layer.
63
510
64
511
Package: libmirclientcpp-dev
65
512
Section: libdevel
66
513
Architecture: linux-any
67
514
Multi-Arch: same
68
515
Pre-Depends: ${misc:Pre-Depends}
69
516
Depends: libmirclient-dev,
70
517
Description: A C++ wrapper for libmirclient-dev
71
518
 Provides RAII (and other facilities) for Mir client library types.
72
519
 .
73
520
 Contains header files useful for C++ development against Mir.
74
521
75
522
Package: miral-examples
76
523
Architecture: linux-any
77
524
Depends: ${misc:Depends},
78
525
         ${shlibs:Depends},
79
526
Recommends: dmz-cursor-theme,
80
527
Description: Display server for Ubuntu - demonstration programs
81
528
 MirAL provides an ABI-stable abstraction layer for Mir based shells,
82
529
 insulating them from mirserver ABI breaks.
83
530
 .
84
531
 Contains demo applications that use the MirAL abstraction layer
85
532
517
86
=== modified file 'debian/libmiral2.symbols'
87
--- debian/libmiral2.symbols	2017-08-22 15:14:34 +0000
88
+++ debian/libmiral2.symbols	2017-09-08 19:22:40 +0000
89
@@ -355,45 +355,45 @@
90
355
 (c++)"vtable for miral::ActiveOutputsListener@MIRAL_1.0" 1.0.0
355
 (c++)"vtable for miral::ActiveOutputsListener@MIRAL_1.0" 1.0.0
91
356
 (c++)"vtable for miral::WindowManagementPolicy@MIRAL_1.0" 1.0.0
356
 (c++)"vtable for miral::WindowManagementPolicy@MIRAL_1.0" 1.0.0
92
357
 (c++)"vtable for miral::CanonicalWindowManagerPolicy@MIRAL_1.0" 1.0.0
357
 (c++)"vtable for miral::CanonicalWindowManagerPolicy@MIRAL_1.0" 1.0.0
93
358
 MIRAL_1.1@MIRAL_1.1 1.0.0
94
359
 (c++)"miral::WindowInfo::needs_titlebar(MirWindowType)@MIRAL_1.1" 1.0.0
95
360
 (c++)"miral::WindowInfo::type(MirWindowType)@MIRAL_1.1" 1.0.0
96
361
 (c++)"miral::WindowInfo::state(MirWindowState)@MIRAL_1.1" 1.0.0
97
362
 (c++)"miral::WindowManagementPolicy::advise_state_change(miral::WindowInfo const&, MirWindowState)@MIRAL_1.1" 1.0.0
98
363
 (c++)"miral::WindowInfo::can_morph_to(MirWindowType) const@MIRAL_1.1" 1.0.0
99
364
 (c++)"miral::CanonicalWindowManagerPolicy::place_new_window(miral::ApplicationInfo const&, miral::WindowSpecification const&)@MIRAL_1.1" 1.0.0
100
365
 MIRAL_1.2@MIRAL_1.2 1.0.0
101
366
 (c++)"miral::StartupInternalClient::StartupInternalClient(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<void (mir::client::Connection)>, std::function<void (std::weak_ptr<mir::scene::Session>)>)@MIRAL_1.2" 1.0.0
102
367
 (c++)"miral::InternalClientLauncher::launch(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::function<void (mir::client::Connection)> const&, std::function<void (std::weak_ptr<mir::scene::Session>)> const&) const@MIRAL_1.2" 1.0.0
103
368
 (c++)"miral::WindowInfo::shell_chrome(MirShellChrome)@MIRAL_1.2" 1.0.0
104
369
 (c++)"miral::WindowInfo::shell_chrome() const@MIRAL_1.2" 1.0.0
105
370
 (c++)"miral::WindowManagerTools::drag_window(miral::Window const&, mir::geometry::Displacement)@MIRAL_1.2" 1.0.0
106
371
 (c++)"typeinfo for miral::ApplicationAuthorizer@MIRAL_1.0" 1.0.0
107
372
 (c++)"typeinfo for miral::ApplicationAuthorizer1@MIRAL_1.2" 1.0.0
108
373
 MIRAL_1.3@MIRAL_1.3 1.0.0
109
374
 (c++)"miral::operator<(miral::Window const&, miral::Window const&)@MIRAL_1.0" 1.0.0
110
375
 (c++)"miral::WindowManagerTools::create_workspace()@MIRAL_1.3" 1.0.0
111
376
 (c++)"miral::WindowManagerTools::add_tree_to_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.0.0
112
377
 (c++)"miral::WindowManagerTools::focus_prev_within_application()@MIRAL_1.3" 1.0.0
113
378
 (c++)"miral::WindowManagerTools::remove_tree_from_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.0.0
114
379
 (c++)"miral::WindowManagerTools::move_workspace_content_to_workspace(std::shared_ptr<miral::Workspace> const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.0.0
115
380
 (c++)"miral::WorkspacePolicy::advise_adding_to_workspace(std::shared_ptr<miral::Workspace> const&, std::vector<miral::Window, std::allocator<miral::Window> > const&)@MIRAL_1.3" 1.0.0
116
381
 (c++)"miral::WorkspacePolicy::advise_removing_from_workspace(std::shared_ptr<miral::Workspace> const&, std::vector<miral::Window, std::allocator<miral::Window> > const&)@MIRAL_1.3" 1.0.0
117
382
 (c++)"miral::WindowManagerTools::for_each_window_in_workspace(std::shared_ptr<miral::Workspace> const&, std::function<void (miral::Window const&)> const&)@MIRAL_1.3" 1.0.0
118
383
 (c++)"miral::WindowManagerTools::for_each_workspace_containing(miral::Window const&, std::function<void (std::shared_ptr<miral::Workspace> const&)> const&)@MIRAL_1.3" 1.0.0
119
384
 (c++)"typeinfo for miral::WorkspacePolicy@MIRAL_1.3" 1.0.0
120
385
 (c++)"vtable for miral::WorkspacePolicy@MIRAL_1.3" 1.0.0
121
386
 MIRAL_1.3.1@MIRAL_1.3.1 1.0.0
122
387
 (c++)"miral::SetWindowManagementPolicy::SetWindowManagementPolicy(std::function<std::unique_ptr<miral::WindowManagementPolicy, std::default_delete<miral::WindowManagementPolicy> > (miral::WindowManagerTools const&)> const&)@MIRAL_1.3.1" 1.0.0
123
388
 (c++)"miral::SetWindowManagementPolicy::SetWindowManagementPolicy(std::function<std::unique_ptr<miral::WindowManagementPolicy, std::default_delete<miral::WindowManagementPolicy> > (miral::WindowManagerTools const&)> const&)@MIRAL_1.3.1" 1.0.0
124
389
 (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.0.0
125
390
 (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.0.0
126
391
 (c++)"miral::SetWindowManagementPolicy::operator()(mir::Server&) const@MIRAL_1.3.1" 1.0.0
127
392
 MIRAL_1.4.0@MIRAL_1.4.0 1.0.0
128
393
 (c++)"miral::WindowManagerTools::end_drag_and_drop()@MIRAL_1.4.0" 1.0.0
129
394
 (c++)"miral::WindowManagerTools::start_drag_and_drop(miral::WindowInfo&, std::vector<unsigned char, std::allocator<unsigned char> > const&)@MIRAL_1.4.0" 1.0.0
130
395
 (c++)"typeinfo for miral::WindowManagementPolicyAddendum2@MIRAL_1.4.0" 1.0.0
131
396
 MIRAL_1.5.0@MIRAL_1.5.0 1.0.0
132
397
 (c++)"miral::pre_init(miral::CommandLineOption const&)@MIRAL_1.5.0" 1.0.0
133
398
 (c++)"typeinfo for miral::WindowManagementPolicyAddendum3@MIRAL_1.5.0" 1.0.0
134
399
 (c++)"miral::WindowManagerTools::active_output()@MIRAL_1.5.0" 1.0.0
135
400
\ No newline at end of file
358
\ No newline at end of file
136
359
 MIRAL_1.1@MIRAL_1.1 1.1.0
137
360
 (c++)"miral::WindowInfo::needs_titlebar(MirWindowType)@MIRAL_1.1" 1.1.0
138
361
 (c++)"miral::WindowInfo::type(MirWindowType)@MIRAL_1.1" 1.1.0
139
362
 (c++)"miral::WindowInfo::state(MirWindowState)@MIRAL_1.1" 1.1.0
140
363
 (c++)"miral::WindowManagementPolicy::advise_state_change(miral::WindowInfo const&, MirWindowState)@MIRAL_1.1" 1.1.0
141
364
 (c++)"miral::WindowInfo::can_morph_to(MirWindowType) const@MIRAL_1.1" 1.1.0
142
365
 (c++)"miral::CanonicalWindowManagerPolicy::place_new_window(miral::ApplicationInfo const&, miral::WindowSpecification const&)@MIRAL_1.1" 1.1.0
143
366
 MIRAL_1.2@MIRAL_1.2 1.2.0
144
367
 (c++)"miral::StartupInternalClient::StartupInternalClient(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::function<void (mir::client::Connection)>, std::function<void (std::weak_ptr<mir::scene::Session>)>)@MIRAL_1.2" 1.2.0
145
368
 (c++)"miral::InternalClientLauncher::launch(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::function<void (mir::client::Connection)> const&, std::function<void (std::weak_ptr<mir::scene::Session>)> const&) const@MIRAL_1.2" 1.2.0
146
369
 (c++)"miral::WindowInfo::shell_chrome(MirShellChrome)@MIRAL_1.2" 1.2.0
147
370
 (c++)"miral::WindowInfo::shell_chrome() const@MIRAL_1.2" 1.2.0
148
371
 (c++)"miral::WindowManagerTools::drag_window(miral::Window const&, mir::geometry::Displacement)@MIRAL_1.2" 1.2.0
149
372
 (c++)"typeinfo for miral::ApplicationAuthorizer@MIRAL_1.0" 1.2.0
150
373
 (c++)"typeinfo for miral::ApplicationAuthorizer1@MIRAL_1.2" 1.2.0
151
374
 MIRAL_1.3@MIRAL_1.3 1.3.0
152
375
 (c++)"miral::operator<(miral::Window const&, miral::Window const&)@MIRAL_1.0" 1.3.0
153
376
 (c++)"miral::WindowManagerTools::create_workspace()@MIRAL_1.3" 1.3.0
154
377
 (c++)"miral::WindowManagerTools::add_tree_to_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.3.0
155
378
 (c++)"miral::WindowManagerTools::focus_prev_within_application()@MIRAL_1.3" 1.3.0
156
379
 (c++)"miral::WindowManagerTools::remove_tree_from_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.3.0
157
380
 (c++)"miral::WindowManagerTools::move_workspace_content_to_workspace(std::shared_ptr<miral::Workspace> const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.3.0
158
381
 (c++)"miral::WorkspacePolicy::advise_adding_to_workspace(std::shared_ptr<miral::Workspace> const&, std::vector<miral::Window, std::allocator<miral::Window> > const&)@MIRAL_1.3" 1.3.0
159
382
 (c++)"miral::WorkspacePolicy::advise_removing_from_workspace(std::shared_ptr<miral::Workspace> const&, std::vector<miral::Window, std::allocator<miral::Window> > const&)@MIRAL_1.3" 1.3.0
160
383
 (c++)"miral::WindowManagerTools::for_each_window_in_workspace(std::shared_ptr<miral::Workspace> const&, std::function<void (miral::Window const&)> const&)@MIRAL_1.3" 1.3.0
161
384
 (c++)"miral::WindowManagerTools::for_each_workspace_containing(miral::Window const&, std::function<void (std::shared_ptr<miral::Workspace> const&)> const&)@MIRAL_1.3" 1.3.0
162
385
 (c++)"typeinfo for miral::WorkspacePolicy@MIRAL_1.3" 1.3.0
163
386
 (c++)"vtable for miral::WorkspacePolicy@MIRAL_1.3" 1.3.0
164
387
 MIRAL_1.3.1@MIRAL_1.3.1 1.3.1
165
388
 (c++)"miral::SetWindowManagementPolicy::SetWindowManagementPolicy(std::function<std::unique_ptr<miral::WindowManagementPolicy, std::default_delete<miral::WindowManagementPolicy> > (miral::WindowManagerTools const&)> const&)@MIRAL_1.3.1" 1.3.1
166
389
 (c++)"miral::SetWindowManagementPolicy::SetWindowManagementPolicy(std::function<std::unique_ptr<miral::WindowManagementPolicy, std::default_delete<miral::WindowManagementPolicy> > (miral::WindowManagerTools const&)> const&)@MIRAL_1.3.1" 1.3.1
167
390
 (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.3.1
168
391
 (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.3.1
169
392
 (c++)"miral::SetWindowManagementPolicy::operator()(mir::Server&) const@MIRAL_1.3.1" 1.3.1
170
393
 MIRAL_1.4.0@MIRAL_1.4.0 1.4.0
171
394
 (c++)"miral::WindowManagerTools::end_drag_and_drop()@MIRAL_1.4.0" 1.4.0
172
395
 (c++)"miral::WindowManagerTools::start_drag_and_drop(miral::WindowInfo&, std::vector<unsigned char, std::allocator<unsigned char> > const&)@MIRAL_1.4.0" 1.4.0
173
396
 (c++)"typeinfo for miral::WindowManagementPolicyAddendum2@MIRAL_1.4.0" 1.4.0
174
397
 MIRAL_1.5.0@MIRAL_1.5.0 1.5.0
175
398
 (c++)"miral::pre_init(miral::CommandLineOption const&)@MIRAL_1.5.0" 1.5.0
176
399
 (c++)"typeinfo for miral::WindowManagementPolicyAddendum3@MIRAL_1.5.0" 1.5.0
177
400
 (c++)"miral::WindowManagerTools::active_output()@MIRAL_1.5.0" 1.5.0
178
401
\ No newline at end of file
401
\ No newline at end of file
179
402
402
180
=== modified file 'debian/libmirclient-dev.install'
181
--- debian/libmirclient-dev.install	2017-05-17 04:48:46 +0000
182
+++ debian/libmirclient-dev.install	2017-09-08 19:22:40 +0000
183
@@ -1,8 +1,10 @@
184
1
usr/include/mirclient/mir_toolkit/*.h
1
usr/include/mirclient/mir_toolkit/*.h
185
2
usr/include/mirclient/mir_toolkit/extensions/*.h
2
usr/include/mirclient/mir_toolkit/extensions/*.h
186
3
usr/include/mirclient/mir/client/*.h
187
3
usr/include/mirclient/mir/events/*.h
4
usr/include/mirclient/mir/events/*.h
188
4
usr/include/mirclient/mir/event_printer.h
5
usr/include/mirclient/mir/event_printer.h
189
5
usr/include/mirclient/mir_toolkit/events
6
usr/include/mirclient/mir_toolkit/events
190
6
usr/include/mirclient/mir_toolkit/rs/mir_render_surface.h
7
usr/include/mirclient/mir_toolkit/rs/mir_render_surface.h
191
7
usr/lib/*/pkgconfig/mirclient.pc
8
usr/lib/*/pkgconfig/mirclient.pc
192
9
usr/lib/*/pkgconfig/mirclientcpp.pc
193
8
usr/lib/*/libmirclient.so
10
usr/lib/*/libmirclient.so
194
9
11
195
=== removed file 'debian/libmirclientcpp-dev.install'
196
--- debian/libmirclientcpp-dev.install	2017-08-21 14:18:55 +0000
197
+++ debian/libmirclientcpp-dev.install	1970-01-01 00:00:00 +0000
198
@@ -1,2 +0,0 @@
199
1
usr/include/miral/mir/*/*
200
2
usr/lib/*/pkgconfig/mirclientcpp.pc
201
3
0
202
=== modified file 'debian/mir-demos.install'
203
--- debian/mir-demos.install	2017-08-31 11:29:14 +0000
204
+++ debian/mir-demos.install	2017-09-08 19:22:40 +0000
205
@@ -1,2 +1,11 @@
206
1
usr/bin/mir_demo_*
1
usr/bin/mir_demo_*
207
2
usr/lib/*/libmir_demo_*
2
usr/lib/*/libmir_demo_*
208
3
usr/bin/miral-shell
209
4
usr/bin/miral-run
210
5
usr/bin/miral-kiosk
211
6
usr/bin/miral-xrun
212
7
usr/bin/miral-screencast
213
8
usr/bin/miral-desktop
214
9
usr/bin/miral-app
215
10
usr/share/applications/miral-shell.desktop
216
11
usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg
217
3
12
218
=== removed file 'debian/miral-examples.install'
219
--- debian/miral-examples.install	2017-08-21 15:58:34 +0000
220
+++ debian/miral-examples.install	1970-01-01 00:00:00 +0000
221
@@ -1,9 +0,0 @@
222
1
usr/bin/miral-shell
223
2
usr/bin/miral-run
224
3
usr/bin/miral-kiosk
225
4
usr/bin/miral-xrun
226
5
usr/bin/miral-screencast
227
6
usr/bin/miral-desktop
228
7
usr/bin/miral-app
229
8
usr/share/applications/miral-shell.desktop
230
9
usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg
231
10
0
232
=== modified file 'debian/rules'
233
--- debian/rules	2017-06-02 08:19:00 +0000
234
+++ debian/rules	2017-09-08 19:22:40 +0000
235
@@ -1,10 +1,6 @@
236
1
#!/usr/bin/make -f
1
#!/usr/bin/make -f
237
2
2
243
3
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
3
include /usr/share/dpkg/default.mk
239
4
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
240
5
DEB_HOST_ARCH_ENDIAN ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)
241
6
EXACT_PACKAGE_VERSION = $(shell dpkg-parsechangelog | grep Version | cut -d' ' -f 2)
242
7
DISTRIB_CODENAME = $(shell grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2)
244
8
4
245
9
export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
5
export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
246
10
6
247
@@ -57,16 +53,25 @@
248
57
override_dh_auto_build-indep:
53
override_dh_auto_build-indep:
249
58
	dh_auto_build -- doc
54
	dh_auto_build -- doc
250
59
55
251
56
# Reconstruct the MirAL version
252
57
MIRAL_VERSION_MAJOR = $(shell perl -n -e '/^set\(MIRAL_VERSION_MAJOR ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt)
253
58
MIRAL_VERSION_MINOR = $(shell perl -n -e '/^set\(MIRAL_VERSION_MINOR ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt)
254
59
MIRAL_VERSION_PATCH = $(shell perl -n -e '/^set\(MIRAL_VERSION_PATCH ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt)
255
60
MIRAL_RELEASE=$(MIRAL_VERSION_MAJOR).$(MIRAL_VERSION_MINOR).$(MIRAL_VERSION_PATCH)
256
61
MIRAL_VERSION=$(MIRAL_RELEASE).$(DEB_VERSION)
257
62
258
60
# TODO: we'll use a symbol file once mir is abi stable
63
# TODO: we'll use a symbol file once mir is abi stable
259
61
override_dh_makeshlibs:
64
override_dh_makeshlibs:
261
62
	dh_makeshlibs -V -Nmir-test-tools
65
	dh_makeshlibs -Nlibmiral2 -V -Nmir-test-tools
262
66
	# libmiral2 *has* a symbols file, so we don't need to -V it!
263
67
	dh_makeshlibs -plibmiral2 -- -v$(MIRAL_RELEASE)
264
63
68
265
64
override_dh_install:
69
override_dh_install:
266
65
# Nothing outside Mir should link to libmirprotobuf directly.
70
# Nothing outside Mir should link to libmirprotobuf directly.
267
66
# Delete the symlink so that --fail-missing doesn't think we've missed it
71
# Delete the symlink so that --fail-missing doesn't think we've missed it
268
67
# accidentally.
72
# accidentally.
269
68
	-rm debian/tmp/usr/lib/*/libmirprotobuf.so
73
	-rm debian/tmp/usr/lib/*/libmirprotobuf.so
271
69
ifeq ($(filter xenial yakkety zesty,$(DISTRIB_CODENAME)),)
74
ifeq ($(filter xenial yakkety zesty,$(DEB_DISTRIBUTION)),)
272
70
	dh_install
75
	dh_install
273
71
else
76
else
274
72
	# xenial, yakkety & zesty predate dh_missing
77
	# xenial, yakkety & zesty predate dh_missing
275
@@ -80,3 +85,7 @@
276
80
# Don't try to find dependencies of libraries used as test data
85
# Don't try to find dependencies of libraries used as test data
277
81
override_dh_shlibdeps:
86
override_dh_shlibdeps:
278
82
	dh_shlibdeps -Xmir-test-data
87
	dh_shlibdeps -Xmir-test-data
279
88
280
89
override_dh_gencontrol:
281
90
	dh_gencontrol -Nlibmiral2 -Nlibmiral-dev
282
91
	dh_gencontrol -plibmiral2 -plibmiral-dev -- -v$(MIRAL_VERSION) -V'libmiral2:Version=$(MIRAL_VERSION)'
283
83
92
284
=== modified file 'doc/mainpage.md'
285
--- doc/mainpage.md	2017-09-07 09:53:20 +0000
286
+++ doc/mainpage.md	2017-09-08 19:22:40 +0000
287
@@ -28,7 +28,7 @@
288
28
28
289
29
Install the headers and libraries for using libmiral in development:
29
Install the headers and libraries for using libmiral in development:
290
30
30
292
31
    $ sudo apt install libmirserver-dev
31
    $ sudo apt install libmiral-dev
293
32
32
294
33
A `miral.pc` file is provided for use with `pkg-config` or other tools. For
33
A `miral.pc` file is provided for use with `pkg-config` or other tools. For
295
34
example: 
34
example: 
296
35
35
297
=== renamed directory 'include/miral/mir/client' => 'include/client/mir/client'
298
=== modified file 'src/CMakeLists.txt'
299
--- src/CMakeLists.txt	2017-09-07 05:58:13 +0000
300
+++ src/CMakeLists.txt	2017-09-08 19:22:40 +0000
301
@@ -1,6 +1,11 @@
302
1
# We need MIRPLATFORM_ABI in both libmirplatform and the platform implementations.
1
# We need MIRPLATFORM_ABI in both libmirplatform and the platform implementations.
303
2
set(MIRPLATFORM_ABI 16)
2
set(MIRPLATFORM_ABI 16)
304
3
3
305
4
set(MIRAL_VERSION_MAJOR 1)
306
5
set(MIRAL_VERSION_MINOR 5)
307
6
set(MIRAL_VERSION_PATCH 0)
308
7
set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH})
309
8
310
4
# Add the cookie implementation before exposing any APIs
9
# Add the cookie implementation before exposing any APIs
311
5
add_subdirectory(cookie/)
10
add_subdirectory(cookie/)
312
6
11
313
7
12
314
=== modified file 'src/client/CMakeLists.txt'
315
--- src/client/CMakeLists.txt	2017-05-17 04:48:46 +0000
316
+++ src/client/CMakeLists.txt	2017-09-08 19:22:40 +0000
317
@@ -11,6 +11,11 @@
318
11
  @ONLY
11
  @ONLY
319
12
)
12
)
320
13
13
321
14
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mirclientcpp.pc.in
322
15
  ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc
323
16
  @ONLY
324
17
)
325
18
326
14
configure_file(
19
configure_file(
327
15
  ${CMAKE_CURRENT_SOURCE_DIR}/mirclient-debug-extension.pc.in
20
  ${CMAKE_CURRENT_SOURCE_DIR}/mirclient-debug-extension.pc.in
328
16
  ${CMAKE_CURRENT_BINARY_DIR}/mirclient-debug-extension.pc
21
  ${CMAKE_CURRENT_BINARY_DIR}/mirclient-debug-extension.pc
329
@@ -106,6 +111,13 @@
330
106
  mir_extension_core.cpp
111
  mir_extension_core.cpp
331
107
  ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_extension_core.h
112
  ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_extension_core.h
332
108
  ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/extensions/drag_and_drop.h
113
  ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/extensions/drag_and_drop.h
333
114
  ${CMAKE_SOURCE_DIR}/include/client/mir/client/blob.h
334
115
  ${CMAKE_SOURCE_DIR}/include/client/mir/client/cookie.h
335
116
  ${CMAKE_SOURCE_DIR}/include/client/mir/client/window_spec.h
336
117
  ${CMAKE_SOURCE_DIR}/include/client/mir/client/window_id.h
337
118
  ${CMAKE_SOURCE_DIR}/include/client/mir/client/connection.h
338
119
  ${CMAKE_SOURCE_DIR}/include/client/mir/client/display_config.h
339
120
  ${CMAKE_SOURCE_DIR}/include/client/mir/client/window.h
340
109
)
121
)
341
110
122
342
111
# Ensure protobuf C++ headers have been produced before
123
# Ensure protobuf C++ headers have been produced before
343
@@ -153,6 +165,7 @@
344
153
165
345
154
install(
166
install(
346
155
  FILES ${CMAKE_CURRENT_BINARY_DIR}/mirclient.pc
167
  FILES ${CMAKE_CURRENT_BINARY_DIR}/mirclient.pc
347
168
        ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc
348
156
  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
169
  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
349
157
)
170
)
350
158
171
351
159
172
352
=== renamed file 'src/miral/mirclientcpp.pc.in' => 'src/client/mirclientcpp.pc.in'
353
--- src/miral/mirclientcpp.pc.in	2017-08-29 09:17:03 +0000
354
+++ src/client/mirclientcpp.pc.in	2017-09-08 19:22:40 +0000
355
@@ -1,7 +1,7 @@
357
1
includedir=@INCLUDEDIR@/miral
1
includedir=@INCLUDEDIR@/mirclient
358
2
2
359
3
Name: mirclientcpp
3
Name: mirclientcpp
361
4
Description: Mir Abstraction Layer C++ wrapper for mirclient
4
Description: C++ wrapper for mirclient
362
5
Version: @MIRAL_VERSION@
5
Version: @MIRAL_VERSION@
363
6
Requires: mirclient
6
Requires: mirclient
364
7
Cflags: -I${includedir}
7
Cflags: -I${includedir}
365
8
8
366
=== modified file 'src/miral/CMakeLists.txt'
367
--- src/miral/CMakeLists.txt	2017-08-30 16:24:09 +0000
368
+++ src/miral/CMakeLists.txt	2017-09-08 19:22:40 +0000
369
@@ -1,8 +1,3 @@
370
1
set(MIRAL_VERSION_MAJOR 1)
371
2
set(MIRAL_VERSION_MINOR 5)
372
3
set(MIRAL_VERSION_PATCH 0)
373
4
set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH})
374
5
375
6
if(${CMAKE_COMPILER_IS_GNUCXX})
1
if(${CMAKE_COMPILER_IS_GNUCXX})
376
7
    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -flto")
2
    set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -flto")
377
8
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
3
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
378
@@ -66,13 +61,6 @@
379
66
    window_manager_tools.cpp            ${miral_include}/miral/window_manager_tools.h
61
    window_manager_tools.cpp            ${miral_include}/miral/window_manager_tools.h
380
67
                                        ${miral_include}/miral/window_management_policy_addendum2.h
62
                                        ${miral_include}/miral/window_management_policy_addendum2.h
381
68
                                        ${miral_include}/miral/window_management_policy_addendum3.h
63
                                        ${miral_include}/miral/window_management_policy_addendum3.h
382
69
                                        ${miral_include}/mir/client/blob.h
383
70
                                        ${miral_include}/mir/client/cookie.h
384
71
                                        ${miral_include}/mir/client/window_spec.h
385
72
                                        ${miral_include}/mir/client/window_id.h
386
73
                                        ${miral_include}/mir/client/connection.h
387
74
                                        ${miral_include}/mir/client/display_config.h
388
75
                                        ${miral_include}/mir/client/window.h
389
76
)
64
)
390
77
65
391
78
target_include_directories(mirclientcpp
66
target_include_directories(mirclientcpp
392
@@ -110,7 +98,7 @@
393
110
    add_custom_target(check-miral-symbols ALL
98
    add_custom_target(check-miral-symbols ALL
394
111
            DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols
99
            DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols
395
112
            COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
100
            COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
397
113
            COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmiral.so.${MIRAL_ABI} -plibmiral${MIRAL_ABI} -O${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
101
            COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmiral.so.${MIRAL_ABI} -plibmiral${MIRAL_ABI} -v${MIRAL_VERSION} -O${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
398
114
            WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
102
            WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
399
115
            VERBATIM
103
            VERBATIM
400
116
    )
104
    )
401
@@ -124,11 +112,6 @@
402
124
    @ONLY
112
    @ONLY
403
125
)
113
)
404
126
114
405
127
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mirclientcpp.pc.in
406
128
    ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc
407
129
    @ONLY
408
130
)
409
131
410
132
configure_file(
115
configure_file(
411
133
    ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
116
    ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
412
134
    ${miral_include}/miral/version.h
117
    ${miral_include}/miral/version.h
413
@@ -140,7 +123,6 @@
414
140
            DEPENDS doc)
123
            DEPENDS doc)
415
141
endif()
124
endif()
416
142
125
421
143
install(TARGETS     miral                           LIBRARY         DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
126
install(TARGETS     miral                           LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
422
144
install(DIRECTORY   ${CMAKE_SOURCE_DIR}/include/miral               DESTINATION "${INCLUDEDIR}")
127
install(DIRECTORY   ${CMAKE_SOURCE_DIR}/include/miral       DESTINATION "${INCLUDEDIR}")
423
145
install(FILES       ${CMAKE_CURRENT_BINARY_DIR}/miral.pc
128
install(FILES       ${CMAKE_CURRENT_BINARY_DIR}/miral.pc    DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
420
146
                    ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc    DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
Status:	Merged
Approved by:	Alan Griffiths on 2017-09-09
Approved revision:	no longer in the source branch.
Merged at revision:	4246
Proposed branch:	lp:~alan-griffiths/mir/move-miral-to-mir-no-more-miral-packages
Merge into:	lp:mir
Diff against target:	423 lines (+106/-110) 14 files modified .bzrignore (+2/-0) debian/changelog (+1/-1) debian/control (+9/-24) debian/libmiral2.symbols (+42/-42) debian/libmirclient-dev.install (+2/-0) debian/libmirclientcpp-dev.install (+0/-2) debian/mir-demos.install (+9/-0) debian/miral-examples.install (+0/-9) debian/rules (+16/-7) doc/mainpage.md (+1/-1) src/CMakeLists.txt (+5/-0) src/client/CMakeLists.txt (+13/-0) src/client/mirclientcpp.pc.in (+2/-2) src/miral/CMakeLists.txt (+4/-22)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/move-miral-to-mir-no-more-miral-packages
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration	2017-09-08	Approve on 2017-09-09
Michał Sawicz		2017-09-08	Approve on 2017-09-08
Alan Griffiths			Pending
Chris Halse Rogers		2017-09-08	Pending
Review via email: mp+330433@code.launchpad.net