Mir

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

Proposed by Alan Griffiths on 2017-08-31
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
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration 2017-08-31 Approve on 2017-09-08
Alan Griffiths Abstain on 2017-09-07
Chris Halse Rogers Approve on 2017-09-06
Michał Sawicz 2017-08-31 Approve on 2017-08-31
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

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:4257
https://mir-jenkins.ubuntu.com/job/mir-ci/3600/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4924/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5149
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5139
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5139
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5139
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4963/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4963/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4963/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4963/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4963/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4963
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4963/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4963
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4963/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4963/console

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

PASSED: Continuous integration, rev:4258
https://mir-jenkins.ubuntu.com/job/mir-ci/3601/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4925
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5150
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5140
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5140
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5140
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4964
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4964/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4964
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4964/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4964
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4964/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4964
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4964/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4964
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4964/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4964
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4964/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4964
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4964/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4964
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4964/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
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://mir-jenkins.ubuntu.com/job/mir-ci/3620/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4947/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5172
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5162
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5162
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5162
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4986/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4986/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4986/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4986/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4986/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4986/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4986/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4986/console

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 :

FAILED: Continuous integration, rev:4262
https://mir-jenkins.ubuntu.com/job/mir-ci/3621/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4948/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5173
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5163
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5163
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5163
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4987/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4987/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4987/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4987/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4987/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4987/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4987/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4987/console

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 :

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 :

FAILED: Continuous integration, rev:4264
https://mir-jenkins.ubuntu.com/job/mir-ci/3622/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4949/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5174
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5164
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5164
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5164
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4988/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4988/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4988
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4988/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4988
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4988/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4988
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4988/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4988
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4988/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4988
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4988/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4988
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4988/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
4237. By Alan Griffiths on 2017-08-31

 Incorporate the utility script for regenerating the libmiral symbols file. Vis:

$ make regenerate-miral-symbols-map.

Approved by mir-ci-bot, Gerry Boland.

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

Alan Griffiths (alan-griffiths) wrote :

*Don't land this yet!!*

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

review: Needs Information
4238. By Alan Griffiths on 2017-08-31

rework mir_demo_server to use miral (and parts of miral-shell).

Approved by mir-ci-bot, Gerry Boland.

Alan Griffiths (alan-griffiths) wrote :

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 :

FAILED: Continuous integration, rev:4265
https://mir-jenkins.ubuntu.com/job/mir-ci/3626/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4955/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5180/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5170/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5170/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5170/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4994/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4994/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4994/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4994/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4994/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4994/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4994/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4994/console

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 :

PASSED: Continuous integration, rev:4266
https://mir-jenkins.ubuntu.com/job/mir-ci/3627/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4956
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5181
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5171
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5171
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5171
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4995
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4995/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4995
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4995/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4995
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4995/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4995
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4995/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4995
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4995/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4995
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4995/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4995
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4995/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4995
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4995/artifact/output/*zip*/output.zip

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 :

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 :

FAILED: Continuous integration, rev:4267
https://mir-jenkins.ubuntu.com/job/mir-ci/3630/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4964/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5192
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5180
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5180
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5180
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5003/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5003/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5003/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5003/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5003/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5003/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5003/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5003/console

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

review: Needs Fixing (continuous-integration)
4239. By Alan Griffiths on 2017-09-05

Incorporate miral project into mir source tree

This is a third pass at removing code obsoleted by MirAL.

Approved by mir-ci-bot, Gerry Boland, Chris Halse Rogers.

4240. By Alan Griffiths on 2017-09-05

Remove unused window management support from libmirserver.

Approved by mir-ci-bot, Gerry Boland, Chris Halse Rogers.

Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:4268
https://mir-jenkins.ubuntu.com/job/mir-ci/3634/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4970/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5198
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5186
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5186
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5186
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5009/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5009/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5009/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5009/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5009/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5009/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5009/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5009/console

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

review: Needs Fixing (continuous-integration)
4241. By Alan Griffiths on 2017-09-06

Change default launcher for miral-app & miral-desktop to qtubuntu as it works better on artful.

Approved by Brandon Schaefer, mir-ci-bot.

