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

[Łukasz Zemczak]

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.

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)...

[Gerry Boland (gerboland)]

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

[Łukasz Zemczak (sil2100)]

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)]

Ok, that makes sense. Approving! Many thanks

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-23 14:07:56 +0000
+++ debian/changelog	2012-06-13 17:25:45 +0000
@@ -1,4 +1,10 @@
-unity-2d (4.12.0-0ubuntu2) precise; urgency=low
+unity-2d (4.12.0-0ubuntu1.2) oneiric-security; urgency=low
+
+  * Fix issue with dropdown boxes on sites stop working (LP: #1010466)
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Wed, 13 Jun 2012 18:36:00 +0200
+
+unity-2d (4.12.0-0ubuntu1.1) oneiric-updates; urgency=low
 
   * Enable accessibility at startup, disable it for started applications
     (LP: #877358)

=== modified file 'panel/applets/appname/windowhelper.cpp'
--- panel/applets/appname/windowhelper.cpp	2011-09-27 11:57:06 +0000
+++ panel/applets/appname/windowhelper.cpp	2012-06-13 17:25:45 +0000
@@ -149,8 +149,7 @@
 
 void WindowHelper::close()
 {
-    guint32 timestamp = QDateTime::currentDateTime().toTime_t();
-    wnck_window_close(d->m_window, timestamp);
+    wnck_window_close(d->m_window, QX11Info::appTime());
 }
 
 void WindowHelper::minimize()