Merge lp:~unity-team/unity/bump-version-7.2.2 into lp:unity/7.2

Proposed by Christopher Townsend
Status: Merged
Approved by: Stephen M. Webb
Approved revision: no longer in the source branch.
Merged at revision: 3799
Proposed branch: lp:~unity-team/unity/bump-version-7.2.2
Merge into: lp:unity/7.2
Prerequisite: lp:~unity-team/unity/7.2.2
Diff against target: 223 lines (+163/-2)
4 files modified
AUTHORS (+3/-0)
CMakeLists.txt (+1/-1)
ChangeLog (+157/-0)
debian/changelog (+2/-1)
To merge this branch: bzr merge lp:~unity-team/unity/bump-version-7.2.2
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Review via email: mp+225511@code.launchpad.net

Commit message

Release Unity 7.2.2.

Description of the change

Release Unity 7.2.2.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

Giv'r

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2014-05-13 19:50:00 +0000
3+++ AUTHORS 2014-07-03 15:41:16 +0000
4@@ -13,6 +13,7 @@
5 Alex Launi <alex.launi@canonical.com>
6 Alex Launi <alex.launi@canonical.com>, Allan LeSage <allanlesage@gmail.com>
7 Alex Launi <alex.launi@canonical.com>, Thomi Richards <thomi.richards@canonical.com>
8+ Alfred Neumayer <alfred.neumayer.g1@gmail.com>
9 Alfred Neumayer <dev.beidl@gmail.com>
10 Andrea Azzarone
11 Andrea Azzarone <azzaronea@gmail.com>
12@@ -26,6 +27,7 @@
13 Bilal Akhtar <bilalakhtar@ubuntu.com>, Thomi Richards <thomi.richards@canonical.com>
14 Brandon Schaefer <brandon.schaefer@canonical.com>
15 Brandon Schaefer <brandon.schaefer@canonical.com>, Brandon Schaefer <brandontschaefer@gmail.com>
16+ Brandon Schaefer <brandon.schaefer@canonical.com>, Marco Trevisan (Treviño) <marco.trevisan@canonical.com>
17 Brandon Schaefer <brandon.schaefer@canonical.com>, MC Return <mc.return@gmx.net>
18 Brandon Schaefer <brandon.schaefer@canonical.com>, Nick Dedekind <nicholas.dedekind@gmail.com>
19 Brandon Schaefer <brandontschaefer@gmail.com
20@@ -119,6 +121,7 @@
21 Marco Trevisan (Treviño) <mail@3v1n0.net>, Michal Hruby <michal.mhr@gmail.com>
22 Marco Trevisan (Treviño) <mail@3v1n0.net>, Sam Spilsbury <sam.spilsbury@canonical.com>
23 Marco Trevisan (Treviño) <mail@3v1n0.net>, Thomi Richards <thomi.richards@canonical.com>
24+ Marco Trevisan (Treviño) <marco.trevisan@canonical.com>
25 Marco Trevisan (Treviño), Marco Trevisan (Treviño) <mail@3v1n0.net>
26 Marius Gedminas <marius@gedmin.as>
27 Martin Albisetti <argentina@gmail.com>
28
29=== modified file 'CMakeLists.txt'
30--- CMakeLists.txt 2014-05-13 19:50:00 +0000
31+++ CMakeLists.txt 2014-07-03 15:41:16 +0000
32@@ -10,7 +10,7 @@
33 set (PROJECT_NAME "unity")
34 set (UNITY_MAJOR 7)
35 set (UNITY_MINOR 2)
36-set (UNITY_MICRO 1)
37+set (UNITY_MICRO 2)
38 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
39 set (UNITY_API_VERSION "6.0")
40 set (UNITY_COMPONENTS_VERSION "6")
41
42=== modified file 'ChangeLog'
43--- ChangeLog 2014-05-13 19:50:00 +0000
44+++ ChangeLog 2014-07-03 15:41:16 +0000
45@@ -1,3 +1,160 @@
46+2014-07-01 Chris Townsend <christopher.townsend@canonical.com>
47+
48+ Add changelog entry for lp:1281058.
49+
50+2014-07-01 Andrea Azzarone <andrea.azzarone@canonical.com>
51+
52+ Add a warning in the session dialog if other sessions are still open.
53+
54+2014-06-23 Chris Townsend <christopher.townsend@canonical.com>
55+
56+ Added changelog entry for lp:1310200.
57+
58+2014-06-23 Andrea Azzarone <andrea.azzarone@canonical.com>
59+
60+ Fix skype indicator blinking.
61+
62+2014-06-23 Chris Townsend <christopher.townsend@canonical.com>
63+
64+ Added changelog entry for lp:1316005.
65+
66+2014-06-23 Chris Townsend <christopher.townsend@canonical.com>
67+
68+ Fix issue where the Panel shadow would get drawn over drop down windows in full screen windows.
69+
70+2014-06-23 Chris Townsend <christopher.townsend@canonical.com>
71+
72+ Added changelog entry for lp:1283775.
73+
74+2014-06-23 Chris Townsend <christopher.townsend@canonical.com>
75+
76+ Fix issue where the number of Launcher icon pips are not always properly updated when a new window of an already running application is opened.
77+
78+2014-06-23 Chris Townsend <christopher.townsend@canonical.com>
79+
80+ Added changelog entry for lp:1320438.
81+
82+2014-06-23 Andrea Azzarone <andrea.azzarone@canonical.com>
83+
84+ Pass the correct options to showLauncherKeyTerminate in UnityScreen::OnLockScreen
85+
86+2014-06-23 Chris Townsend <christopher.townsend@canonical.com>
87+
88+ Added changelog entry for lp:1321043.
89+
90+2014-06-23 Andrea Azzarone <andrea.azzarone@canonical.com>
91+
92+ Disable switcher gestures if screen is locked. Fixed a regression.
93+
94+2014-06-23 Chris Townsend <christopher.townsend@canonical.com>
95+
96+ Add changelog entry for lp:1308911.
97+
98+2014-06-23 Andrea Azzarone <andrea.azzarone@canonical.com>
99+
100+ Clear the clipboard when locking the screen.
101+
102+2014-06-23 Chris Townsend <christopher.townsend@canonical.com>
103+
104+ Added changelog entry for lp:924840.
105+
106+2014-06-23 Marco Trevisan (Treviño) <marco.trevisan@canonical.com>
107+
108+ ShortcutView: use RawPixel's for the size values and convert them to match current scaling
109+
110+ Plus dinamically allocate horizontal space, not to cut the text.
111+
112+2014-06-23 Chris Townsend <christopher.townsend@canonical.com>
113+
114+ Added changelog entry for lp:741869.
115+
116+2014-06-23 Marco Trevisan (Treviño) <marco.trevisan@canonical.com>
117+
118+ PluginAdapter: try to grab the screen to make sure that the screen is not grabbed
119+
120+ FocusIn event with NotifyGrab mode is not always triggered by X when a window
121+ takes the grab, then we need to ensure that there's no grab by trying to get one.
122+ We only care about keyboard here, since pointer grabs don't affect us in general.
123+
124+2014-06-23 Chris Townsend <christopher.townsend@canonical.com>
125+
126+ Added changelog entry for lp:1309739.
127+
128+2014-06-23 Chris Townsend <christopher.townsend@canonical.com>
129+
130+ Fix issue where scaling the edge illumination up and down with the size of the Launcher icons would cause the illumination border to be offset and smaller than the icon.
131+
132+2014-06-23 Chris Townsend <christopher.townsend@canonical.com>
133+
134+ Added changelog entry for lp:1308288.
135+
136+2014-06-23 Brandon Schaefer <brandon.schaefer@canonical.com>
137+
138+ Lockscreen warning icon needs a tooltip to say what the warning is about!
139+
140+2014-06-19 Chris Townsend <christopher.townsend@canonical.com>
141+
142+ Added changelog entry for lp:1308323.
143+
144+2014-06-19 Brandon Schaefer <brandon.schaefer@canonical.com>
145+
146+ ShutdownView: Scale up the Buttons and Text plus Borders of the UnityWindowView.
147+
148+2014-06-19 Chris Townsend <christopher.townsend@canonical.com>
149+
150+ Added changelog entry for lp:1307738.
151+
152+2014-06-19 Brandon Schaefer <brandon.schaefer@canonical.com>
153+
154+ TextInput: move the warning icon inside the input field, render it white
155+
156+2014-06-19 Chris Townsend <christopher.townsend@canonical.com>
157+
158+ Added changelog entry for lp:607796.
159+
160+2014-06-19 Marco Trevisan (Treviño) <marco.trevisan@canonical.com>
161+
162+ ApplicationLauncherIcon: Focus and, in case, Spread the windows on DnD
163+
164+ After 1 second that an user is over an icon, that icon should focus the relative
165+ application and Spread its windows if it has more than one opened.
166+
167+ Correctly handle the DnD scale in launcher, and apply glow to the icon under pointer.
168+
169+2014-06-19 Chris Townsend <christopher.townsend@canonical.com>
170+
171+ Added changelog entry for lp:1304882.
172+
173+2014-06-19 Alfred Neumayer <alfred.neumayer.g1@gmail.com>
174+
175+ Restore the launcher position by reversing the animation and unsetting the DND_PUSHED_OFF quirk.
176+
177+2014-06-19 Chris Townsend <christopher.townsend@canonical.com>
178+
179+ Added changelog for #1313280.
180+
181+2014-06-19 Marco Trevisan (Treviño) <marco.trevisan@canonical.com>
182+
183+ UnityScreen: always paint the lockscreen above, just add menu and onboard as exceptions
184+
185+ Some code cleanup, factorizing similar code.
186+
187+2014-06-06 Chris Townsend <christopher.townsend@canonical.com>
188+
189+ Modify debian/changleog to match what's in distro since a branch to fix a bug was not actually included in the Trusty SRU.
190+
191+2014-05-13 CI bot <ps-jenkins@lists.canonical.com>
192+
193+ Releasing 7.2.1+14.04.20140513-0ubuntu1
194+
195+2014-05-13 Stephen M. Webb <stephen.webb@canonical.com>
196+
197+ released upstream micro-release 7.2.1 Fixes: 1221673, 1251193, 1291461, 1307748, 1312749, 1313280, 1317276
198+
199+2014-05-13 Stephen M. Webb <stephen.webb@canonical.com>
200+
201+ release Unity 7.2.1
202+
203 2014-05-13 Stephen M. Webb <stephen.webb@canonical.com>
204
205 debian/changelog: updated with additional lockscreen changes
206
207=== modified file 'debian/changelog'
208--- debian/changelog 2014-07-03 15:41:15 +0000
209+++ debian/changelog 2014-07-03 15:41:16 +0000
210@@ -1,4 +1,4 @@
211-unity (7.2.1+14.04.20140513-0ubuntu3) trusty; urgency=medium
212+unity (7.2.2-0ubuntu1) UNRELEASED; urgency=medium
213
214 [ Alfred Neumayer ]
215 * Restore the launcher position by reversing the animation and
216@@ -44,6 +44,7 @@
217 is opened. (LP: #1283775)
218 * Fix issue where the Panel shadow would get drawn over drop down
219 windows in full screen windows. (LP: #1316005)
220+ * Bump upstream release to 7.2.2.
221
222 [ Andrea Azzarone ]
223 * Clear the clipboard when locking the screen. (LP: #1308911)

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: