Merge lp:~townsend/compiz/fix-lp890747 into lp:compiz/0.9.11

[Christopher Townsend]

Ctrl-Alt-Del should open the gnome-system-monitor at the processes tab. This fix uses the commands plugin to override the default action. This includes:
 - Install the commands plugin by default.
 - Breaks/Replaces the compiz-plugins package for versions earlier than 0.9.10.
 - Patch commands.xml and integrated.xml to map gnome-system-monitor to Ctrl-Alt-Del by default.
 - Start the command plugin upon Compiz starting.

= Issue =
Currently, Ctrl-Alt-Del brings up the Lock/Logout dialog box. Design would like Ctrl-Alt-Del to instead bring up Gnome System Monitor with the processes tab open.

= Fix =
As proposed in the bug, using the commands plugin in Compiz can override Ctrl-Alt-Del in order to accomplish what Design wants. This MP does the following:
- Installs the commands plugin in the compiz-plugins-default package instead of the compiz-plugins package.
- Breaks/Replaces the compiz-plugins package for versions earlier than 0.9.10.
- Sets the gnome-system-monitor package as a Recommends for compiz-gnome.
- Modifies the commands.xml and integrated.xml to map Ctrl-Alt-Del to gnome-system-monitor using the ubuntu-config.patch file.
- Starts the commands plugin upon starting Compiz.

The mapping of Ctrl-Alt-Del to gnome-system-monitor is done in the last command slot so as to try to avoid any already existing command mappings a user may have. This is not guaranteed, but should cover almost all cases. If the user is using all slots, then they are quite advanced already and probably doesn't care about this:)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3784
http://jenkins.qa.ubuntu.com/job/compiz-ci/288/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/101/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/101/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/101/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/288/rebuild

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[MC Return (mc-return)]

The whole ubuntu-config.patch is just a nightmare...

Chris, thanks for following my suggestion with this MP. Approve !

This will make it much easier for anyone coming from W.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-autolanding/151/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-autolanding/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-autolanding/63/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-autolanding/63/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-autolanding/153/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-autolanding/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-autolanding/65/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-autolanding/65/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Found jenkins issue, re-approving.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-autolanding/157/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-autolanding/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-autolanding/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-autolanding/69/console

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Hmm, something wrong with the patch in this...

[lp:~townsend/compiz/fix-lp890747]

3785. By Christopher Townsend on 2013-08-30

