diff -Nru compiz-0.9.7.0~bzr2995/debian/changelog compiz-0.9.7.0~bzr2995/debian/changelog
--- compiz-0.9.7.0~bzr2995/debian/changelog	2012-02-17 09:01:12.000000000 +0000
+++ compiz-0.9.7.0~bzr2995/debian/changelog	2012-02-23 15:37:44.000000000 +0000
@@ -1,3 +1,21 @@
+compiz (1:0.9.7.0~bzr2995-0ubuntu5) precise; urgency=low
+
+  * Change some keybindings as per design (LP: #878820, #891757, #751050)
+    debian/patches/ubuntu-config.patch:
+    - Show desktop is now Super + d
+    - Super + Up maximize the window
+    - Super + Down restore the window
+    - Super + W initiate scale for all windows on current ws
+    - Control + Alt + NumPad 5 is used to switch/restore maximize state
+    - Control + Alt + NumPad 0 is used to minimize current window
+    - Ensure we don't have any conficting keys anymore (LP: #922354)
+  * 01_ctrl_alt_*tea*.patch:
+    - Merged into ubuntu-config.patch, no reason to keep it separated
+  * debian/compiz-gnome.gconf-defaults, debian/rules, debian/unity.ini:
+    - Set the new plugin order with the incoming unity change as the default
+
+ -- Didier Roche <didrocks@ubuntu.com>  Wed, 22 Feb 2012 13:44:25 +0100
+
 compiz (1:0.9.7.0~bzr2995-0ubuntu4) precise; urgency=low
 
   * debian/patches/fix_925293.patch:
diff -Nru compiz-0.9.7.0~bzr2995/debian/compiz-gnome.gconf-defaults compiz-0.9.7.0~bzr2995/debian/compiz-gnome.gconf-defaults
--- compiz-0.9.7.0~bzr2995/debian/compiz-gnome.gconf-defaults	2012-02-17 09:01:12.000000000 +0000
+++ compiz-0.9.7.0~bzr2995/debian/compiz-gnome.gconf-defaults	2012-02-23 15:37:44.000000000 +0000
@@ -4,6 +4,6 @@
 /apps/gwd/blur_type							all
 /apps/gwd/metacity_theme_opacity					1.0
 /apps/gwd/metacity_theme_shade_opacity					true
-/apps/compizconfig-1/profiles/unity/general/screen0/options/active_plugins [core,composite,opengl,decor,mousepoll,vpswitch,regex,animation,snap,expo,move,compiztoolbox,place,grid,imgpng,gnomecompat,wall,ezoom,workarounds,resize,fade,unitymtgrabhandles,scale,session,unityshell]
+/apps/compizconfig-1/profiles/unity/general/screen0/options/active_plugins [core,composite,opengl,compiztoolbox,decor,vpswitch,snap,mousepoll,resize,place,move,wall,grid,regex,imgpng,session,gnomecompat,animation,fade,unitymtgrabhandles,workarounds,scale,expo,ezoom,unityshell]
 /apps/compizconfig-1/profiles/unity/plugins/gnomecompat/screen0/options/main_menu_key ""
 /apps/compizconfig-1/profiles/unity/plugins/gnomecompat/screen0/options/run_key ""
diff -Nru compiz-0.9.7.0~bzr2995/debian/patches/series compiz-0.9.7.0~bzr2995/debian/patches/series
--- compiz-0.9.7.0~bzr2995/debian/patches/series	2012-02-17 09:01:12.000000000 +0000
+++ compiz-0.9.7.0~bzr2995/debian/patches/series	2012-02-23 15:37:44.000000000 +0000
@@ -1,4 +1,3 @@
-01_ctrl_alt_*tea*.patch
 ubuntu-config.patch
 ccp_plugin.patch
 workaround_broken_drivers.patch
diff -Nru compiz-0.9.7.0~bzr2995/debian/patches/ubuntu-config.patch compiz-0.9.7.0~bzr2995/debian/patches/ubuntu-config.patch
--- compiz-0.9.7.0~bzr2995/debian/patches/ubuntu-config.patch	2012-02-17 09:01:12.000000000 +0000
+++ compiz-0.9.7.0~bzr2995/debian/patches/ubuntu-config.patch	2012-02-23 15:37:44.000000000 +0000
@@ -1,8 +1,8 @@
 === modified file 'metadata/core.xml.in'
-Index: compiz-0.9.7.0/metadata/core.xml.in
+Index: compiz-0.9.7.0~bzr2995/metadata/core.xml.in
 ===================================================================
---- compiz-0.9.7.0.orig/metadata/core.xml.in	2012-01-24 18:43:48.000000000 +0800
-+++ compiz-0.9.7.0/metadata/core.xml.in	2012-01-24 20:22:44.280786463 +0800
+--- compiz-0.9.7.0~bzr2995.orig/metadata/core.xml.in	2012-02-09 16:32:07.000000000 +0100
++++ compiz-0.9.7.0~bzr2995/metadata/core.xml.in	2012-02-22 17:50:56.282923343 +0100
 @@ -138,7 +138,7 @@
  			<option name="focus_prevention_match" type="match">
  			<_short>Focus Prevention Windows</_short>
@@ -12,7 +12,39 @@
  			</option>
  		</group>
  		<group>
-@@ -244,14 +244,14 @@
+@@ -173,7 +173,7 @@
+ 			<option name="minimize_window_key" type="key">
+ 			<_short>Minimize Window</_short>
+ 			<_long>Minimize active window</_long>
+-			<default>&lt;Alt&gt;F9</default>
++			<default>&lt;Control&gt;&lt;Alt&gt;KP_0</default>
+ 			</option>
+ 			<option name="minimize_window_button" type="button">
+ 			<_short>Minimize Window</_short>
+@@ -182,12 +182,12 @@
+ 			<option name="maximize_window_key" type="key">
+ 			<_short>Maximize Window</_short>
+ 			<_long>Maximize active window</_long>
+-			<default>&lt;Alt&gt;F10</default>
++			<default>&lt;Super&gt;Up</default>
+ 			</option>
+ 			<option name="unmaximize_window_key" type="key">
+ 			<_short>Unmaximize Window</_short>
+ 			<_long>Unmaximize active window</_long>
+-			<default>&lt;Alt&gt;F5</default>
++			<default>&lt;Super&gt;Down</default>
+ 			</option>
+ 			<option name="maximize_window_horizontally_key" type="key">
+ 			<_short>Maximize Window Horizontally</_short>
+@@ -220,6 +220,7 @@
+ 			<option name="toggle_window_maximized_key" type="key">
+ 			<_short>Toggle Window Maximized</_short>
+ 			<_long>Toggle active window maximized</_long>
++            <default>&lt;Control&gt;&lt;Alt&gt;KP_5</default>
+ 			</option>
+ 			<option name="toggle_window_maximized_button" type="button">
+ 			<_short>Toggle Window Maximized</_short>
+@@ -244,14 +245,14 @@
  			<option name="hsize" type="int">
  			<_short>Horizontal Virtual Size</_short>
  			<_long>Screen size multiplier for horizontal virtual size</_long>
@@ -29,10 +61,10 @@
  			<min>1</min>
  			<max>32</max>
  			</option>
-Index: compiz-0.9.7.0/plugins/fade/fade.xml.in
+Index: compiz-0.9.7.0~bzr2995/plugins/fade/fade.xml.in
 ===================================================================
---- compiz-0.9.7.0.orig/plugins/fade/fade.xml.in	2012-01-24 18:43:48.000000000 +0800
-+++ compiz-0.9.7.0/plugins/fade/fade.xml.in	2012-01-24 20:22:44.280786463 +0800
+--- compiz-0.9.7.0~bzr2995.orig/plugins/fade/fade.xml.in	2012-02-09 16:32:07.000000000 +0100
++++ compiz-0.9.7.0~bzr2995/plugins/fade/fade.xml.in	2012-02-22 17:47:03.465768869 +0100
 @@ -9,6 +9,7 @@
  	    </requirement>
  	    <relation type="after">
@@ -50,10 +82,10 @@
  	    </option>
  	    <option name="visual_bell" type="bell">
  		<_short>Visual Bell</_short>
-Index: compiz-0.9.7.0/plugins/place/place.xml.in
+Index: compiz-0.9.7.0~bzr2995/plugins/place/place.xml.in
 ===================================================================
---- compiz-0.9.7.0.orig/plugins/place/place.xml.in	2012-01-24 18:43:48.000000000 +0800
-+++ compiz-0.9.7.0/plugins/place/place.xml.in	2012-01-24 20:22:44.280786463 +0800
+--- compiz-0.9.7.0~bzr2995.orig/plugins/place/place.xml.in	2012-02-09 16:32:07.000000000 +0100
++++ compiz-0.9.7.0~bzr2995/plugins/place/place.xml.in	2012-02-22 17:47:03.473768903 +0100
 @@ -19,8 +19,8 @@
  	    <option name="mode" type="int">
  		<_short>Placement Mode</_short>
@@ -65,10 +97,10 @@
  		<max>5</max>
  		<desc>
  		    <value>0</value>
-Index: compiz-0.9.7.0/plugins/resize/resize.xml.in
+Index: compiz-0.9.7.0~bzr2995/plugins/resize/resize.xml.in
 ===================================================================
---- compiz-0.9.7.0.orig/plugins/resize/resize.xml.in	2012-01-24 18:43:48.000000000 +0800
-+++ compiz-0.9.7.0/plugins/resize/resize.xml.in	2012-01-24 20:22:44.280786463 +0800
+--- compiz-0.9.7.0~bzr2995.orig/plugins/resize/resize.xml.in	2012-02-09 16:32:07.000000000 +0100
++++ compiz-0.9.7.0~bzr2995/plugins/resize/resize.xml.in	2012-02-22 17:47:03.473768903 +0100
 @@ -28,7 +28,7 @@
  	    <option name="mode" type="int">
  		<_short>Default Resize Mode</_short>
@@ -106,10 +138,10 @@
  		</default>
  	    </option>
  	    <subgroup>
-Index: compiz-0.9.7.0/plugins/scale/scale.xml.in
+Index: compiz-0.9.7.0~bzr2995/plugins/scale/scale.xml.in
 ===================================================================
---- compiz-0.9.7.0.orig/plugins/scale/scale.xml.in	2012-01-24 18:43:48.000000000 +0800
-+++ compiz-0.9.7.0/plugins/scale/scale.xml.in	2012-01-24 20:22:44.280786463 +0800
+--- compiz-0.9.7.0~bzr2995.orig/plugins/scale/scale.xml.in	2012-02-09 16:32:07.000000000 +0100
++++ compiz-0.9.7.0~bzr2995/plugins/scale/scale.xml.in	2012-02-22 17:47:03.473768903 +0100
 @@ -18,14 +18,14 @@
  			<option name="spacing" type="int">
  				<_short>Spacing</_short>
@@ -190,10 +222,10 @@
  			</option>
  	    </group>
  	</options>
-Index: compiz-0.9.7.0/plugins/decor/decor.xml.in
+Index: compiz-0.9.7.0~bzr2995/plugins/decor/decor.xml.in
 ===================================================================
---- compiz-0.9.7.0.orig/plugins/decor/decor.xml.in	2012-01-24 18:43:48.000000000 +0800
-+++ compiz-0.9.7.0/plugins/decor/decor.xml.in	2012-01-24 20:26:17.573844132 +0800
+--- compiz-0.9.7.0~bzr2995.orig/plugins/decor/decor.xml.in	2012-02-09 16:32:07.000000000 +0100
++++ compiz-0.9.7.0~bzr2995/plugins/decor/decor.xml.in	2012-02-22 17:47:03.473768903 +0100
 @@ -100,6 +100,7 @@
  	    <option name="command" type="string">
  		<_short>Command</_short>
@@ -202,3 +234,15 @@
  	    </option>
  	    <option name="mipmap" type="bool">
  		<_short>Mipmap</_short>
+Index: compiz-0.9.7.0~bzr2995/plugins/gnomecompat/gnomecompat.xml.in
+===================================================================
+--- compiz-0.9.7.0~bzr2995.orig/plugins/gnomecompat/gnomecompat.xml.in	2012-02-09 16:32:07.000000000 +0100
++++ compiz-0.9.7.0~bzr2995/plugins/gnomecompat/gnomecompat.xml.in	2012-02-22 17:47:03.473768903 +0100
+@@ -52,6 +52,7 @@
+ 		<option name="run_command_terminal_key" type="key">
+ 		    <_short>Open a terminal</_short>
+ 		    <_long>Open a terminal</_long>
++		    <default>&lt;Control&gt;&lt;Alt&gt;T</default>
+ 		</option>
+ 	    </group>
+ 	</options>
diff -Nru compiz-0.9.7.0~bzr2995/debian/rules compiz-0.9.7.0~bzr2995/debian/rules
--- compiz-0.9.7.0~bzr2995/debian/rules	2012-02-17 09:01:12.000000000 +0000
+++ compiz-0.9.7.0~bzr2995/debian/rules	2012-02-23 15:37:44.000000000 +0000
@@ -8,7 +8,7 @@
 
 # generated via:
 #  python -c "import compizconfig; print ','.join(compizconfig.Context().Plugins['core'].Display['active_plugins'].Value)"
-DEFAULT_PLUGINS = "core composite opengl decor mousepoll vpswitch regex animation snap expo move compiztoolbox place grid imgpng gnomecompat wall ezoom workarounds staticswitcher resize fade scale session"
+DEFAULT_PLUGINS = "core composite opengl compiztoolbox decor vpswitch snap mousepoll resize place move wall grid regex imgpng session gnomecompat animation fade unitymtgrabhandles workarounds scale expo ezoom"
 
 override_dh_auto_configure:
 	# currently, segfault if CMAKE_BUILD_TYPE=Release
diff -Nru compiz-0.9.7.0~bzr2995/debian/unity.ini compiz-0.9.7.0~bzr2995/debian/unity.ini
--- compiz-0.9.7.0~bzr2995/debian/unity.ini	2012-02-17 09:01:12.000000000 +0000
+++ compiz-0.9.7.0~bzr2995/debian/unity.ini	2012-02-23 15:37:44.000000000 +0000
@@ -1,3 +1,3 @@
 [core]
-s0_active_plugins = core;composite;opengl;decor;mousepoll;vpswitch;regex;animation;snap;expo;move;compiztoolbox;place;grid;imgpng;gnomecompat;wall;ezoom;workarounds;resize;fade;unitymtgrabhandles;scale;session;unityshell
+s0_active_plugins = core;composite;opengl;compiztoolbox;decor;vpswitch;snap;mousepoll;resize;place;move;wall;grid;regex;imgpng;session;gnomecompat;animation;fade;unitymtgrabhandles;workarounds;scale;expo;ezoom;unityshell