Merge lp:~timo-jyrinki/ubuntu/raring/gnome-settings-daemon/ubuntu.fix1058004 into lp:ubuntu/raring/gnome-settings-daemon

[Timo Jyrinki]

* debian/patches/migrate_metacity_keys.patch:
  - Migrate screenshot/terminal keys from metacity gconf as well
    (LP: #1058004)

Now that the (duplicate) keys were removed from org.compiz.integrated, they'd still need migrating from metacity settings. This branch does that.

[Iain Lane (laney)]

I merged this into the ubuntu-desktop branch lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu (yes, that's confusing and irritating) and uploaded. Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-06 19:31:20 +0000
+++ debian/changelog	2012-12-13 07:46:20 +0000
@@ -1,3 +1,11 @@
+gnome-settings-daemon (3.6.3-0ubuntu4) UNRELEASED; urgency=low
+
+  * debian/patches/migrate_metacity_keys.patch:
+    - Migrate screenshot/terminal keys from metacity gconf as well
+      (LP: #1058004)
+
+ -- Timo Jyrinki <[e-mail]>  Thu, 13 Dec 2012 08:49:24 +0200
+
 gnome-settings-daemon (3.6.3-0ubuntu3) raring; urgency=low
 
   * debian/control.in: 

=== added file 'debian/patches/migrate_metacity_keys.patch'
--- debian/patches/migrate_metacity_keys.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/migrate_metacity_keys.patch	2012-12-13 07:46:20 +0000
@@ -0,0 +1,15 @@
+Description: Migrate screenshot/terminal keys from metacity gconf as well
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1058004
+
+--- gnome-settings-daemon/data/gnome-settings-daemon.convert.old	2012-10-02 08:50:01.384413000 +0300
++++ gnome-settings-daemon/data/gnome-settings-daemon.convert	2012-10-02 09:05:22.243096198 +0300
+@@ -61,6 +61,9 @@
+ volume-mute = /apps/gnome_settings_daemon/keybindings/volume_mute
+ volume-up = /apps/gnome_settings_daemon/keybindings/volume_up
+ www = /apps/gnome_settings_daemon/keybindings/www
++screenshot = /apps/metacity/global_keybindings/run_command_screenshot
++window-screenshot = /apps/metacity/global_keybindings/run_command_window_screenshot
++terminal = /apps/metacity/global_keybindings/run_command_terminal
+ 
+ [org.gnome.settings-daemon.plugins.mouse]
+ active = /apps/gnome_settings_daemon/plugins/mouse/active

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-11-26 16:28:45 +0000
+++ debian/patches/series	2012-12-13 07:46:20 +0000
@@ -20,3 +20,4 @@
 power-no-fallback-notifications.patch
 power-check-null-devices.patch
 revert_new_ibus_use.patch
+migrate_metacity_keys.patch