Mir

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

Proposed by Alan Griffiths on 2017-09-08
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
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

This proposal supersedes a proposal from 2017-09-08.

Commit message

Version libmiral2 and libmiral-dev correctly and Incorporate other 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 : Posted in a previous version of this proposal

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

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)
Alan Griffiths (alan-griffiths) wrote : 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 : 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 : 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 : Posted in a previous version of this proposal

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

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

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)
Mir CI Bot (mir-ci-bot) wrote : Posted in a previous version of this proposal

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)
Chris Halse Rogers (raof) wrote : 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) : Posted in a previous version of this proposal
review: Abstain
Mir CI Bot (mir-ci-bot) wrote : Posted in a previous version of this proposal

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

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

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

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)
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:4246
https://mir-jenkins.ubuntu.com/job/mir-ci/3649/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4990
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5218
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5206
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5206
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5206
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5029
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5029/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5029
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5029/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5029
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5029/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5029
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5029/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5029
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5029/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/5029
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5029/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/5029
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5029/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5029
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5029/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Michał Sawicz (saviq) wrote :

Let's get it in!

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

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/1414/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4992/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1544/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5220
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5208
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5208
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5208
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5031/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5031/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5031/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5031/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5031/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5031/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5031/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5031/console

review: Needs Fixing (continuous-integration)
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:4248
https://mir-jenkins.ubuntu.com/job/mir-ci/3651/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4993/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5221
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5209
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5209
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5209
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5032/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5032
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5032/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5032
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5032/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5032
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5032/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5032
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5032/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/5032
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5032/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/5032
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5032/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5032
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5032/artifact/output/*zip*/output.zip

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 :

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

Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

Preview Diff

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

Subscribers

People subscribed via source and target branches