Unity System Compositor

Merge lp:~alan-griffiths/unity-system-compositor/mir-0.27-compat into lp:unity-system-compositor

  1. mir-0.27-compat
  2. Merge into trunk
Proposed by Alan Griffiths
Status: Merged
Approved by: Gerry Boland
Approved revision: 319
Merged at revision: 314
Proposed branch: lp:~alan-griffiths/unity-system-compositor/mir-0.27-compat
Merge into: lp:unity-system-compositor
Diff against target: 95 lines (+21/-9)
2 files modified
debian/changelog (+12/-6)
debian/rules (+9/-3)
To merge this branch: bzr merge lp:~alan-griffiths/unity-system-compositor/mir-0.27-compat
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Gerry Boland (community) Approve
Review via email: mp+325751@code.launchpad.net

Commit message

No source change (rebuild for Mir 0.27), tweak to debian/rules to work on Artful

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

LGTM. Strange diff on LP tho

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:319
https://mir-jenkins.ubuntu.com/job/usc-ci/65/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-usc/95/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4917
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4906
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4906
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4906
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial+overlay/99/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/99
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/99/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=armhf,release=vivid+overlay/99/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial+overlay/99/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/99
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/99/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote :

We do not care for the overlays, so I'm happy to ignore CI

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:319
https://mir-jenkins.ubuntu.com/job/usc-ci/66/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-usc/96
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4918
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4907
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4907
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4907
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=artful/100
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=artful/100/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial/100
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=xenial/100/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/100
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=amd64,release=zesty/100/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=artful/100
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=artful/100/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial/100
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=xenial/100/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/100
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-usc/arch=i386,release=zesty/100/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> We do not care for the overlays, so I'm happy to ignore CI

Fixed CI: Overlays are no longer in CI, and Artful is.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2017-01-17 16:59:15 +0000
3+++ debian/changelog 2017-07-10 09:22:48 +0000
4@@ -1,3 +1,9 @@
5+unity-system-compositor (0.9.1-0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * No change rebuild for Mir 0.27
8+
9+ -- Alan Griffiths <alan.griffiths@canonical.com> Fri, 16 Jun 2017 12:37:52 +0100
10+
11 unity-system-compositor (0.9.0-0ubuntu1) UNRELEASED; urgency=medium
12
13 * Update for compatibility with Mir 0.26
14@@ -29,7 +35,7 @@
15 unity-system-compositor (0.7.0+16.10.20160815-0ubuntu1) yakkety; urgency=medium
16
17 * 0.7.0 release, containing compatibility fixes for mir 0.24 release.
18- Only test code changes.
19+ Only test code changes.
20
21 -- Kevin DuBois <kevin.dubois@canonical.com> Mon, 15 Aug 2016 18:57:15 +0000
22
23@@ -91,7 +97,7 @@
24 unity-system-compositor (0.5.0+16.04.20160423-0ubuntu1) xenial; urgency=medium
25
26 [ Alberto Aguirre ]
27- * Mir 0.22 compatibility
28+ * Mir 0.22 compatibility
29
30 [ CI Train Bot ]
31 * No-change rebuild.
32@@ -305,7 +311,7 @@
33
34 unity-system-compositor (0.1.0+15.10.20150817-0ubuntu1) wily; urgency=medium
35
36- *
37+ *
38
39 -- CI Train Bot <ci-train-bot@canonical.com> Mon, 17 Aug 2015 19:28:40 +0000
40
41@@ -326,7 +332,7 @@
42
43 [ Alan Griffiths ]
44 * Port to mir SystemCompositorWindowManager
45-
46+
47 [ Robert Ancell ]
48 * Depend on the new xmir package instead of the obsolete
49 xserver-xorg-xmir (LP: #1204505)
50@@ -339,7 +345,7 @@
51 unity-system-compositor (0.0.5+15.10.20150722-0ubuntu1) wily; urgency=medium
52
53 [ Kevin Gunn ]
54- * Release in step with Mir 0.14
55+ * Release in step with Mir 0.14
56
57 [ CI Train Bot ]
58 * New rebuild forced.
59@@ -630,7 +636,7 @@
60 unity-system-compositor (0.0.4+14.10.20140625-0ubuntu1) utopic; urgency=medium
61
62 [ Alberto Aguirre ]
63- * Bump version due to new dbus interfaces
64+ * Bump version due to new dbus interfaces
65
66 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 25 Jun 2014 14:49:59 +0000
67
68
69=== modified file 'debian/rules'
70--- debian/rules 2016-11-09 19:12:16 +0000
71+++ debian/rules 2017-07-10 09:22:48 +0000
72@@ -1,5 +1,7 @@
73 #!/usr/bin/make -f
74
75+DISTRIB_CODENAME = $(shell grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2)
76+
77 %:
78 dh $@ --parallel --fail-missing --with python3
79
80@@ -11,8 +13,12 @@
81 override_dh_install:
82 # install autopilot tests
83 cd tests/autopilot; \
84- set -ex; for python in $(shell py3versions -r); do \
85- $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
86- done; \
87+ set -ex; \
88+ $(shell py3versions --default) setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
89 cd $(CURDIR)
90+ifeq ($(filter xenial yakkety zesty,$(DISTRIB_CODENAME)),)
91+ dh_install -X'*.pyc'
92+else
93+ # xenial, yakkety & zesty predate dh_missing
94 dh_install -X'*.pyc' --fail-missing
95+endif

Subscribers

People subscribed via source and target branches