4242. By Alan Griffiths on 2017-09-06

Remove workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62258. (This was fixed in 4.9.4, 5.3 and 6.0, it no longer affects any platform we target.)
.

Approved by Brandon Schaefer, mir-ci-bot.

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?

review: Approve
review: Abstain
4243. By Alan Griffiths on 2017-09-07

Remove a few missed references to mir_proving_server.

Approved by Chris Halse Rogers, mir-ci-bot.

4244. By Chris Halse Rogers on 2017-09-07

First round of Wayland support

This is sufficient to
a) Not break unrelated tests, and
b) Provide enough protocol to run es2gears_wayland
c) Provide input support to Wayland clients.

Approved by Alan Griffiths, mir-ci-bot.

Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:4270
https://mir-jenkins.ubuntu.com/job/mir-ci/3641/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4981/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5209
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5197
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5197
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5197
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5020/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5020/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5020/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5020/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5020/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5020/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5020/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5020/console

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 :

PASSED: Continuous integration, rev:4271
https://mir-jenkins.ubuntu.com/job/mir-ci/3644/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4984
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5212
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5200
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5200
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5200
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5023
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5023/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5023
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5023/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5023
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5023/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5023
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5023/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5023
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5023/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5023
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5023/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5023
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5023/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5023
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5023/artifact/output/*zip*/output.zip

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 :

> 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://mir-jenkins.ubuntu.com/job/mir-ci/3645/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4985
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5213
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5201
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5201
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5201
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5024
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5024/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5024
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5024/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5024
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5024/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5024
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5024/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5024
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5024/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5024
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5024/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5024
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5024/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5024
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5024/artifact/output/*zip*/output.zip

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 :

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://mir-jenkins.ubuntu.com/job/mir-ci/3647/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4987
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5215
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5203
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5203
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5203
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5026
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5026/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5026
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5026/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5026
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5026/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5026
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5026/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5026
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5026/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5026
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5026/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5026
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5026/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5026
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5026/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
4245. By Alan Griffiths on 2017-09-08

Updating docs (including integrating MirAL documentation).

Approved by Michał Sawicz, mir-ci-bot.

4246. By Alan Griffiths on 2017-09-08

Debian incantations

4247. By Alan Griffiths on 2017-09-08

Redo the lost debian/control changes

4248. By Alan Griffiths on 2017-09-08

A different (hopefully better) incantation

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2017-05-08 03:04:26 +0000
+++ .bzrignore 2017-09-08 14:22:15 +0000
@@ -2,4 +2,6 @@
2.project2.project
3include/server/mir/version.h3include/server/mir/version.h
4include/client/mir_toolkit/version.h4include/client/mir_toolkit/version.h
5include/miral/version.h
5build-*6build-*
7cmake-*
68
=== modified file 'debian/changelog'
--- debian/changelog 2017-08-29 08:56:16 +0000
+++ debian/changelog 2017-09-08 14:22:15 +0000
@@ -1,4 +1,4 @@
1mir (1:1.0.0-0ubuntu1) UNRELEASED; urgency=medium1mir (1.0.0-0ubuntu1) UNRELEASED; urgency=medium
22
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)
4 - ABI summary:4 - ABI summary:
55
=== modified file 'debian/libmiral2.symbols'
--- debian/libmiral2.symbols 2017-08-22 15:14:34 +0000
+++ debian/libmiral2.symbols 2017-09-08 14:22:15 +0000
@@ -355,45 +355,45 @@
355 (c++)"vtable for miral::ActiveOutputsListener@MIRAL_1.0" 1.0.0355 (c++)"vtable for miral::ActiveOutputsListener@MIRAL_1.0" 1.0.0
356 (c++)"vtable for miral::WindowManagementPolicy@MIRAL_1.0" 1.0.0356 (c++)"vtable for miral::WindowManagementPolicy@MIRAL_1.0" 1.0.0
357 (c++)"vtable for miral::CanonicalWindowManagerPolicy@MIRAL_1.0" 1.0.0357 (c++)"vtable for miral::CanonicalWindowManagerPolicy@MIRAL_1.0" 1.0.0
358 MIRAL_1.1@MIRAL_1.1 1.0.0
359 (c++)"miral::WindowInfo::needs_titlebar(MirWindowType)@MIRAL_1.1" 1.0.0
360 (c++)"miral::WindowInfo::type(MirWindowType)@MIRAL_1.1" 1.0.0
361 (c++)"miral::WindowInfo::state(MirWindowState)@MIRAL_1.1" 1.0.0
362 (c++)"miral::WindowManagementPolicy::advise_state_change(miral::WindowInfo const&, MirWindowState)@MIRAL_1.1" 1.0.0
363 (c++)"miral::WindowInfo::can_morph_to(MirWindowType) const@MIRAL_1.1" 1.0.0
364 (c++)"miral::CanonicalWindowManagerPolicy::place_new_window(miral::ApplicationInfo const&, miral::WindowSpecification const&)@MIRAL_1.1" 1.0.0
365 MIRAL_1.2@MIRAL_1.2 1.0.0
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
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
368 (c++)"miral::WindowInfo::shell_chrome(MirShellChrome)@MIRAL_1.2" 1.0.0
369 (c++)"miral::WindowInfo::shell_chrome() const@MIRAL_1.2" 1.0.0
370 (c++)"miral::WindowManagerTools::drag_window(miral::Window const&, mir::geometry::Displacement)@MIRAL_1.2" 1.0.0
371 (c++)"typeinfo for miral::ApplicationAuthorizer@MIRAL_1.0" 1.0.0
372 (c++)"typeinfo for miral::ApplicationAuthorizer1@MIRAL_1.2" 1.0.0
373 MIRAL_1.3@MIRAL_1.3 1.0.0
374 (c++)"miral::operator<(miral::Window const&, miral::Window const&)@MIRAL_1.0" 1.0.0
375 (c++)"miral::WindowManagerTools::create_workspace()@MIRAL_1.3" 1.0.0
376 (c++)"miral::WindowManagerTools::add_tree_to_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.0.0
377 (c++)"miral::WindowManagerTools::focus_prev_within_application()@MIRAL_1.3" 1.0.0
378 (c++)"miral::WindowManagerTools::remove_tree_from_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.0.0
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
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
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
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
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
384 (c++)"typeinfo for miral::WorkspacePolicy@MIRAL_1.3" 1.0.0
385 (c++)"vtable for miral::WorkspacePolicy@MIRAL_1.3" 1.0.0
386 MIRAL_1.3.1@MIRAL_1.3.1 1.0.0
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
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
389 (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.0.0
390 (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.0.0
391 (c++)"miral::SetWindowManagementPolicy::operator()(mir::Server&) const@MIRAL_1.3.1" 1.0.0
392 MIRAL_1.4.0@MIRAL_1.4.0 1.0.0
393 (c++)"miral::WindowManagerTools::end_drag_and_drop()@MIRAL_1.4.0" 1.0.0
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
395 (c++)"typeinfo for miral::WindowManagementPolicyAddendum2@MIRAL_1.4.0" 1.0.0
396 MIRAL_1.5.0@MIRAL_1.5.0 1.0.0
397 (c++)"miral::pre_init(miral::CommandLineOption const&)@MIRAL_1.5.0" 1.0.0
398 (c++)"typeinfo for miral::WindowManagementPolicyAddendum3@MIRAL_1.5.0" 1.0.0
399 (c++)"miral::WindowManagerTools::active_output()@MIRAL_1.5.0" 1.0.0
400\ No newline at end of file358\ No newline at end of file
359 MIRAL_1.1@MIRAL_1.1 1.1.0
360 (c++)"miral::WindowInfo::needs_titlebar(MirWindowType)@MIRAL_1.1" 1.1.0
361 (c++)"miral::WindowInfo::type(MirWindowType)@MIRAL_1.1" 1.1.0
362 (c++)"miral::WindowInfo::state(MirWindowState)@MIRAL_1.1" 1.1.0
363 (c++)"miral::WindowManagementPolicy::advise_state_change(miral::WindowInfo const&, MirWindowState)@MIRAL_1.1" 1.1.0
364 (c++)"miral::WindowInfo::can_morph_to(MirWindowType) const@MIRAL_1.1" 1.1.0
365 (c++)"miral::CanonicalWindowManagerPolicy::place_new_window(miral::ApplicationInfo const&, miral::WindowSpecification const&)@MIRAL_1.1" 1.1.0
366 MIRAL_1.2@MIRAL_1.2 1.2.0
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
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
369 (c++)"miral::WindowInfo::shell_chrome(MirShellChrome)@MIRAL_1.2" 1.2.0
370 (c++)"miral::WindowInfo::shell_chrome() const@MIRAL_1.2" 1.2.0
371 (c++)"miral::WindowManagerTools::drag_window(miral::Window const&, mir::geometry::Displacement)@MIRAL_1.2" 1.2.0
372 (c++)"typeinfo for miral::ApplicationAuthorizer@MIRAL_1.0" 1.2.0
373 (c++)"typeinfo for miral::ApplicationAuthorizer1@MIRAL_1.2" 1.2.0
374 MIRAL_1.3@MIRAL_1.3 1.3.0
375 (c++)"miral::operator<(miral::Window const&, miral::Window const&)@MIRAL_1.0" 1.3.0
376 (c++)"miral::WindowManagerTools::create_workspace()@MIRAL_1.3" 1.3.0
377 (c++)"miral::WindowManagerTools::add_tree_to_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.3.0
378 (c++)"miral::WindowManagerTools::focus_prev_within_application()@MIRAL_1.3" 1.3.0
379 (c++)"miral::WindowManagerTools::remove_tree_from_workspace(miral::Window const&, std::shared_ptr<miral::Workspace> const&)@MIRAL_1.3" 1.3.0
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
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
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
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
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
385 (c++)"typeinfo for miral::WorkspacePolicy@MIRAL_1.3" 1.3.0
386 (c++)"vtable for miral::WorkspacePolicy@MIRAL_1.3" 1.3.0
387 MIRAL_1.3.1@MIRAL_1.3.1 1.3.1
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
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
390 (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.3.1
391 (c++)"miral::SetWindowManagementPolicy::~SetWindowManagementPolicy()@MIRAL_1.3.1" 1.3.1
392 (c++)"miral::SetWindowManagementPolicy::operator()(mir::Server&) const@MIRAL_1.3.1" 1.3.1
393 MIRAL_1.4.0@MIRAL_1.4.0 1.4.0
394 (c++)"miral::WindowManagerTools::end_drag_and_drop()@MIRAL_1.4.0" 1.4.0
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
396 (c++)"typeinfo for miral::WindowManagementPolicyAddendum2@MIRAL_1.4.0" 1.4.0
397 MIRAL_1.5.0@MIRAL_1.5.0 1.5.0
398 (c++)"miral::pre_init(miral::CommandLineOption const&)@MIRAL_1.5.0" 1.5.0
399 (c++)"typeinfo for miral::WindowManagementPolicyAddendum3@MIRAL_1.5.0" 1.5.0
400 (c++)"miral::WindowManagerTools::active_output()@MIRAL_1.5.0" 1.5.0
401\ No newline at end of file401\ No newline at end of file
402402
=== modified file 'debian/libmirclient-dev.install'
--- debian/libmirclient-dev.install 2017-05-17 04:48:46 +0000
+++ debian/libmirclient-dev.install 2017-09-08 14:22:15 +0000
@@ -1,8 +1,10 @@
1usr/include/mirclient/mir_toolkit/*.h1usr/include/mirclient/mir_toolkit/*.h
2usr/include/mirclient/mir_toolkit/extensions/*.h2usr/include/mirclient/mir_toolkit/extensions/*.h
3usr/include/mirclient/mir/client/*.h
3usr/include/mirclient/mir/events/*.h4usr/include/mirclient/mir/events/*.h
4usr/include/mirclient/mir/event_printer.h5usr/include/mirclient/mir/event_printer.h
5usr/include/mirclient/mir_toolkit/events6usr/include/mirclient/mir_toolkit/events
6usr/include/mirclient/mir_toolkit/rs/mir_render_surface.h7usr/include/mirclient/mir_toolkit/rs/mir_render_surface.h
7usr/lib/*/pkgconfig/mirclient.pc8usr/lib/*/pkgconfig/mirclient.pc
9usr/lib/*/pkgconfig/mirclientcpp.pc
8usr/lib/*/libmirclient.so10usr/lib/*/libmirclient.so
911
=== 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 @@
1usr/include/miral/mir/*/*
2usr/lib/*/pkgconfig/mirclientcpp.pc
30
=== modified file 'debian/mir-demos.install'
--- debian/mir-demos.install 2017-08-31 11:29:14 +0000
+++ debian/mir-demos.install 2017-09-08 14:22:15 +0000
@@ -1,2 +1,11 @@
1usr/bin/mir_demo_*1usr/bin/mir_demo_*
2usr/lib/*/libmir_demo_*2usr/lib/*/libmir_demo_*
3usr/bin/miral-shell
4usr/bin/miral-run
5usr/bin/miral-kiosk
6usr/bin/miral-xrun
7usr/bin/miral-screencast
8usr/bin/miral-desktop
9usr/bin/miral-app
10usr/share/applications/miral-shell.desktop
11usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg
312
=== 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 @@
1usr/bin/miral-shell
2usr/bin/miral-run
3usr/bin/miral-kiosk
4usr/bin/miral-xrun
5usr/bin/miral-screencast
6usr/bin/miral-desktop
7usr/bin/miral-app
8usr/share/applications/miral-shell.desktop
9usr/share/icons/hicolor/scalable/apps/ubuntu-logo.svg
100
=== modified file 'debian/rules'
--- debian/rules 2017-06-02 08:19:00 +0000
+++ debian/rules 2017-09-08 14:22:15 +0000
@@ -1,10 +1,6 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
22
3DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)3include /usr/share/dpkg/default.mk
4DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
5DEB_HOST_ARCH_ENDIAN ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)
6EXACT_PACKAGE_VERSION = $(shell dpkg-parsechangelog | grep Version | cut -d' ' -f 2)
7DISTRIB_CODENAME = $(shell grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2)
84
9export DPKG_GENSYMBOLS_CHECK_LEVEL = 45export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
106
@@ -57,16 +53,25 @@
57override_dh_auto_build-indep:53override_dh_auto_build-indep:
58 dh_auto_build -- doc54 dh_auto_build -- doc
5955
56# Reconstruct the MirAL version
57MIRAL_VERSION_MAJOR = $(shell perl -n -e '/^set\(MIRAL_VERSION_MAJOR ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt)
58MIRAL_VERSION_MINOR = $(shell perl -n -e '/^set\(MIRAL_VERSION_MINOR ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt)
59MIRAL_VERSION_PATCH = $(shell perl -n -e '/^set\(MIRAL_VERSION_PATCH ([0-9]*)\)$$/ && print $$1' src/CMakeLists.txt)
60MIRAL_RELEASE=$(MIRAL_VERSION_MAJOR).$(MIRAL_VERSION_MINOR).$(MIRAL_VERSION_PATCH)
61MIRAL_VERSION=$(MIRAL_RELEASE).$(DEB_VERSION)
62
60# TODO: we'll use a symbol file once mir is abi stable63# TODO: we'll use a symbol file once mir is abi stable
61override_dh_makeshlibs:64override_dh_makeshlibs:
62 dh_makeshlibs -V -Nmir-test-tools65 dh_makeshlibs -Nlibmiral2 -V -Nmir-test-tools
66 # libmiral2 *has* a symbols file, so we don't need to -V it!
67 dh_makeshlibs -plibmiral2 -- -v$(MIRAL_RELEASE)
6368
64override_dh_install:69override_dh_install:
65# Nothing outside Mir should link to libmirprotobuf directly.70# Nothing outside Mir should link to libmirprotobuf directly.
66# Delete the symlink so that --fail-missing doesn't think we've missed it71# Delete the symlink so that --fail-missing doesn't think we've missed it
67# accidentally.72# accidentally.
68 -rm debian/tmp/usr/lib/*/libmirprotobuf.so73 -rm debian/tmp/usr/lib/*/libmirprotobuf.so
69ifeq ($(filter xenial yakkety zesty,$(DISTRIB_CODENAME)),)74ifeq ($(filter xenial yakkety zesty,$(DEB_DISTRIBUTION)),)
70 dh_install75 dh_install
71else76else
72 # xenial, yakkety & zesty predate dh_missing77 # xenial, yakkety & zesty predate dh_missing
@@ -80,3 +85,7 @@
80# Don't try to find dependencies of libraries used as test data85# Don't try to find dependencies of libraries used as test data
81override_dh_shlibdeps:86override_dh_shlibdeps:
82 dh_shlibdeps -Xmir-test-data87 dh_shlibdeps -Xmir-test-data
88
89override_dh_gencontrol:
90 dh_gencontrol -Nlibmiral2 -Nlibmiral-dev -- -V'libmiral2:Version=$(MIRAL_VERSION)'
91 dh_gencontrol -plibmiral2 -plibmiral-dev -- -v$(MIRAL_VERSION)
8392
=== modified file 'doc/mainpage.md'
--- doc/mainpage.md 2017-09-07 09:53:20 +0000
+++ doc/mainpage.md 2017-09-08 14:22:15 +0000
@@ -28,7 +28,7 @@
2828
29Install the headers and libraries for using libmiral in development:29Install the headers and libraries for using libmiral in development:
3030
31 $ sudo apt install libmirserver-dev31 $ sudo apt install libmiral-dev
3232
33A `miral.pc` file is provided for use with `pkg-config` or other tools. For33A `miral.pc` file is provided for use with `pkg-config` or other tools. For
34example: 34example:
3535
=== 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 14:22:15 +0000
@@ -1,6 +1,11 @@
1# We need MIRPLATFORM_ABI in both libmirplatform and the platform implementations.1# We need MIRPLATFORM_ABI in both libmirplatform and the platform implementations.
2set(MIRPLATFORM_ABI 16)2set(MIRPLATFORM_ABI 16)
33
4set(MIRAL_VERSION_MAJOR 1)
5set(MIRAL_VERSION_MINOR 5)
6set(MIRAL_VERSION_PATCH 0)
7set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH})
8
4# Add the cookie implementation before exposing any APIs9# Add the cookie implementation before exposing any APIs
5add_subdirectory(cookie/)10add_subdirectory(cookie/)
611
712
=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt 2017-05-17 04:48:46 +0000
+++ src/client/CMakeLists.txt 2017-09-08 14:22:15 +0000
@@ -11,6 +11,11 @@
11 @ONLY11 @ONLY
12)12)
1313
14configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mirclientcpp.pc.in
15 ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc
16 @ONLY
17)
18
14configure_file(19configure_file(
15 ${CMAKE_CURRENT_SOURCE_DIR}/mirclient-debug-extension.pc.in20 ${CMAKE_CURRENT_SOURCE_DIR}/mirclient-debug-extension.pc.in
16 ${CMAKE_CURRENT_BINARY_DIR}/mirclient-debug-extension.pc21 ${CMAKE_CURRENT_BINARY_DIR}/mirclient-debug-extension.pc
@@ -106,6 +111,13 @@
106 mir_extension_core.cpp111 mir_extension_core.cpp
107 ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_extension_core.h112 ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_extension_core.h
108 ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/extensions/drag_and_drop.h113 ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/extensions/drag_and_drop.h
114 ${CMAKE_SOURCE_DIR}/include/client/mir/client/blob.h
115 ${CMAKE_SOURCE_DIR}/include/client/mir/client/cookie.h
116 ${CMAKE_SOURCE_DIR}/include/client/mir/client/window_spec.h
117 ${CMAKE_SOURCE_DIR}/include/client/mir/client/window_id.h
118 ${CMAKE_SOURCE_DIR}/include/client/mir/client/connection.h
119 ${CMAKE_SOURCE_DIR}/include/client/mir/client/display_config.h
120 ${CMAKE_SOURCE_DIR}/include/client/mir/client/window.h
109)121)
110122
111# Ensure protobuf C++ headers have been produced before123# Ensure protobuf C++ headers have been produced before
@@ -153,6 +165,7 @@
153165
154install(166install(
155 FILES ${CMAKE_CURRENT_BINARY_DIR}/mirclient.pc167 FILES ${CMAKE_CURRENT_BINARY_DIR}/mirclient.pc
168 ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc
156 DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig169 DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
157)170)
158171
159172
=== 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 14:22:15 +0000
@@ -1,7 +1,7 @@
1includedir=@INCLUDEDIR@/miral1includedir=@INCLUDEDIR@/mirclient
22
3Name: mirclientcpp3Name: mirclientcpp
4Description: Mir Abstraction Layer C++ wrapper for mirclient4Description: C++ wrapper for mirclient
5Version: @MIRAL_VERSION@5Version: @MIRAL_VERSION@
6Requires: mirclient6Requires: mirclient
7Cflags: -I${includedir}7Cflags: -I${includedir}
88
=== modified file 'src/miral/CMakeLists.txt'
--- src/miral/CMakeLists.txt 2017-08-30 16:24:09 +0000
+++ src/miral/CMakeLists.txt 2017-09-08 14:22:15 +0000
@@ -1,8 +1,3 @@
1set(MIRAL_VERSION_MAJOR 1)
2set(MIRAL_VERSION_MINOR 5)
3set(MIRAL_VERSION_PATCH 0)
4set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH})
5
6if(${CMAKE_COMPILER_IS_GNUCXX})1if(${CMAKE_COMPILER_IS_GNUCXX})
7 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto")2 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto")
8 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")3 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
@@ -66,13 +61,6 @@
66 window_manager_tools.cpp ${miral_include}/miral/window_manager_tools.h61 window_manager_tools.cpp ${miral_include}/miral/window_manager_tools.h
67 ${miral_include}/miral/window_management_policy_addendum2.h62 ${miral_include}/miral/window_management_policy_addendum2.h
68 ${miral_include}/miral/window_management_policy_addendum3.h63 ${miral_include}/miral/window_management_policy_addendum3.h
69 ${miral_include}/mir/client/blob.h
70 ${miral_include}/mir/client/cookie.h
71 ${miral_include}/mir/client/window_spec.h
72 ${miral_include}/mir/client/window_id.h
73 ${miral_include}/mir/client/connection.h
74 ${miral_include}/mir/client/display_config.h
75 ${miral_include}/mir/client/window.h
76)64)
7765
78target_include_directories(mirclientcpp66target_include_directories(mirclientcpp
@@ -110,7 +98,7 @@
110 add_custom_target(check-miral-symbols ALL98 add_custom_target(check-miral-symbols ALL
111 DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols99 DEPENDS miral ${PROJECT_SOURCE_DIR}/debian/libmiral${MIRAL_ABI}.symbols
112 COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols100 COMMAND rm -f ${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols
113 COMMAND dpkg-gensymbols -e${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libmiral.so.${MIRAL_ABI} -plibmiral${MIRAL_ABI} -O${CMAKE_CURRENT_BINARY_DIR}/libmiral${MIRAL_ABI}.symbols101 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
114 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"102 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
115 VERBATIM103 VERBATIM
116 )104 )
@@ -124,11 +112,6 @@
124 @ONLY112 @ONLY
125)113)
126114
127configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mirclientcpp.pc.in
128 ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc
129 @ONLY
130)
131
132configure_file(115configure_file(
133 ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in116 ${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
134 ${miral_include}/miral/version.h117 ${miral_include}/miral/version.h
@@ -140,7 +123,6 @@
140 DEPENDS doc)123 DEPENDS doc)
141endif()124endif()
142125
143install(TARGETS miral LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")126install(TARGETS miral LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
144install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/miral DESTINATION "${INCLUDEDIR}")127install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/miral DESTINATION "${INCLUDEDIR}")
145install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miral.pc128install(FILES ${CMAKE_CURRENT_BINARY_DIR}/miral.pc DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
146 ${CMAKE_CURRENT_BINARY_DIR}/mirclientcpp.pc DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")

Subscribers

People subscribed via source and target branches