Merge lp:~alan-griffiths/mir/move-miral-to-mir-no-more-miral-packages into lp:mir
- move-miral-to-mir-no-more-miral-packages
- Merge into development-branch
Status: | Superseded |
---|---|
Proposed branch: | lp:~alan-griffiths/mir/move-miral-to-mir-no-more-miral-packages |
Merge into: | lp:mir |
Diff against target: |
359 lines (+97/-86) 13 files modified
.bzrignore (+2/-0) debian/changelog (+1/-1) 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: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mir CI Bot | continuous-integration | Approve | |
Alan Griffiths | Abstain | ||
Chris Halse Rogers | Approve | ||
MichaĆ Sawicz | Approve | ||
Review via email: mp+329993@code.launchpad.net |
This proposal supersedes a proposal from 2017-08-29.
This proposal has been superseded by a proposal from 2017-09-08.
Commit message
Incorporate miral packages into corresponding mir packages so we won't need an epoch
Description of the change
Mir CI Bot (mir-ci-bot) wrote : Posted in a previous version of this proposal | # |
Alan Griffiths (alan-griffiths) wrote : Posted in a previous version of this proposal | # |
Rats!!
tools/update_
Mir CI Bot (mir-ci-bot) wrote : Posted in a previous version of this proposal | # |
PASSED: Continuous integration, rev:4258
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Gerry Boland (gerboland) wrote : Posted in a previous version of this proposal | # |
Package: mir-demos
Architecture: linux-any
+Breaks: miral-examples
+Replaces: miral-examples
This needs a "Provides" entry too, no?
Alan Griffiths (alan-griffiths) wrote : Posted in a previous version of this proposal | # |
> Package: mir-demos
> Architecture: linux-any
> +Breaks: miral-examples
> +Replaces: miral-examples
> This needs a "Provides" entry too, no?
Really? What would "Depends" on mir-demos?
Alan Griffiths (alan-griffiths) wrote : Posted in a previous version of this proposal | # |
> > Package: mir-demos
> > Architecture: linux-any
> > +Breaks: miral-examples
> > +Replaces: miral-examples
> > This needs a "Provides" entry too, no?
>
> Really? What would "Depends" on mir-demos?
I mean miral-examples
Mir CI Bot (mir-ci-bot) wrote : Posted in a previous version of this proposal | # |
FAILED: Continuous integration, rev:4260
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:4262
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
ABORTED: https:/
ABORTED: https:/
ABORTED: https:/
ABORTED: https:/
ABORTED: https:/
FAILURE: https:/
ABORTED: https:/
ABORTED: https:/
Click here to trigger a rebuild:
https:/
MichaĆ Sawicz (saviq) wrote : | # |
Looks fine by me, would be good to test if the upgrade path works, when you have it in a silo.
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:4264
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:4264
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
Alan Griffiths (alan-griffiths) wrote : | # |
> Looks fine by me, would be good to test if the upgrade path works, when you
> have it in a silo.
Who needs a silo when Mir has a PPA tracking trunk. ;)
http://
Alan Griffiths (alan-griffiths) wrote : | # |
*Don't land this yet!!*
Dimitri has suggested an ideal that may make this even better.
Alan Griffiths (alan-griffiths) wrote : | # |
I still need to figure out the incantations to specify that libmiral2 is Version ${MIRAL_
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:4265
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:4266
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Chris Halse Rogers (raof) wrote : | # |
So, to do the funky versioning, you'd want to add something like:
CALCULATED_
override_
dh_gencontrol
dh_gencontrol -- -plibmiral2 -v$(CALCULATED_
# And, possibly...
dh_gencontrol -- -plibmiral-dev -v$(CALCULATED_
dh_gencontrol -- -plibmirclientc
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:4267
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:4268
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Chris Halse Rogers (raof) wrote : | # |
Aha! I see you fixed the packaging suffix that I was going to needs-fixing on.
Do you need to have a versioned Provides: for libmiral-dev?
Alan Griffiths (alan-griffiths) : | # |
Mir CI Bot (mir-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:4270
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:4271
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Alan Griffiths (alan-griffiths) wrote : | # |
> Do you need to have a versioned Provides: for libmiral-dev?
Yes, overlooked that.
Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:4272
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Chris Halse Rogers (raof) wrote : | # |
Now that we've worked out the incantations for versioning, I'd weakly prefer that libmiral-dev still exist as a real package, rather than be folded into libmirserver-dev. It makes it easier to tell if something is depending on stable interfaces or not.
Alan Griffiths (alan-griffiths) wrote : | # |
> Now that we've worked out the incantations for versioning, I'd weakly prefer
> that libmiral-dev still exist as a real package, rather than be folded into
> libmirserver-dev. It makes it easier to tell if something is depending on
> stable interfaces or not.
That makes sense. If I still agree after lunch I'll change it.
Mir CI Bot (mir-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:4275
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Preview Diff
1 | === modified file '.bzrignore' |
2 | --- .bzrignore 2017-05-08 03:04:26 +0000 |
3 | +++ .bzrignore 2017-09-08 14:22:15 +0000 |
4 | @@ -2,4 +2,6 @@ |
5 | .project |
6 | include/server/mir/version.h |
7 | include/client/mir_toolkit/version.h |
8 | +include/miral/version.h |
9 | build-* |
10 | +cmake-* |
11 | |
12 | === modified file 'debian/changelog' |
13 | --- debian/changelog 2017-08-29 08:56:16 +0000 |
14 | +++ debian/changelog 2017-09-08 14:22:15 +0000 |
15 | @@ -1,4 +1,4 @@ |
16 | -mir (1:1.0.0-0ubuntu1) UNRELEASED; urgency=medium |
17 | +mir (1.0.0-0ubuntu1) UNRELEASED; urgency=medium |
18 | |
19 | * New upstream release 1.0.0(https://launchpad.net/mir/+milestone/1.0.0) |
20 | - ABI summary: |
21 | |
22 | === modified file 'debian/libmiral2.symbols' |
23 | --- debian/libmiral2.symbols 2017-08-22 15:14:34 +0000 |
24 | +++ debian/libmiral2.symbols 2017-09-08 14:22:15 +0000 |
25 | @@ -355,45 +355,45 @@ |
26 | (c++)"vtable for miral::ActiveOutputsListener@MIRAL_1.0" 1.0.0 |
27 | (c++)"vtable for miral::WindowManagementPolicy@MIRAL_1.0" 1.0.0 |
28 | (c++)"vtable for miral::CanonicalWindowManagerPolicy@MIRAL_1.0" 1.0.0 |
29 | - MIRAL_1.1@MIRAL_1.1 1.0.0 |
30 | - (c++)"miral::WindowInfo::needs_titlebar(MirWindowType)@MIRAL_1.1" 1.0.0 |
31 | - (c++)"miral::WindowInfo::type(MirWindowType)@MIRAL_1.1" 1.0.0 |
32 | - (c++)"miral::WindowInfo::state(MirWindowState)@MIRAL_1.1" 1.0.0 |
33 | - (c++)"miral::WindowManagementPolicy::advise_state_change(miral::WindowInfo const&, MirWindowState)@MIRAL_1.1" 1.0.0 |
34 | - (c++)"miral::WindowInfo::can_morph_to(MirWindowType) const@MIRAL_1.1" 1.0.0 |
35 | - (c++)"miral::CanonicalWindowManagerPolicy::place_new_window(miral::ApplicationInfo const&, miral::WindowSpecification const&)@MIRAL_1.1" 1.0.0 |
36 | - MIRAL_1.2@MIRAL_1.2 1.0.0 |
37 | - (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 |
38 | - (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 |
39 | - (c++)"miral::WindowInfo::shell_chrome(MirShellChrome)@MIRAL_1.2" 1.0.0 |
40 | - (c++)"miral::WindowInfo::shell_chrome() const@MIRAL_1.2" 1.0.0 |
41 | - (c++)"miral::WindowManagerTools::drag_window(miral::Window const&, mir::geometry::Displacement)@MIRAL_1.2" 1.0.0 |
42 | - (c++)"typeinfo for miral::ApplicationAuthorizer@MIRAL_1.0" 1.0.0 |
43 | - (c++)"typeinfo for miral::ApplicationAuthorizer1@MIRAL_1.2" 1.0.0 |
44 | - MIRAL_1.3@MIRAL_1.3 1.0.0 |
45 | - (c++)"miral::operator<(miral::Window const&, miral::Window const&)@MIRAL_1.0" 1.0.0 |
46 | - (c++)"miral::WindowManagerTools::create_workspace()@MIRAL_1.3" 1.0.0 |
47 | - (c++)"miral::WindowManagerTools::add_tree_to_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.0.0 |
48 | - (c++)"miral::WindowManagerTools::focus_prev_within_application()@MIRAL_1.3" 1.0.0 |
49 | - (c++)"miral::WindowManagerTools::remove_tree_from_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.0.0 |
50 | - (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 |
51 | - (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 |
52 | - (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 |
53 | - (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 |
54 | - (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 |
55 | - (c++)"typeinfo for miral::WorkspacePolicy@MIRAL_1.3" 1.0.0 |
56 | - (c++)"vtable for miral::WorkspacePolicy@MIRAL_1.3" 1.0.0 |
57 | - MIRAL_1.3.1@MIRAL_1.3.1 1.0.0 |
58 | - (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 |
59 | - (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 |
60 | - (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.0.0 |
61 | - (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.0.0 |
62 | - (c++)"miral::SetWindowManagementPolicy::operator()(mir::Server&) const@MIRAL_1.3.1" 1.0.0 |
63 | - MIRAL_1.4.0@MIRAL_1.4.0 1.0.0 |
64 | - (c++)"miral::WindowManagerTools::end_drag_and_drop()@MIRAL_1.4.0" 1.0.0 |
65 | - (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 |
66 | - (c++)"typeinfo for miral::WindowManagementPolicyAddendum2@MIRAL_1.4.0" 1.0.0 |
67 | - MIRAL_1.5.0@MIRAL_1.5.0 1.0.0 |
68 | - (c++)"miral::pre_init(miral::CommandLineOption const&)@MIRAL_1.5.0" 1.0.0 |
69 | - (c++)"typeinfo for miral::WindowManagementPolicyAddendum3@MIRAL_1.5.0" 1.0.0 |
70 | - (c++)"miral::WindowManagerTools::active_output()@MIRAL_1.5.0" 1.0.0 |
71 | \ No newline at end of file |
72 | + MIRAL_1.1@MIRAL_1.1 1.1.0 |
73 | + (c++)"miral::WindowInfo::needs_titlebar(MirWindowType)@MIRAL_1.1" 1.1.0 |
74 | + (c++)"miral::WindowInfo::type(MirWindowType)@MIRAL_1.1" 1.1.0 |
75 | + (c++)"miral::WindowInfo::state(MirWindowState)@MIRAL_1.1" 1.1.0 |
76 | + (c++)"miral::WindowManagementPolicy::advise_state_change(miral::WindowInfo const&, MirWindowState)@MIRAL_1.1" 1.1.0 |
77 | + (c++)"miral::WindowInfo::can_morph_to(MirWindowType) const@MIRAL_1.1" 1.1.0 |
78 | + (c++)"miral::CanonicalWindowManagerPolicy::place_new_window(miral::ApplicationInfo const&, miral::WindowSpecification const&)@MIRAL_1.1" 1.1.0 |
79 | + MIRAL_1.2@MIRAL_1.2 1.2.0 |
80 | + (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 |
81 | + (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 |
82 | + (c++)"miral::WindowInfo::shell_chrome(MirShellChrome)@MIRAL_1.2" 1.2.0 |
83 | + (c++)"miral::WindowInfo::shell_chrome() const@MIRAL_1.2" 1.2.0 |
84 | + (c++)"miral::WindowManagerTools::drag_window(miral::Window const&, mir::geometry::Displacement)@MIRAL_1.2" 1.2.0 |
85 | + (c++)"typeinfo for miral::ApplicationAuthorizer@MIRAL_1.0" 1.2.0 |
86 | + (c++)"typeinfo for miral::ApplicationAuthorizer1@MIRAL_1.2" 1.2.0 |
87 | + MIRAL_1.3@MIRAL_1.3 1.3.0 |
88 | + (c++)"miral::operator<(miral::Window const&, miral::Window const&)@MIRAL_1.0" 1.3.0 |
89 | + (c++)"miral::WindowManagerTools::create_workspace()@MIRAL_1.3" 1.3.0 |
90 | + (c++)"miral::WindowManagerTools::add_tree_to_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.3.0 |
91 | + (c++)"miral::WindowManagerTools::focus_prev_within_application()@MIRAL_1.3" 1.3.0 |
92 | + (c++)"miral::WindowManagerTools::remove_tree_from_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.3.0 |
93 | + (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 |
94 | + (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 |
95 | + (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 |
96 | + (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 |
97 | + (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 |
98 | + (c++)"typeinfo for miral::WorkspacePolicy@MIRAL_1.3" 1.3.0 |
99 | + (c++)"vtable for miral::WorkspacePolicy@MIRAL_1.3" 1.3.0 |
100 | + MIRAL_1.3.1@MIRAL_1.3.1 1.3.1 |
101 | + (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 |
102 | + (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 |
103 | + (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.3.1 |
104 | + (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.3.1 |
105 | + (c++)"miral::SetWindowManagementPolicy::operator()(mir::Server&) const@MIRAL_1.3.1" 1.3.1 |
106 | + MIRAL_1.4.0@MIRAL_1.4.0 1.4.0 |
107 | + (c++)"miral::WindowManagerTools::end_drag_and_drop()@MIRAL_1.4.0" 1.4.0 |
108 | + (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 |
109 | + (c++)"typeinfo for miral::WindowManagementPolicyAddendum2@MIRAL_1.4.0" 1.4.0 |
110 | + MIRAL_1.5.0@MIRAL_1.5.0 1.5.0 |
111 | + (c++)"miral::pre_init(miral::CommandLineOption const&)@MIRAL_1.5.0" 1.5.0 |
112 | + (c++)"typeinfo for miral::WindowManagementPolicyAddendum3@MIRAL_1.5.0" 1.5.0 |
113 | + (c++)"miral::WindowManagerTools::active_output()@MIRAL_1.5.0" 1.5.0 |
114 | \ No newline at end of file |
115 | |
116 | === modified file 'debian/libmirclient-dev.install' |
117 | --- debian/libmirclient-dev.install 2017-05-17 04:48:46 +0000 |
118 | +++ debian/libmirclient-dev.install 2017-09-08 14:22:15 +0000 |
119 | @@ -1,8 +1,10 @@ |
120 | usr/include/mirclient/mir_toolkit/*.h |
121 | usr/include/mirclient/mir_toolkit/extensions/*.h |
122 | +usr/include/mirclient/mir/client/*.h |
123 | usr/include/mirclient/mir/events/*.h |
124 | usr/include/mirclient/mir/event_printer.h |
125 | usr/include/mirclient/mir_toolkit/events |
126 | usr/include/mirclient/mir_toolkit/rs/mir_render_surface.h |
127 | usr/lib/*/pkgconfig/mirclient.pc |
128 | +usr/lib/*/pkgconfig/mirclientcpp.pc |
129 | usr/lib/*/libmirclient.so |
130 | |
131 | === removed file 'debian/libmirclientcpp-dev.install' |
132 | --- debian/libmirclientcpp-dev.install 2017-08-21 14:18:55 +0000 |
133 | +++ debian/libmirclientcpp-dev.install 1970-01-01 00:00:00 +0000 |
134 | @@ -1,2 +0,0 @@ |
135 | -usr/include/miral/mir/*/* |
136 | -usr/lib/*/pkgconfig/mirclientcpp.pc |
137 | |
138 | === modified file 'debian/mir-demos.install' |
139 | --- debian/mir-demos.install 2017-08-31 11:29:14 +0000 |
140 | +++ debian/mir-demos.install 2017-09-08 14:22:15 +0000 |
141 | @@ -1,2 +1,11 @@ |
142 | usr/bin/mir_demo_* |
143 | usr/lib/*/libmir_demo_* |
144 | +usr/bin/miral-shell |
145 | +usr/bin/miral-run |
146 | +usr/bin/miral-kiosk |
147 | +usr/bin/miral-xrun |
148 | +usr/bin/miral-screencast |
149 | +usr/bin/miral-desktop |
150 | +usr/bin/miral-app |
151 | +usr/share/applications/miral-shell.desktop |
152 | +usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg |
153 | |
154 | === removed file 'debian/miral-examples.install' |
155 | --- debian/miral-examples.install 2017-08-21 15:58:34 +0000 |
156 | +++ debian/miral-examples.install 1970-01-01 00:00:00 +0000 |
157 | @@ -1,9 +0,0 @@ |
158 | -usr/bin/miral-shell |
159 | -usr/bin/miral-run |
160 | -usr/bin/miral-kiosk |
161 | -usr/bin/miral-xrun |
162 | -usr/bin/miral-screencast |
163 | -usr/bin/miral-desktop |
164 | -usr/bin/miral-app |
165 | -usr/share/applications/miral-shell.desktop |
166 | -usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg |
167 | |
168 | === modified file 'debian/rules' |
169 | --- debian/rules 2017-06-02 08:19:00 +0000 |
170 | +++ debian/rules 2017-09-08 14:22:15 +0000 |
171 | @@ -1,10 +1,6 @@ |
172 | #!/usr/bin/make -f |
173 | |
174 | -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) |
175 | -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) |
176 | -DEB_HOST_ARCH_ENDIAN ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_ENDIAN) |
177 | -EXACT_PACKAGE_VERSION = $(shell dpkg-parsechangelog | grep Version | cut -d' ' -f 2) |
178 | -DISTRIB_CODENAME = $(shell grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2) |
179 | +include /usr/share/dpkg/default.mk |
180 | |
181 | export DPKG_GENSYMBOLS_CHECK_LEVEL = 4 |
182 | |
183 | @@ -57,16 +53,25 @@ |
184 | override_dh_auto_build-indep: |
185 | dh_auto_build -- doc |
186 | |
187 | +# Reconstruct the MirAL version |
188 | +MIRAL_VERSION_MAJOR = $(shell perl -n -e '/^set\(MIRAL_VERSION_MAJOR ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt) |
189 | +MIRAL_VERSION_MINOR = $(shell perl -n -e '/^set\(MIRAL_VERSION_MINOR ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt) |
190 | +MIRAL_VERSION_PATCH = $(shell perl -n -e '/^set\(MIRAL_VERSION_PATCH ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt) |
191 | +MIRAL_RELEASE=$(MIRAL_VERSION_MAJOR).$(MIRAL_VERSION_MINOR).$(MIRAL_VERSION_PATCH) |
192 | +MIRAL_VERSION=$(MIRAL_RELEASE).$(DEB_VERSION) |
193 | + |
194 | # TODO: we'll use a symbol file once mir is abi stable |
195 | override_dh_makeshlibs: |
196 | - dh_makeshlibs -V -Nmir-test-tools |
197 | + dh_makeshlibs -Nlibmiral2 -V -Nmir-test-tools |
198 | + # libmiral2 *has* a symbols file, so we don't need to -V it! |
199 | + dh_makeshlibs -plibmiral2 -- -v$(MIRAL_RELEASE) |
200 | |
201 | override_dh_install: |
202 | # Nothing outside Mir should link to libmirprotobuf directly. |
203 | # Delete the symlink so that --fail-missing doesn't think we've missed it |
204 | # accidentally. |
205 | -rm debian/tmp/usr/lib/*/libmirprotobuf.so |
206 | -ifeq ($(filter xenial yakkety zesty,$(DISTRIB_CODENAME)),) |
207 | +ifeq ($(filter xenial yakkety zesty,$(DEB_DISTRIBUTION)),) |
208 | dh_install |
209 | else |
210 | # xenial, yakkety & zesty predate dh_missing |
211 | @@ -80,3 +85,7 @@ |
212 | # Don't try to find dependencies of libraries used as test data |
213 | override_dh_shlibdeps: |
214 | dh_shlibdeps -Xmir-test-data |
215 | + |
216 | +override_dh_gencontrol: |
217 | + dh_gencontrol -Nlibmiral2 -Nlibmiral-dev -- -V'libmiral2:Version=$(MIRAL_VERSION)' |
218 | + dh_gencontrol -plibmiral2 -plibmiral-dev -- -v$(MIRAL_VERSION) |
219 | |
220 | === modified file 'doc/mainpage.md' |
221 | --- doc/mainpage.md 2017-09-07 09:53:20 +0000 |
222 | +++ doc/mainpage.md 2017-09-08 14:22:15 +0000 |
223 | @@ -28,7 +28,7 @@ |
224 | |
225 | Install the headers and libraries for using libmiral in development: |
226 | |
227 | - $ sudo apt install libmirserver-dev |
228 | + $ sudo apt install libmiral-dev |
229 | |
230 | A `miral.pc` file is provided for use with `pkg-config` or other tools. For |
231 | example: |
232 | |
233 | === renamed directory 'include/miral/mir/client' => 'include/client/mir/client' |
234 | === modified file 'src/CMakeLists.txt' |
235 | --- src/CMakeLists.txt 2017-09-07 05:58:13 +0000 |
236 | +++ src/CMakeLists.txt 2017-09-08 14:22:15 +0000 |
237 | @@ -1,6 +1,11 @@ |
238 | # We need MIRPLATFORM_ABI in both libmirplatform and the platform implementations. |
239 | set(MIRPLATFORM_ABI 16) |
240 | |
241 | +set(MIRAL_VERSION_MAJOR 1) |
242 | +set(MIRAL_VERSION_MINOR 5) |
243 | +set(MIRAL_VERSION_PATCH 0) |
244 | +set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH}) |
245 | + |
246 | # Add the cookie implementation before exposing any APIs |
247 | add_subdirectory(cookie/) |
248 | |
249 | |
250 | === modified file 'src/client/CMakeLists.txt' |
251 | --- src/client/CMakeLists.txt 2017-05-17 04:48:46 +0000 |
252 | +++ src/client/CMakeLists.txt 2017-09-08 14:22:15 +0000 |
253 | @@ -11,6 +11,11 @@ |
254 | @ONLY |
255 | ) |
256 | |
257 | +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mirclientcpp.pc.in |
258 | + ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc |
259 | + @ONLY |
260 | +) |
261 | + |
262 | configure_file( |
263 | ${CMAKE_CURRENT_SOURCE_DIR}/mirclient-debug-extension.pc.in |
264 | ${CMAKE_CURRENT_BINARY_DIR}/mirclient-debug-extension.pc |
265 | @@ -106,6 +111,13 @@ |
266 | mir_extension_core.cpp |
267 | ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_extension_core.h |
268 | ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/extensions/drag_and_drop.h |
269 | + ${CMAKE_SOURCE_DIR}/include/client/mir/client/blob.h |
270 | + ${CMAKE_SOURCE_DIR}/include/client/mir/client/cookie.h |
271 | + ${CMAKE_SOURCE_DIR}/include/client/mir/client/window_spec.h |
272 | + ${CMAKE_SOURCE_DIR}/include/client/mir/client/window_id.h |
273 | + ${CMAKE_SOURCE_DIR}/include/client/mir/client/connection.h |
274 | + ${CMAKE_SOURCE_DIR}/include/client/mir/client/display_config.h |
275 | + ${CMAKE_SOURCE_DIR}/include/client/mir/client/window.h |
276 | ) |
277 | |
278 | # Ensure protobuf C++ headers have been produced before |
279 | @@ -153,6 +165,7 @@ |
280 | |
281 | install( |
282 | FILES ${CMAKE_CURRENT_BINARY_DIR}/mirclient.pc |
283 | + ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc |
284 | DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig |
285 | ) |
286 | |
287 | |
288 | === renamed file 'src/miral/mirclientcpp.pc.in' => 'src/client/mirclientcpp.pc.in' |
289 | --- src/miral/mirclientcpp.pc.in 2017-08-29 09:17:03 +0000 |
290 | +++ src/client/mirclientcpp.pc.in 2017-09-08 14:22:15 +0000 |
291 | @@ -1,7 +1,7 @@ |
292 | -includedir=@INCLUDEDIR@/miral |
293 | +includedir=@INCLUDEDIR@/mirclient |
294 | |
295 | Name: mirclientcpp |
296 | -Description: Mir Abstraction Layer C++ wrapper for mirclient |
297 | +Description: C++ wrapper for mirclient |
298 | Version: @MIRAL_VERSION@ |
299 | Requires: mirclient |
300 | Cflags: -I${includedir} |
301 | |
302 | === modified file 'src/miral/CMakeLists.txt' |
303 | --- src/miral/CMakeLists.txt 2017-08-30 16:24:09 +0000 |
304 | +++ src/miral/CMakeLists.txt 2017-09-08 14:22:15 +0000 |
305 | @@ -1,8 +1,3 @@ |
306 | -set(MIRAL_VERSION_MAJOR 1) |
307 | -set(MIRAL_VERSION_MINOR 5) |
308 | -set(MIRAL_VERSION_PATCH 0) |
309 | -set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH}) |
310 | - |
311 | if(${CMAKE_COMPILER_IS_GNUCXX}) |
312 | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto") |
313 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto") |
314 | @@ -66,13 +61,6 @@ |
315 | window_manager_tools.cpp ${miral_include}/miral/window_manager_tools.h |
316 | ${miral_include}/miral/window_management_policy_addendum2.h |
317 | ${miral_include}/miral/window_management_policy_addendum3.h |
318 | - ${miral_include}/mir/client/blob.h |
319 | - ${miral_include}/mir/client/cookie.h |
320 | - ${miral_include}/mir/client/window_spec.h |
321 | - ${miral_include}/mir/client/window_id.h |
322 | - ${miral_include}/mir/client/connection.h |
323 | - ${miral_include}/mir/client/display_config.h |
324 | - ${miral_include}/mir/client/window.h |
325 | ) |
326 | |
327 | target_include_directories(mirclientcpp |
328 | @@ -110,7 +98,7 @@ |
329 | add_custom_target(check-miral-symbols ALL |
330 | DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols |
331 | COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols |
332 | - COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmiral.so.${MIRAL_ABI} -plibmiral${MIRAL_ABI} -O${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols |
333 | + 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 |
334 | WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" |
335 | VERBATIM |
336 | ) |
337 | @@ -124,11 +112,6 @@ |
338 | @ONLY |
339 | ) |
340 | |
341 | -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mirclientcpp.pc.in |
342 | - ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc |
343 | - @ONLY |
344 | -) |
345 | - |
346 | configure_file( |
347 | ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in |
348 | ${miral_include}/miral/version.h |
349 | @@ -140,7 +123,6 @@ |
350 | DEPENDS doc) |
351 | endif() |
352 | |
353 | -install(TARGETS miral LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}") |
354 | -install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/miral DESTINATION "${INCLUDEDIR}") |
355 | -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miral.pc |
356 | - ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") |
357 | +install(TARGETS miral LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}") |
358 | +install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/miral DESTINATION "${INCLUDEDIR}") |
359 | +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miral.pc DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig") |
FAILED: Continuous integration, rev:4257 /mir-jenkins. ubuntu. com/job/ mir-ci/ 3600/ /mir-jenkins. ubuntu. com/job/ build-mir/ 4924/console /mir-jenkins. ubuntu. com/job/ build-0- fetch/5149 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= artful/ 5139 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial/ 5139 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= zesty/5139 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= artful/ 4963/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= zesty/4963/ console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= artful/ 4963/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial/ 4963/console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= zesty/4963/ console /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= mesa,release= artful/ 4963 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= mesa,release= artful/ 4963/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= mesa,release= zesty/4963 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= mesa,release= zesty/4963/ artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial/ 4963/console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 3600/rebuild
https:/