MirAL

Merge lp:~alan-griffiths/miral/merge-release-changelog into lp:miral

Proposed by Alan Griffiths on 2016-12-22

Status:	Merged
Approved by:	Gerry Boland on 2017-01-04
Approved revision:	477
Merged at revision:	477
Proposed branch:	lp:~alan-griffiths/miral/merge-release-changelog
Merge into:	lp:miral
Diff against target:	34 lines (+15/-1) 2 files modified CMakeLists.txt (+1/-1) debian/changelog (+14/-0)
To merge this branch:	bzr merge lp:~alan-griffiths/miral/merge-release-changelog
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Gerry Boland		2016-12-22	Approve on 2017-01-04
Review via email: mp+313783@code.launchpad.net

Merge changelog from release branch

Gerry Boland (gerboland) wrote on 2017-01-04:

LGTM

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-12-13 13:07:15 +0000
 +++ CMakeLists.txt	2016-12-22 17:46:13 +0000
@@ -38,7 +38,7 @@
  set(MIRAL_VERSION_MAJOR 1)
  set(MIRAL_VERSION_MINOR 0)
--set(MIRAL_VERSION_PATCH 0)
++set(MIRAL_VERSION_PATCH 1)
  set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH})
 === modified file 'debian/changelog'
 --- debian/changelog	2016-12-16 00:36:21 +0000
 +++ debian/changelog	2016-12-22 17:46:13 +0000
@@ -1,3 +1,17 @@
++miral (1.0.1+17.04.20161220-0ubuntu1) zesty; urgency=medium
++
++  * New upstream release 1.0.1 (https://launchpad.net/miral/+milestone/1.0)
++    - ABI summary:
++      . miral ABI unchanged at 2
++    - Enhancements:
++      . None
++    - Bugs fixed:
++      . Workaround for a missing dependency in Mir packaging (LP: #1651391)
++      . Avoid double lock in WindowManagerTools::force_close() (LP:  #1646735)
++      . Fix typo in miral-app script
++
++ -- Alan Griffiths <alan.griffiths@canonical.com>  Tue, 20 Dec 2016 16:00:02 +0000
++
  miral (1.0.0+17.04.20161216-0ubuntu1) zesty; urgency=medium
    [ Alan Griffiths ]