MirAL

Merge lp:~alan-griffiths/miral/1.3 into lp:miral

  1. 1.3
  2. Merge into trunk
Proposed by Alan Griffiths
Status: Merged
Approved by: Alexandros Frantzis
Approved revision: 360
Merged at revision: 548
Proposed branch: lp:~alan-griffiths/miral/1.3
Merge into: lp:miral
Diff against target: 49 lines (+22/-3)
2 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+21/-2)
To merge this branch: bzr merge lp:~alan-griffiths/miral/1.3
Reviewer Review Type Date Requested Status
Alexandros Frantzis (community) Approve
Mir CI Bot continuous-integration Approve
Review via email: mp+321964@code.launchpad.net

Commit message

back-merge 1.3.2 release

To post a comment you must log in.
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:360
https://mir-jenkins.ubuntu.com/job/miral-ci/8/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-miral/12
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4592
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4581
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4581
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4581
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4581
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/17
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/17/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial+overlay/17
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial+overlay/17/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/17
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/17/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/17
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/17/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial+overlay/17
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial+overlay/17/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/17
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/17/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2017-03-15 17:44:36 +0000
+++ CMakeLists.txt 2017-04-05 08:23:33 +0000
@@ -42,7 +42,7 @@
4242
43set(MIRAL_VERSION_MAJOR 1)43set(MIRAL_VERSION_MAJOR 1)
44set(MIRAL_VERSION_MINOR 3)44set(MIRAL_VERSION_MINOR 3)
45set(MIRAL_VERSION_PATCH 1)45set(MIRAL_VERSION_PATCH 2)
4646
47set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH})47set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH})
4848
4949
=== modified file 'debian/changelog'
--- debian/changelog 2017-03-16 16:33:57 +0000
+++ debian/changelog 2017-04-05 08:23:33 +0000
@@ -1,4 +1,23 @@
1miral (1.3.1) UNRELEASED; urgency=medium1miral (1.3.2+17.04.20170330.5-0ubuntu1) zesty; urgency=medium
2
3 * New upstream release 1.3.2 (https://launchpad.net/miral/+milestone/1.3.2)
4 - ABI summary:
5 . miral ABI unchanged at 2
6 - Enhancements:
7 . [miral-shell] Add a keyboard shortcut for forcing fullscreen
8 - Bugs fixed:
9 . [miral-examples] With latest zesty's libstdc++-6-dev miral-shell will
10 crash when trying to draw its background text. (LP: #1677550)
11 . [miral-examples] Update miral-xrun to match GDK changes (LP: #1675115)
12 . [miral-examples] change the server and client launch scripts to avoid
13 using the default Mir socket (LP: #1675794)
14 . [libmiral] Fix FTBFS against Mir < 0.26 (Xenial, Yakkety)
15 . [libmiral] correct spelling of miral/set_window_management_policy.h
16 . Update to fix FTBFS against lp:mir (and clang)
17
18 -- Alan Griffiths <alan.griffiths@canonical.com> Thu, 30 Mar 2017 14:18:37 +0000
19
20miral (1.3.1+17.04.20170316.1-0ubuntu1) zesty; urgency=medium
221
3 * New upstream release 1.3.1 (https://launchpad.net/miral/+milestone/1.3.1)22 * New upstream release 1.3.1 (https://launchpad.net/miral/+milestone/1.3.1)
4 - ABI summary:23 - ABI summary:
@@ -14,7 +33,7 @@
14 . [libmiral] When a dialog is hidden ensure that the active window focus33 . [libmiral] When a dialog is hidden ensure that the active window focus
15 goes to the parent. (LP: #1671072)34 goes to the parent. (LP: #1671072)
1635
17 -- Alan Griffiths <alan.griffiths@canonical.com> Mon, 06 Mar 2017 10:00:20 +000036 -- Alan Griffiths <alan.griffiths@canonical.com> Thu, 16 Mar 2017 18:17:41 +0000
1837
19miral (1.3.0+17.04.20170303-0ubuntu1) zesty; urgency=medium38miral (1.3.0+17.04.20170303-0ubuntu1) zesty; urgency=medium
2039

Subscribers

People subscribed via source and target branches