Merge lp:~sil2100/unity-2d/oneiric-security into lp:unity-2d/4.0

Proposed by Łukasz Zemczak on 2012-06-13
Status: Merged
Approved by: Gerry Boland on 2012-06-14
Approved revision: 753
Merged at revision: 751
Proposed branch: lp:~sil2100/unity-2d/oneiric-security
Merge into: lp:unity-2d/4.0
Diff against target: 29 lines (+8/-3)
2 files modified
debian/changelog (+7/-1)
panel/applets/appname/windowhelper.cpp (+1/-2)
To merge this branch: bzr merge lp:~sil2100/unity-2d/oneiric-security
Reviewer Review Type Date Requested Status
Gerry Boland (community) 2012-06-13 Approve on 2012-06-14
Review via email: mp+110117@code.launchpad.net

Commit message

releasing version 4.12.0-0ubuntu1.2
Cherry-picked from unity-2d 5.0 trunk (rev 1119): [panel] Use the correct event timestamp when closing an application window.
Also corrected the versioning history.

Description of the change

Backported a patch from 5.0 for the needs of a -security update.

This batch of changes also corrects the versioning (since ubuntu2 was never released, just ubuntu1.1 in oneiric-updates). I changes the changelog accordingly as well.

It would be best not to merge it in but just pull/push, but I am not a member of unity-2d-team (sadly)...

To post a comment you must log in.
Gerry Boland (gerboland) wrote :

I'm a little worried about your changing the version number. Is 4.12.0-0ubuntu1.2 > 4.12.0-0ubuntu2 ?

Łukasz Zemczak (sil2100) wrote :

No, but ubuntu2 never got released anywhere. It's an unused version. Here's the detailed story:

4.12.0-0ubuntu1.1 and 4.12.0-0ubuntu2 were basically the same thing. The only difference was that ubuntu1.1 was ubuntu1 + quilt patch of ubuntu2 bugfix. But ubuntu1.1 was not versioned anywhere (no bzr branch for that) - since it's just ubuntu1 with this one quilt patch added. ubuntu2, on the other hand, is the very same patch but merged into the source tree directly. And it was not released anywhere, just pushed to the branch. Since this provides a 'conflict' (since ugh, two distinct version numbers with the same fix? That's wrong) me and Didier decided that ubuntu2 is not the right way of versioning.

And since ubuntu2 is not packaged, well, we decided to get rid of it and exchange it to ubuntu1.1 and add our fix as ubuntu1.2.

Gerry Boland (gerboland) wrote :

Ok, that makes sense. Approving! Many thanks

review: Approve

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 2011-11-23 14:07:56 +0000
3+++ debian/changelog 2012-06-13 17:25:45 +0000
4@@ -1,4 +1,10 @@
5-unity-2d (4.12.0-0ubuntu2) precise; urgency=low
6+unity-2d (4.12.0-0ubuntu1.2) oneiric-security; urgency=low
7+
8+ * Fix issue with dropdown boxes on sites stop working (LP: #1010466)
9+
10+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com> Wed, 13 Jun 2012 18:36:00 +0200
11+
12+unity-2d (4.12.0-0ubuntu1.1) oneiric-updates; urgency=low
13
14 * Enable accessibility at startup, disable it for started applications
15 (LP: #877358)
16
17=== modified file 'panel/applets/appname/windowhelper.cpp'
18--- panel/applets/appname/windowhelper.cpp 2011-09-27 11:57:06 +0000
19+++ panel/applets/appname/windowhelper.cpp 2012-06-13 17:25:45 +0000
20@@ -149,8 +149,7 @@
21
22 void WindowHelper::close()
23 {
24- guint32 timestamp = QDateTime::currentDateTime().toTime_t();
25- wnck_window_close(d->m_window, timestamp);
26+ wnck_window_close(d->m_window, QX11Info::appTime());
27 }
28
29 void WindowHelper::minimize()

Subscribers

People subscribed via source and target branches

to all changes: