Merge into development-branch : move-miral-to-mir-no-more-miral-packages : Code : Mir

Status:	Merged
Approved by:	Alan Griffiths on 2017-09-09
Approved revision:	4248
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
Chris Halse Rogers		2017-09-08	Pending
Alan Griffiths			Pending
Review via email: mp+330433@code.launchpad.net

Mir CI Bot (mir-ci-bot) wrote on 2017-08-29: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3600/rebuild

review: Needs Fixing (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2017-08-29: Posted in a previous version of this proposal

#

Rats!!

tools/update_package_abis.sh doesn't allow debian/libmirserver45.install to contain libmiral.so.2

Mir CI Bot (mir-ci-bot) wrote on 2017-08-29: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3601/rebuild

review: Approve (continuous-integration)

Gerry Boland (gerboland) wrote on 2017-08-30: 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 on 2017-08-30: 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 on 2017-08-30: 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 on 2017-08-31: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3620/rebuild

review: Needs Fixing (continuous-integration)

Mir CI Bot (mir-ci-bot) wrote on 2017-08-31: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3621/rebuild

review: Needs Fixing (continuous-integration)

Michał Sawicz (saviq) wrote on 2017-08-31: Posted in a previous version of this proposal

#

Looks fine by me, would be good to test if the upgrade path works, when you have it in a silo.

review: Approve

Mir CI Bot (mir-ci-bot) wrote on 2017-08-31: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3622/rebuild

review: Needs Fixing (continuous-integration)

Mir CI Bot (mir-ci-bot) wrote on 2017-08-31: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:4264
https://mir-jenkins.ubuntu.com/job/mir-ci/3624/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4952/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5177
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5167
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5167
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5167

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3624/rebuild

review: Needs Fixing (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2017-08-31: Posted in a previous version of this proposal

#

> 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://voices.canonical.com/alan.griffiths/2017/08/07/mir-related-ppas/

Alan Griffiths (alan-griffiths) wrote on 2017-08-31: Posted in a previous version of this proposal

#

*Don't land this yet!!*

Dimitri has suggested an ideal that may make this even better.

review: Needs Information

Alan Griffiths (alan-griffiths) wrote on 2017-08-31: Posted in a previous version of this proposal

#

I still need to figure out the incantations to specify that libmiral2 is Version ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}

review: Needs Fixing

Mir CI Bot (mir-ci-bot) wrote on 2017-08-31: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3626/rebuild

review: Needs Fixing (continuous-integration)

Mir CI Bot (mir-ci-bot) wrote on 2017-08-31: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3627/rebuild

review: Approve (continuous-integration)

Chris Halse Rogers (raof) wrote on 2017-09-01: Posted in a previous version of this proposal

#

So, to do the funky versioning, you'd want to add something like:

CALCULATED_MIRAL_VERSION = $(...thing that grabs the miral version from the source...)

override_dh_gencontrol:
    dh_gencontrol
    dh_gencontrol -- -plibmiral2 -v$(CALCULATED_MIRAL_VERSION)
# And, possibly...
    dh_gencontrol -- -plibmiral-dev -v$(CALCULATED_MILAL_VERSION)
    dh_gencontrol -- -plibmirclientcpp-dev -v$(CALCULATED_MIRAL_VERSION)

Mir CI Bot (mir-ci-bot) wrote on 2017-09-05: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3630/rebuild

review: Needs Fixing (continuous-integration)

Mir CI Bot (mir-ci-bot) wrote on 2017-09-06: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3634/rebuild

review: Needs Fixing (continuous-integration)

Chris Halse Rogers (raof) wrote on 2017-09-06: Posted in a previous version of this proposal

#

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?

review: Approve

Alan Griffiths (alan-griffiths) on 2017-09-07: Posted in a previous version of this proposal

#

review: Abstain

Mir CI Bot (mir-ci-bot) wrote on 2017-09-07: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3641/rebuild

review: Needs Fixing (continuous-integration)

Mir CI Bot (mir-ci-bot) wrote on 2017-09-07: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3644/rebuild

review: Approve (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2017-09-08: Posted in a previous version of this proposal

#

> Do you need to have a versioned Provides: for libmiral-dev?

Yes, overlooked that.

Mir CI Bot (mir-ci-bot) wrote on 2017-09-08: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3645/rebuild

review: Approve (continuous-integration)

Chris Halse Rogers (raof) wrote on 2017-09-08: Posted in a previous version of this proposal

#

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 on 2017-09-08: Posted in a previous version of this proposal

#

> 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 on 2017-09-08: Posted in a previous version of this proposal

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3647/rebuild

review: Approve (continuous-integration)

Mir CI Bot (mir-ci-bot) wrote on 2017-09-08:

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3649/rebuild

review: Approve (continuous-integration)

Michał Sawicz (saviq) wrote on 2017-09-08:

#

Let's get it in!

review: Approve

Mir CI Bot (mir-ci-bot) wrote on 2017-09-08:

#

review: Needs Fixing (continuous-integration)

Mir CI Bot (mir-ci-bot) wrote on 2017-09-08:

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3651/rebuild

review: Needs Fixing (continuous-integration)

Alan Griffiths (alan-griffiths) wrote on 2017-09-09:

#

TAing as I'd like to test this on the staging PPA

Mir CI Bot (mir-ci-bot) on 2017-09-09:

#

review: Approve (continuous-integration)

Mir

Merge lp:~alan-griffiths/mir/move-miral-to-mir-no-more-miral-packages into lp:mir

Commit Message

Description of the Change

Preview Diff

Subscribers

 === modified file '.bzrignore'
 --- .bzrignore	2017-05-08 03:04:26 +0000
 +++ .bzrignore	2017-09-08 19:22:40 +0000
@@ -2,4 +2,6 @@
  .project
  include/server/mir/version.h
  include/client/mir_toolkit/version.h
++include/miral/version.h
  build-*
++cmake-*
 === modified file 'debian/changelog'
 --- debian/changelog	2017-08-29 08:56:16 +0000
 +++ debian/changelog	2017-09-08 19:22:40 +0000
@@ -1,4 +1,4 @@
--mir (1:1.0.0-0ubuntu1) UNRELEASED; urgency=medium
++mir (1.0.0-0ubuntu1) UNRELEASED; urgency=medium
    * New upstream release 1.0.0(https://launchpad.net/mir/+milestone/1.0.0)
      - ABI summary:
 === modified file 'debian/control'
 --- debian/control	2017-09-07 05:58:13 +0000
 +++ debian/control	2017-09-08 19:22:40 +0000
@@ -197,6 +197,9 @@
  Architecture: linux-any
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
++Breaks: libmirclientcpp-dev
++Replaces: libmirclientcpp-dev
++Provides: libmirclientcpp-dev (=1.5)
  Depends: libmirclient9 (= ${binary:Version}),
           libmircommon-dev (= ${binary:Version}),
           libmircookie-dev (= ${binary:Version}),
@@ -256,9 +259,13 @@
  Package: mir-demos
  Architecture: linux-any
++Breaks: miral-examples
++Replaces: miral-examples
++Provides: miral-examples (=1.5)
  Depends: ${misc:Depends},
           ${shlibs:Depends},
--Recommends: fonts-liberation
++Recommends: dmz-cursor-theme,
++            fonts-liberation
  Description: Display server for Ubuntu - demonstration programs
   Mir is a display server running on linux systems, with a focus on efficiency,
   robust operation and a well-defined driver model.
@@ -498,7 +505,7 @@
  Architecture: linux-any
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
--Depends: libmiral2 (= ${binary:Version}),
++Depends: libmiral2 (= ${libmiral2:Version}),
           libmirclientcpp-dev (= ${binary:Version}),
           ${misc:Depends},
  Description: Developer files for the Mir ABI-stable abstraction layer
@@ -507,25 +514,3 @@
+  .
   Contains header files required for development using the MirAL abstraction
   layer.
--
--Package: libmirclientcpp-dev
--Section: libdevel
--Architecture: linux-any
--Multi-Arch: same
--Pre-Depends: ${misc:Pre-Depends}
--Depends: libmirclient-dev,
--Description: A C++ wrapper for libmirclient-dev
-- Provides RAII (and other facilities) for Mir client library types.
-- .
-- Contains header files useful for C++ development against Mir.
--
--Package: miral-examples
--Architecture: linux-any
--Depends: ${misc:Depends},
--         ${shlibs:Depends},
--Recommends: dmz-cursor-theme,
--Description: Display server for Ubuntu - demonstration programs
-- MirAL provides an ABI-stable abstraction layer for Mir based shells,
-- insulating them from mirserver ABI breaks.
-- .
-- Contains demo applications that use the MirAL abstraction layer
 === modified file 'debian/libmiral2.symbols'
 --- debian/libmiral2.symbols	2017-08-22 15:14:34 +0000
 +++ debian/libmiral2.symbols	2017-09-08 19:22:40 +0000
@@ -355,45 +355,45 @@
   (c++)"vtable for miral::ActiveOutputsListener@MIRAL_1.0" 1.0.0
   (c++)"vtable for miral::WindowManagementPolicy@MIRAL_1.0" 1.0.0
   (c++)"vtable for miral::CanonicalWindowManagerPolicy@MIRAL_1.0" 1.0.0
-- MIRAL_1.1@MIRAL_1.1 1.0.0
-- (c++)"miral::WindowInfo::needs_titlebar(MirWindowType)@MIRAL_1.1" 1.0.0
-- (c++)"miral::WindowInfo::type(MirWindowType)@MIRAL_1.1" 1.0.0
-- (c++)"miral::WindowInfo::state(MirWindowState)@MIRAL_1.1" 1.0.0
-- (c++)"miral::WindowManagementPolicy::advise_state_change(miral::WindowInfo const&, MirWindowState)@MIRAL_1.1" 1.0.0
-- (c++)"miral::WindowInfo::can_morph_to(MirWindowType) const@MIRAL_1.1" 1.0.0
-- (c++)"miral::CanonicalWindowManagerPolicy::place_new_window(miral::ApplicationInfo const&, miral::WindowSpecification const&)@MIRAL_1.1" 1.0.0
-- MIRAL_1.2@MIRAL_1.2 1.0.0
-- (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
-- (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
-- (c++)"miral::WindowInfo::shell_chrome(MirShellChrome)@MIRAL_1.2" 1.0.0
-- (c++)"miral::WindowInfo::shell_chrome() const@MIRAL_1.2" 1.0.0
-- (c++)"miral::WindowManagerTools::drag_window(miral::Window const&, mir::geometry::Displacement)@MIRAL_1.2" 1.0.0
-- (c++)"typeinfo for miral::ApplicationAuthorizer@MIRAL_1.0" 1.0.0
-- (c++)"typeinfo for miral::ApplicationAuthorizer1@MIRAL_1.2" 1.0.0
-- MIRAL_1.3@MIRAL_1.3 1.0.0
-- (c++)"miral::operator<(miral::Window const&, miral::Window const&)@MIRAL_1.0" 1.0.0
-- (c++)"miral::WindowManagerTools::create_workspace()@MIRAL_1.3" 1.0.0
-- (c++)"miral::WindowManagerTools::add_tree_to_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.0.0
-- (c++)"miral::WindowManagerTools::focus_prev_within_application()@MIRAL_1.3" 1.0.0
-- (c++)"miral::WindowManagerTools::remove_tree_from_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.0.0
-- (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
-- (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
-- (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
-- (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
-- (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
-- (c++)"typeinfo for miral::WorkspacePolicy@MIRAL_1.3" 1.0.0
-- (c++)"vtable for miral::WorkspacePolicy@MIRAL_1.3" 1.0.0
-- MIRAL_1.3.1@MIRAL_1.3.1 1.0.0
-- (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
-- (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
-- (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.0.0
-- (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.0.0
-- (c++)"miral::SetWindowManagementPolicy::operator()(mir::Server&) const@MIRAL_1.3.1" 1.0.0
-- MIRAL_1.4.0@MIRAL_1.4.0 1.0.0
-- (c++)"miral::WindowManagerTools::end_drag_and_drop()@MIRAL_1.4.0" 1.0.0
-- (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
-- (c++)"typeinfo for miral::WindowManagementPolicyAddendum2@MIRAL_1.4.0" 1.0.0
-- MIRAL_1.5.0@MIRAL_1.5.0 1.0.0
-- (c++)"miral::pre_init(miral::CommandLineOption const&)@MIRAL_1.5.0" 1.0.0
-- (c++)"typeinfo for miral::WindowManagementPolicyAddendum3@MIRAL_1.5.0" 1.0.0
-- (c++)"miral::WindowManagerTools::active_output()@MIRAL_1.5.0" 1.0.0
 \ No newline at end of file
++ MIRAL_1.1@MIRAL_1.1 1.1.0
++ (c++)"miral::WindowInfo::needs_titlebar(MirWindowType)@MIRAL_1.1" 1.1.0
++ (c++)"miral::WindowInfo::type(MirWindowType)@MIRAL_1.1" 1.1.0
++ (c++)"miral::WindowInfo::state(MirWindowState)@MIRAL_1.1" 1.1.0
++ (c++)"miral::WindowManagementPolicy::advise_state_change(miral::WindowInfo const&, MirWindowState)@MIRAL_1.1" 1.1.0
++ (c++)"miral::WindowInfo::can_morph_to(MirWindowType) const@MIRAL_1.1" 1.1.0
++ (c++)"miral::CanonicalWindowManagerPolicy::place_new_window(miral::ApplicationInfo const&, miral::WindowSpecification const&)@MIRAL_1.1" 1.1.0
++ MIRAL_1.2@MIRAL_1.2 1.2.0
++ (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
++ (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
++ (c++)"miral::WindowInfo::shell_chrome(MirShellChrome)@MIRAL_1.2" 1.2.0
++ (c++)"miral::WindowInfo::shell_chrome() const@MIRAL_1.2" 1.2.0
++ (c++)"miral::WindowManagerTools::drag_window(miral::Window const&, mir::geometry::Displacement)@MIRAL_1.2" 1.2.0
++ (c++)"typeinfo for miral::ApplicationAuthorizer@MIRAL_1.0" 1.2.0
++ (c++)"typeinfo for miral::ApplicationAuthorizer1@MIRAL_1.2" 1.2.0
++ MIRAL_1.3@MIRAL_1.3 1.3.0
++ (c++)"miral::operator<(miral::Window const&, miral::Window const&)@MIRAL_1.0" 1.3.0
++ (c++)"miral::WindowManagerTools::create_workspace()@MIRAL_1.3" 1.3.0
++ (c++)"miral::WindowManagerTools::add_tree_to_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.3.0
++ (c++)"miral::WindowManagerTools::focus_prev_within_application()@MIRAL_1.3" 1.3.0
++ (c++)"miral::WindowManagerTools::remove_tree_from_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.3.0
++ (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
++ (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
++ (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
++ (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
++ (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
++ (c++)"typeinfo for miral::WorkspacePolicy@MIRAL_1.3" 1.3.0
++ (c++)"vtable for miral::WorkspacePolicy@MIRAL_1.3" 1.3.0
++ MIRAL_1.3.1@MIRAL_1.3.1 1.3.1
++ (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
++ (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
++ (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.3.1
++ (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.3.1
++ (c++)"miral::SetWindowManagementPolicy::operator()(mir::Server&) const@MIRAL_1.3.1" 1.3.1
++ MIRAL_1.4.0@MIRAL_1.4.0 1.4.0
++ (c++)"miral::WindowManagerTools::end_drag_and_drop()@MIRAL_1.4.0" 1.4.0
++ (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
++ (c++)"typeinfo for miral::WindowManagementPolicyAddendum2@MIRAL_1.4.0" 1.4.0
++ MIRAL_1.5.0@MIRAL_1.5.0 1.5.0
++ (c++)"miral::pre_init(miral::CommandLineOption const&)@MIRAL_1.5.0" 1.5.0
++ (c++)"typeinfo for miral::WindowManagementPolicyAddendum3@MIRAL_1.5.0" 1.5.0
++ (c++)"miral::WindowManagerTools::active_output()@MIRAL_1.5.0" 1.5.0
 \ No newline at end of file
 === modified file 'debian/libmirclient-dev.install'
 --- debian/libmirclient-dev.install	2017-05-17 04:48:46 +0000
 +++ debian/libmirclient-dev.install	2017-09-08 19:22:40 +0000
@@ -1,8 +1,10 @@
  usr/include/mirclient/mir_toolkit/*.h
  usr/include/mirclient/mir_toolkit/extensions/*.h
++usr/include/mirclient/mir/client/*.h
  usr/include/mirclient/mir/events/*.h
  usr/include/mirclient/mir/event_printer.h
  usr/include/mirclient/mir_toolkit/events
  usr/include/mirclient/mir_toolkit/rs/mir_render_surface.h
  usr/lib/*/pkgconfig/mirclient.pc
++usr/lib/*/pkgconfig/mirclientcpp.pc
  usr/lib/*/libmirclient.so
 === removed file 'debian/libmirclientcpp-dev.install'
 --- debian/libmirclientcpp-dev.install	2017-08-21 14:18:55 +0000
 +++ debian/libmirclientcpp-dev.install	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
--usr/include/miral/mir/*/*
--usr/lib/*/pkgconfig/mirclientcpp.pc
 === modified file 'debian/mir-demos.install'
 --- debian/mir-demos.install	2017-08-31 11:29:14 +0000
 +++ debian/mir-demos.install	2017-09-08 19:22:40 +0000
@@ -1,2 +1,11 @@
  usr/bin/mir_demo_*
  usr/lib/*/libmir_demo_*
++usr/bin/miral-shell
++usr/bin/miral-run
++usr/bin/miral-kiosk
++usr/bin/miral-xrun
++usr/bin/miral-screencast
++usr/bin/miral-desktop
++usr/bin/miral-app
++usr/share/applications/miral-shell.desktop
++usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg
 === removed file 'debian/miral-examples.install'
 --- debian/miral-examples.install	2017-08-21 15:58:34 +0000
 +++ debian/miral-examples.install	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
--usr/bin/miral-shell
--usr/bin/miral-run
--usr/bin/miral-kiosk
--usr/bin/miral-xrun
--usr/bin/miral-screencast
--usr/bin/miral-desktop
--usr/bin/miral-app
--usr/share/applications/miral-shell.desktop
--usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg
 === modified file 'debian/rules'
 --- debian/rules	2017-06-02 08:19:00 +0000
 +++ debian/rules	2017-09-08 19:22:40 +0000
@@ -1,10 +1,6 @@
  #!/usr/bin/make -f
--DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
--DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
--DEB_HOST_ARCH_ENDIAN ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)
--EXACT_PACKAGE_VERSION = $(shell dpkg-parsechangelog | grep Version | cut -d' ' -f 2)
--DISTRIB_CODENAME = $(shell grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2)
++include /usr/share/dpkg/default.mk
  export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
@@ -57,16 +53,25 @@
  override_dh_auto_build-indep:
  	dh_auto_build -- doc
++# Reconstruct the MirAL version
++MIRAL_VERSION_MAJOR = $(shell perl -n -e '/^set\(MIRAL_VERSION_MAJOR ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt)
++MIRAL_VERSION_MINOR = $(shell perl -n -e '/^set\(MIRAL_VERSION_MINOR ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt)
++MIRAL_VERSION_PATCH = $(shell perl -n -e '/^set\(MIRAL_VERSION_PATCH ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt)
++MIRAL_RELEASE=$(MIRAL_VERSION_MAJOR).$(MIRAL_VERSION_MINOR).$(MIRAL_VERSION_PATCH)
++MIRAL_VERSION=$(MIRAL_RELEASE).$(DEB_VERSION)
++
  # TODO: we'll use a symbol file once mir is abi stable
  override_dh_makeshlibs:
--	dh_makeshlibs -V -Nmir-test-tools
++	dh_makeshlibs -Nlibmiral2 -V -Nmir-test-tools
++	# libmiral2 *has* a symbols file, so we don't need to -V it!
++	dh_makeshlibs -plibmiral2 -- -v$(MIRAL_RELEASE)
  override_dh_install:
  # Nothing outside Mir should link to libmirprotobuf directly.
  # Delete the symlink so that --fail-missing doesn't think we've missed it
  # accidentally.
  	-rm debian/tmp/usr/lib/*/libmirprotobuf.so
--ifeq ($(filter xenial yakkety zesty,$(DISTRIB_CODENAME)),)
++ifeq ($(filter xenial yakkety zesty,$(DEB_DISTRIBUTION)),)
  	dh_install
  else
  	# xenial, yakkety & zesty predate dh_missing
@@ -80,3 +85,7 @@
  # Don't try to find dependencies of libraries used as test data
  override_dh_shlibdeps:
  	dh_shlibdeps -Xmir-test-data
++
++override_dh_gencontrol:
++	dh_gencontrol -Nlibmiral2 -Nlibmiral-dev
++	dh_gencontrol -plibmiral2 -plibmiral-dev -- -v$(MIRAL_VERSION) -V'libmiral2:Version=$(MIRAL_VERSION)'
 === modified file 'doc/mainpage.md'
 --- doc/mainpage.md	2017-09-07 09:53:20 +0000
 +++ doc/mainpage.md	2017-09-08 19:22:40 +0000
@@ -28,7 +28,7 @@
  Install the headers and libraries for using libmiral in development:
--    $ sudo apt install libmirserver-dev
++    $ sudo apt install libmiral-dev
  A `miral.pc` file is provided for use with `pkg-config` or other tools. For
  example:
 === renamed directory 'include/miral/mir/client' => 'include/client/mir/client'
 === modified file 'src/CMakeLists.txt'
 --- src/CMakeLists.txt	2017-09-07 05:58:13 +0000
 +++ src/CMakeLists.txt	2017-09-08 19:22:40 +0000
@@ -1,6 +1,11 @@
  # We need MIRPLATFORM_ABI in both libmirplatform and the platform implementations.
  set(MIRPLATFORM_ABI 16)
++set(MIRAL_VERSION_MAJOR 1)
++set(MIRAL_VERSION_MINOR 5)
++set(MIRAL_VERSION_PATCH 0)
++set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH})
++
  # Add the cookie implementation before exposing any APIs
  add_subdirectory(cookie/)
 === modified file 'src/client/CMakeLists.txt'
 --- src/client/CMakeLists.txt	2017-05-17 04:48:46 +0000
 +++ src/client/CMakeLists.txt	2017-09-08 19:22:40 +0000
@@ -11,6 +11,11 @@
    @ONLY
+ )
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mirclientcpp.pc.in
++  ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc
++  @ONLY
++)
++
  configure_file(
    ${CMAKE_CURRENT_SOURCE_DIR}/mirclient-debug-extension.pc.in
    ${CMAKE_CURRENT_BINARY_DIR}/mirclient-debug-extension.pc
@@ -106,6 +111,13 @@
    mir_extension_core.cpp
    ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_extension_core.h
    ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/extensions/drag_and_drop.h
++  ${CMAKE_SOURCE_DIR}/include/client/mir/client/blob.h
++  ${CMAKE_SOURCE_DIR}/include/client/mir/client/cookie.h
++  ${CMAKE_SOURCE_DIR}/include/client/mir/client/window_spec.h
++  ${CMAKE_SOURCE_DIR}/include/client/mir/client/window_id.h
++  ${CMAKE_SOURCE_DIR}/include/client/mir/client/connection.h
++  ${CMAKE_SOURCE_DIR}/include/client/mir/client/display_config.h
++  ${CMAKE_SOURCE_DIR}/include/client/mir/client/window.h
+ )
  # Ensure protobuf C++ headers have been produced before
@@ -153,6 +165,7 @@
  install(
    FILES ${CMAKE_CURRENT_BINARY_DIR}/mirclient.pc
++        ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc
    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+ )
 === renamed file 'src/miral/mirclientcpp.pc.in' => 'src/client/mirclientcpp.pc.in'
 --- src/miral/mirclientcpp.pc.in	2017-08-29 09:17:03 +0000
 +++ src/client/mirclientcpp.pc.in	2017-09-08 19:22:40 +0000
@@ -1,7 +1,7 @@
--includedir=@INCLUDEDIR@/miral
++includedir=@INCLUDEDIR@/mirclient
  Name: mirclientcpp
--Description: Mir Abstraction Layer C++ wrapper for mirclient
++Description: C++ wrapper for mirclient
  Version: @MIRAL_VERSION@
  Requires: mirclient
  Cflags: -I${includedir}
 === modified file 'src/miral/CMakeLists.txt'
 --- src/miral/CMakeLists.txt	2017-08-30 16:24:09 +0000
 +++ src/miral/CMakeLists.txt	2017-09-08 19:22:40 +0000
@@ -1,8 +1,3 @@
--set(MIRAL_VERSION_MAJOR 1)
--set(MIRAL_VERSION_MINOR 5)
--set(MIRAL_VERSION_PATCH 0)
--set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH})
--
  if(${CMAKE_COMPILER_IS_GNUCXX})
      set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -flto")
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
@@ -66,13 +61,6 @@
      window_manager_tools.cpp            ${miral_include}/miral/window_manager_tools.h
                                          ${miral_include}/miral/window_management_policy_addendum2.h
                                          ${miral_include}/miral/window_management_policy_addendum3.h
--                                        ${miral_include}/mir/client/blob.h
--                                        ${miral_include}/mir/client/cookie.h
--                                        ${miral_include}/mir/client/window_spec.h
--                                        ${miral_include}/mir/client/window_id.h
--                                        ${miral_include}/mir/client/connection.h
--                                        ${miral_include}/mir/client/display_config.h
--                                        ${miral_include}/mir/client/window.h
+ )
  target_include_directories(mirclientcpp
@@ -110,7 +98,7 @@
      add_custom_target(check-miral-symbols ALL
              DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols
              COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
--            COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmiral.so.${MIRAL_ABI} -plibmiral${MIRAL_ABI} -O${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
++            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
              WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
              VERBATIM
+     )
@@ -124,11 +112,6 @@
      @ONLY
+ )
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mirclientcpp.pc.in
--    ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc
--    @ONLY
--)
--
  configure_file(
      ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
      ${miral_include}/miral/version.h
@@ -140,7 +123,6 @@
              DEPENDS doc)
  endif()
--install(TARGETS     miral                           LIBRARY         DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
--install(DIRECTORY   ${CMAKE_SOURCE_DIR}/include/miral               DESTINATION "${INCLUDEDIR}")
--install(FILES       ${CMAKE_CURRENT_BINARY_DIR}/miral.pc
--                    ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc    DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
++install(TARGETS     miral                           LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
++install(DIRECTORY   ${CMAKE_SOURCE_DIR}/include/miral       DESTINATION "${INCLUDEDIR}")
++install(FILES       ${CMAKE_CURRENT_BINARY_DIR}/miral.pc    DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")