compiz team mailing list archive
-
compiz team
-
Mailing list archive
-
Message #31928
[Merge] lp:~vanvugt/compcomm-plugins-main/fix-977743 into lp:~compiz/compcomm-plugins-main/ubuntu
Daniel van Vugt has proposed merging lp:~vanvugt/compcomm-plugins-main/fix-977743 into lp:~compiz/compcomm-plugins-main/ubuntu.
Requested reviews:
compiz packagers (compiz)
Related bugs:
Bug #977743 in compiz-plugins-main (Ubuntu): "Ubuntu 12.04: Tooltips fade in, not out. And menus fade out, but not in."
https://bugs.launchpad.net/ubuntu/+source/compiz-plugins-main/+bug/977743
For more details, see:
https://code.launchpad.net/~vanvugt/compcomm-plugins-main/fix-977743/+merge/101339
Fix typos in animation.xml.in causing mismatched animations of menus and
tooltips (LP: #977743)
Fixed:
* Menus: No open animation, but fade out on close.
* Tooltips: No close animation, but fade in on open.
--
https://code.launchpad.net/~vanvugt/compcomm-plugins-main/fix-977743/+merge/101339
Your team compiz packagers is requested to review the proposed merge of lp:~vanvugt/compcomm-plugins-main/fix-977743 into lp:~compiz/compcomm-plugins-main/ubuntu.
=== modified file 'debian/patches/ubuntu_config.patch'
--- debian/patches/ubuntu_config.patch 2012-04-02 08:21:51 +0000
+++ debian/patches/ubuntu_config.patch 2012-04-10 07:25:22 +0000
@@ -1,18 +1,16 @@
-Index: compiz-plugins-main-0.9.7.0~bzr19/animation/animation.xml.in
+Index: compiz-plugins-main-0.9.7.0/animation/animation.xml.in
===================================================================
---- compiz-plugins-main-0.9.7.0~bzr19.orig/animation/animation.xml.in 2012-02-09 17:53:27.000000000 +0100
-+++ compiz-plugins-main-0.9.7.0~bzr19/animation/animation.xml.in 2012-03-28 09:13:23.188188386 +0200
-@@ -35,8 +35,8 @@
+--- compiz-plugins-main-0.9.7.0.orig/animation/animation.xml.in 2012-04-10 14:26:17.604787000 +0800
++++ compiz-plugins-main-0.9.7.0/animation/animation.xml.in 2012-04-10 14:29:56.469176555 +0800
+@@ -35,7 +35,7 @@
<extensible/>
<sort start="2"/>
<default>
- <value>animation:Zoom</value>
-- <value>animation:Fade</value>
+ <value>animation:Glide 2</value>
-+ <value>animation:None</value>
+ <value>animation:Fade</value>
<value>animation:Fade</value>
</default>
- </option>
@@ -47,9 +47,9 @@
<min>50</min>
<max>4000</max>
@@ -37,18 +35,15 @@
<value>(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd)</value>
</default>
</option>
-@@ -101,9 +101,9 @@
+@@ -101,7 +101,7 @@
<extensible/>
<sort start="2"/>
<default>
- <value>animation:Zoom</value>
-- <value>animation:Fade</value>
+ <value>animation:Glide 2</value>
<value>animation:Fade</value>
-+ <value>animation:None</value>
+ <value>animation:Fade</value>
</default>
- </option>
- <option name="close_durations" type="list">
@@ -113,9 +113,9 @@
<min>50</min>
<max>4000</max>
@@ -145,10 +140,10 @@
<min>0</min>
<max>1</max>
<precision>0.01</precision>
-Index: compiz-plugins-main-0.9.7.0~bzr19/staticswitcher/staticswitcher.xml.in
+Index: compiz-plugins-main-0.9.7.0/staticswitcher/staticswitcher.xml.in
===================================================================
---- compiz-plugins-main-0.9.7.0~bzr19.orig/staticswitcher/staticswitcher.xml.in 2012-02-09 17:53:27.000000000 +0100
-+++ compiz-plugins-main-0.9.7.0~bzr19/staticswitcher/staticswitcher.xml.in 2012-03-28 09:13:23.188188386 +0200
+--- compiz-plugins-main-0.9.7.0.orig/staticswitcher/staticswitcher.xml.in 2012-04-10 14:26:17.604787000 +0800
++++ compiz-plugins-main-0.9.7.0/staticswitcher/staticswitcher.xml.in 2012-04-10 14:26:17.604787000 +0800
@@ -10,7 +10,6 @@
<relation type="after">
<plugin>composite</plugin>
@@ -225,10 +220,10 @@
<desc>
<value>0</value>
<_name>None</_name>
-Index: compiz-plugins-main-0.9.7.0~bzr19/vpswitch/vpswitch.xml.in
+Index: compiz-plugins-main-0.9.7.0/vpswitch/vpswitch.xml.in
===================================================================
---- compiz-plugins-main-0.9.7.0~bzr19.orig/vpswitch/vpswitch.xml.in 2012-02-09 17:53:27.000000000 +0100
-+++ compiz-plugins-main-0.9.7.0~bzr19/vpswitch/vpswitch.xml.in 2012-03-28 09:13:23.188188386 +0200
+--- compiz-plugins-main-0.9.7.0.orig/vpswitch/vpswitch.xml.in 2012-04-10 14:26:17.604787000 +0800
++++ compiz-plugins-main-0.9.7.0/vpswitch/vpswitch.xml.in 2012-04-10 14:26:17.604787000 +0800
@@ -95,13 +95,11 @@
<option name="next_button" type="button">
<_short>Move Next</_short>
@@ -243,10 +238,10 @@
<internal/>
</option>
<option name="initiate_button" type="button">
-Index: compiz-plugins-main-0.9.7.0~bzr19/wall/wall.xml.in
+Index: compiz-plugins-main-0.9.7.0/wall/wall.xml.in
===================================================================
---- compiz-plugins-main-0.9.7.0~bzr19.orig/wall/wall.xml.in 2012-02-09 17:53:27.000000000 +0100
-+++ compiz-plugins-main-0.9.7.0~bzr19/wall/wall.xml.in 2012-03-28 09:13:23.188188386 +0200
+--- compiz-plugins-main-0.9.7.0.orig/wall/wall.xml.in 2012-04-10 14:26:17.604787000 +0800
++++ compiz-plugins-main-0.9.7.0/wall/wall.xml.in 2012-04-10 14:26:17.604787000 +0800
@@ -31,12 +31,12 @@
<option name="miniscreen" type="bool">
<_short>Show Live Viewport Previews</_short>
@@ -394,10 +389,10 @@
</option>
<option name="edgeflip_dnd" type="bool">
<_short>Edge Flip DnD</_short>
-Index: compiz-plugins-main-0.9.7.0~bzr19/grid/grid.xml.in
+Index: compiz-plugins-main-0.9.7.0/grid/grid.xml.in
===================================================================
---- compiz-plugins-main-0.9.7.0~bzr19.orig/grid/grid.xml.in 2012-02-09 17:53:27.000000000 +0100
-+++ compiz-plugins-main-0.9.7.0~bzr19/grid/grid.xml.in 2012-03-28 09:13:23.188188386 +0200
+--- compiz-plugins-main-0.9.7.0.orig/grid/grid.xml.in 2012-04-10 14:26:17.604787000 +0800
++++ compiz-plugins-main-0.9.7.0/grid/grid.xml.in 2012-04-10 14:26:17.604787000 +0800
@@ -23,17 +23,16 @@
<option name="put_center_key" type="key">
<_short>Put Center</_short>
@@ -426,10 +421,10 @@
</option>
<option name="put_restore_key" type="key">
<_short>Restore</_short>
-Index: compiz-plugins-main-0.9.7.0~bzr19/ezoom/ezoom.xml.in
+Index: compiz-plugins-main-0.9.7.0/ezoom/ezoom.xml.in
===================================================================
---- compiz-plugins-main-0.9.7.0~bzr19.orig/ezoom/ezoom.xml.in 2012-02-09 17:53:27.000000000 +0100
-+++ compiz-plugins-main-0.9.7.0~bzr19/ezoom/ezoom.xml.in 2012-03-28 09:14:04.132391405 +0200
+--- compiz-plugins-main-0.9.7.0.orig/ezoom/ezoom.xml.in 2012-04-10 14:26:17.604787000 +0800
++++ compiz-plugins-main-0.9.7.0/ezoom/ezoom.xml.in 2012-04-10 14:26:17.604787000 +0800
@@ -29,7 +29,6 @@
<option type="button" name="zoom_in_button">
<_short>Zoom In</_short>