Re-copied the patch output for the new patch files due to some unseen error in patching the files.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3785
http://jenkins.qa.ubuntu.com/job/compiz-ci/295/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/108

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/295/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/compiz-plugins-default.install'
--- debian/compiz-plugins-default.install	2013-02-26 16:48:27 +0000
+++ debian/compiz-plugins-default.install	2013-08-30 12:31:11 +0000
@@ -1,4 +1,5 @@
 debian/tmp/usr/*/compiz/*animation.*
+debian/tmp/usr/*/compiz/*commands.*
 debian/tmp/usr/*/compiz/*compiztoolbox.*
 debian/tmp/usr/*/compiz/*composite.*
 debian/tmp/usr/*/compiz/*copytex.*
 
=== modified file 'debian/compiz-plugins.install'
--- debian/compiz-plugins.install	2013-02-26 16:48:27 +0000
+++ debian/compiz-plugins.install	2013-08-30 12:31:11 +0000
@@ -2,7 +2,6 @@
 debian/tmp/usr/*/compiz/*annotate.*
 debian/tmp/usr/*/compiz/*bench.*
 debian/tmp/usr/*/compiz/*clone.*
-debian/tmp/usr/*/compiz/*commands.*
 debian/tmp/usr/*/compiz/*crashhandler.*
 debian/tmp/usr/*/compiz/*cube.*
 debian/tmp/usr/*/compiz/*cubeaddon.*
 
=== modified file 'debian/control'
--- debian/control	2013-04-25 03:14:29 +0000
+++ debian/control	2013-08-30 12:31:11 +0000
@@ -144,7 +144,8 @@
          compiz-plugins-default (= ${binary:Version}),
          gsettings-desktop-schemas,
          gnome-settings-daemon (>= 3.4.2-0ubuntu9),
-Recommends: python-gconf
+Recommends: python-gconf,
+            gnome-system-monitor,
 Replaces: compiz-plugins-main (<= 1:0.9.8),
           compiz-plugins-main-default (<= 1:0.9.8),
           compizconfig-backend-gconf (<= 1:0.9.8),
@@ -167,7 +168,9 @@
          ${shlibs:Depends},
          ${misc:Depends},
 Replaces: compiz-plugins-main-default (<< 1:0.9.8),
+          compiz-plugins (<< 1:0.9.10),
 Breaks: compiz-plugins-main-default (<< 1:0.9.8),
+        compiz-plugins (<< 1:0.9.10),
 Description: OpenGL window and compositing manager - default plugins
  Compiz brings to life a variety of visual effects that make the Linux desktop
  easier to use, more powerful and intuitive, and more accessible for users
 
=== modified file 'debian/patches/ubuntu-config.patch'
--- debian/patches/ubuntu-config.patch	2013-07-23 23:30:23 +0000
+++ debian/patches/ubuntu-config.patch	2013-08-30 12:31:11 +0000
@@ -843,3 +843,44 @@
  		    </option>
  		    <option name="ground_color1" type="color">
  			<_short>Ground Color (near)</_short>
+--- a/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
++++ b/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml
+@@ -10,6 +10,9 @@
+ 	<key type="s" name="command-screenshot">
+ 	    <default>"gnome-screenshot"</default>
+ 	</key>
++	<key type="as" name="run-command-21">
++	    <default>["&lt;Control&gt;&lt;Alt&gt;Delete"]</default>
++	</key>
+ 	<key type="as" name="run-command-12">
+ 	    <default>["Disabled"]</default>
+ 	</key>
+@@ -46,6 +49,9 @@
+ 	<key type="as" name="run-command-1">
+ 	    <default>["Disabled"]</default>
+ 	</key>
++	<key type="s" name="command-21">
++	    <default>"/usr/bin/gnome-system-monitor -p"</default>
++	</key>
+ 	<key type="s" name="command-12">
+ 	    <default>""</default>
+ 	</key>
+--- a/plugins/commands/commands.xml.in
++++ b/plugins/commands/commands.xml.in
+@@ -117,7 +117,7 @@
+ 		<option name="command20" type="string">
+ 		    <_short>Command line 20</_short>
+ 		    <_long>Command line to be executed in shell when run_command20 is invoked</_long>
+-		    <default></default>
++		    <default>/usr/bin/gnome-system-monitor -p</default>
+ 		</option>
+ 	    </group>
+ 	    <group>
+@@ -205,6 +205,7 @@
+ 		<option name="run_command20_key" type="key">
+ 		    <_short>Run command 20</_short>
+ 		    <_long>A keybinding that when invoked, will run the shell command identified by command20</_long>
++		    <default>&lt;Control&gt;&lt;Alt&gt;Delete</default>
+ 		</option>
+ 	    </group>
+ 	    <group>
 
=== modified file 'debian/unity.ini'
--- debian/unity.ini	2013-02-19 15:22:31 +0000
+++ debian/unity.ini	2013-08-30 12:31:11 +0000
@@ -1,3 +1,3 @@
 [core]
-s0_active_plugins = core;composite;opengl;copytex;compiztoolbox;decor;vpswitch;snap;mousepoll;resize;place;move;wall;grid;regex;imgpng;session;gnomecompat;animation;fade;unitymtgrabhandles;workarounds;scale;expo;ezoom;unityshell
+s0_active_plugins = core;composite;opengl;copytex;compiztoolbox;decor;vpswitch;snap;mousepoll;resize;place;move;wall;grid;regex;imgpng;session;gnomecompat;animation;fade;unitymtgrabhandles;workarounds;scale;expo;ezoom;commands;unityshell