Merge lp:~timo-jyrinki/ubuntu/quantal/gnome-settings-daemon/ubuntu.fix1058004 into lp:ubuntu/quantal/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, tested for the terminal key with gsettings-data-convert --verbose --file /usr/share/GConf/gsettings/gnome-settings-daemon.convert.

[Jamie Strandboge (jdstrand)]

Thanks for the patch! I think this is worthwhile, but probably too late for 12.10 release. Since this only affects upgrades, an SRU is appropriate. Please update the bug following https://wiki.ubuntu.com/StableReleaseUpdates. Once that is done, please update this merge request to use 'quantal-proposed' instead of UNRELEASED.

review: Needs Fixing

[Didier Roche (didrocks)]

Hey Timo, I'm asking it to be removed from the sponsoring list for now. I think it's worthwhile for a SRU, can you please handle getting that into raring first, and make the bug SRUable (same procedure than for unity).

Thanks!

Unmerged revisions

230. By Timo Jyrinki on 2012-10-02

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

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-28 21:04:37 +0000
+++ debian/changelog	2012-10-02 07:43:24 +0000
@@ -1,3 +1,11 @@
+gnome-settings-daemon (3.4.2-0ubuntu15) UNRELEASED; urgency=low
+
+  * debian/patches/migrate_metacity_keys.patch:
+    - Migrate screenshot/terminal keys from metacity gconf as well
+      (LP: #1058004)
+
+ -- Timo Jyrinki <[e-mail]>  Tue, 02 Oct 2012 09:42:56 +0300
+
 gnome-settings-daemon (3.4.2-0ubuntu14) quantal; urgency=low
 
   * debian/patches/git_power_dbus_path.patch:

=== 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-10-02 07:43:24 +0000
@@ -0,0 +1,12 @@
+--- 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-09-28 21:04:37 +0000
+++ debian/patches/series	2012-10-02 07:43:24 +0000
@@ -30,3 +30,4 @@
 git_better_xi_handling.patch
 git_new_cups_build.patch
 git_power_dbus_path.patch
+migrate_metacity_keys.patch