Mir

Merge lp:~raof/mir/more-packaging-tweaking into lp:mir

Proposed by Chris Halse Rogers on 2017-09-13
Status: Merged
Merged at revision: 4250
Proposed branch: lp:~raof/mir/more-packaging-tweaking
Merge into: lp:mir
Diff against target: 23 lines (+4/-2)
1 file modified
debian/control (+4/-2)
To merge this branch: bzr merge lp:~raof/mir/more-packaging-tweaking
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Needs Fixing on 2017-09-14
Dimitri John Ledkov (community) Approve on 2017-09-14
Alan Griffiths 2017-09-13 Approve on 2017-09-14
Review via email: mp+330642@code.launchpad.net

Commit message

debian/control: Fix the dependencies of libmiral-dev

This is not *quite* correct - source:Version makes the package not BinNMUable - but Launchpad doesn't support BinNMUs anyway so it's harmlessly incorrect.

Description of the change

I'm not *entirely* sure how it currently works, but I *know* this should work :)

To post a comment you must log in.
Alan Griffiths (alan-griffiths) wrote :

Plausible

review: Approve
Dimitri John Ledkov (xnox) wrote :

Yes! this is the way to do it, I was concerned that binary:Version will end up being the wrong thing when we override the version of that binary package.

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

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

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2017-09-08 16:41:11 +0000
3+++ debian/control 2017-09-13 04:18:18 +0000
4@@ -238,7 +238,7 @@
5 Multi-Arch: same
6 Pre-Depends: ${misc:Pre-Depends}
7 Depends: libmirclient-debug-extension1 (= ${binary:Version}),
8- ${misc:Depends},
9+ ${misc:Depends},
10 ${shlibs:Depends},
11 Description: Display server for Ubuntu - client debug interface headers
12 Mir is a display server running on linux systems, with a focus on efficiency,
13@@ -506,7 +506,9 @@
14 Multi-Arch: same
15 Pre-Depends: ${misc:Pre-Depends}
16 Depends: libmiral2 (= ${libmiral2:Version}),
17- libmirclientcpp-dev (= ${binary:Version}),
18+# ${source:Version} is technically incorrect, but Launchpad doesn't do BinNMUs
19+# so it's harmless.
20+ libmirclient-dev (= ${source:Version}),
21 ${misc:Depends},
22 Description: Developer files for the Mir ABI-stable abstraction layer
23 MirAL provides an ABI-stable abstraction layer for Mir based shells,

Subscribers

People subscribed via source and target branches