Merge lp:~timo-jyrinki/compiz/migrate-profile-independent into lp:compiz/0.9.8

[Timo Jyrinki]

Migrate profile independent keys separately from the profile dependent keys.

Migrate profile independent keys separately from the profile dependent keys. This is still needed to completely tackle LP: #1046190. We'll also need a patched gconf2 to support 's' -> 'as' conversions.

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3352
http://jenkins.qa.ubuntu.com/job/compiz-ci/66/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/66/console

review: Approve (continuous-integration)

[Didier Roche (didrocks)]

Looking good, see my comment on IRC for changes in the packaging needed.

Other than that, just to be picky:

240 + if not client:
241 + print "WARNING: no gconf client found. No transitionning will be done"
242 + return

-> I would rather sys.exit(1) to mark it not transitionned yet.

[lp:~timo-jyrinki/compiz/migrate-profile-independent]

3353. By Timo Jyrinki on 2012-09-11

return -> sys.exit(1)

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3353
http://jenkins.qa.ubuntu.com/job/compiz-ci/67/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/67/console

review: Approve (continuous-integration)

[Didier Roche (didrocks)]

Change done, packaging pushed. Approving

review: Approve

=== modified file 'postinst/convert-files/compiz-profile-Default.convert'
--- postinst/convert-files/compiz-profile-Default.convert	2012-09-05 23:25:21 +0000
+++ postinst/convert-files/compiz-profile-Default.convert	2012-09-11 08:14:21 +0000
@@ -108,63 +108,3 @@
 top-left-corner-action = /apps/compizconfig-1/profiles/Default/plugins/grid/screen0/options/top_left_corner_action
 top-right-corner-action = /apps/compizconfig-1/profiles/Default/plugins/grid/screen0/options/top_right_corner_action
 
-
-[org.compiz.integrated]
-run-command-terminal = /apps/metacity/global_keybindings/run_command_terminal
-run-command-screenshot = /apps/metacity/global_keybindings/run_command_screenshot
-run-command-window-screenshot = /apps/metacity/global_keybindings/run_command_window_screenshot
-panel-run-dialog = /apps/metacity/global_keybindings/panel_run_dialog
-panel-main-menu = /apps/metacity/global_keybindings/panel_main_menu
-
-
-[org.gnome.desktop.wm.keybindings]
-move-to-workspace-1 = /apps/metacity/window_keybindings/move_to_workspace_1
-move-to-workspace-2 = /apps/metacity/window_keybindings/move_to_workspace_2
-move-to-workspace-3 = /apps/metacity/window_keybindings/move_to_workspace_3
-move-to-workspace-4 = /apps/metacity/window_keybindings/move_to_workspace_4
-move-to-workspace-5 = /apps/metacity/window_keybindings/move_to_workspace_5
-move-to-workspace-6 = /apps/metacity/window_keybindings/move_to_workspace_6
-move-to-workspace-7 = /apps/metacity/window_keybindings/move_to_workspace_7
-move-to-workspace-8 = /apps/metacity/window_keybindings/move_to_workspace_8
-move-to-workspace-9 = /apps/metacity/window_keybindings/move_to_workspace_9
-move-to-workspace-10 = /apps/metacity/window_keybindings/move_to_workspace_10
-move-to-workspace-11 = /apps/metacity/window_keybindings/move_to_workspace_11
-move-to-workspace-12 = /apps/metacity/window_keybindings/move_to_workspace_12
-move-to-workspace-left = /apps/metacity/window_keybindings/move_to_workspace_left
-move-to-workspace-right = /apps/metacity/window_keybindings/move_to_workspace_right
-move-to-workspace-up = /apps/metacity/window_keybindings/move_to_workspace_up
-move-to-workspace-down = /apps/metacity/window_keybindings/move_to_workspace_down
-switch-windows = /apps/metacity/global_keybindings/switch_windows
-switch-group = /apps/metacity/global_keybindings/switch_group
-show-desktop = /apps/metacity/global_keybindings/show_desktop
-switch-to-workspace-1 = /apps/metacity/global_keybindings/switch_to_workspace_1
-switch-to-workspace-2 = /apps/metacity/global_keybindings/switch_to_workspace_2
-switch-to-workspace-3 = /apps/metacity/global_keybindings/switch_to_workspace_3
-switch-to-workspace-4 = /apps/metacity/global_keybindings/switch_to_workspace_4
-switch-to-workspace-5 = /apps/metacity/global_keybindings/switch_to_workspace_5
-switch-to-workspace-6 = /apps/metacity/global_keybindings/switch_to_workspace_6
-switch-to-workspace-7 = /apps/metacity/global_keybindings/switch_to_workspace_7
-switch-to-workspace-8 = /apps/metacity/global_keybindings/switch_to_workspace_8
-switch-to-workspace-9 = /apps/metacity/global_keybindings/switch_to_workspace_9
-switch-to-workspace-10 = /apps/metacity/global_keybindings/switch_to_workspace_10
-switch-to-workspace-11 = /apps/metacity/global_keybindings/switch_to_workspace_11
-switch-to-workspace-12 = /apps/metacity/global_keybindings/switch_to_workspace_12
-switch-to-workspace-left = /apps/metacity/global_keybindings/switch_to_workspace_left
-switch-to-workspace-right = /apps/metacity/global_keybindings/switch_to_workspace_right
-switch-to-workspace-up = /apps/metacity/global_keybindings/switch_to_workspace_up
-switch-to-workspace-down = /apps/metacity/global_keybindings/switch_to_workspace_down
-activate-window-menu = /apps/metacity/window_keybindings/activate_window_menu
-toggle-fullscreen = /apps/metacity/window_keybindings/toggle_fullscreen
-toggle-maximized = /apps/metacity/window_keybindings/toggle_maximized
-maximize = /apps/metacity/window_keybindings/maximize
-unmaximize = /apps/metacity/window_keybindings/unmaximize
-toggle-shaded = /apps/metacity/window_keybindings/toggle_shaded
-close = /apps/metacity/window_keybindings/close
-minimize = /apps/metacity/window_keybindings/minimize
-begin-move = /apps/metacity/window_keybindings/begin_move
-begin-resize = /apps/metacity/window_keybindings/begin_resize
-raise = /apps/metacity/window_keybindings/raise
-lower = /apps/metacity/window_keybindings/lower
-maximize-vertically = /apps/metacity/window_keybindings/maximize_vertically
-maximize-horizontally = /apps/metacity/window_keybindings/maximize_horizontally
-

=== modified file 'postinst/convert-files/compiz-profile-active-Default.convert'
--- postinst/convert-files/compiz-profile-active-Default.convert	2012-09-05 23:25:21 +0000
+++ postinst/convert-files/compiz-profile-active-Default.convert	2012-09-11 08:14:21 +0000
@@ -108,63 +108,3 @@
 top-left-corner-action = /apps/compiz-1/plugins/grid/screen0/options/top_left_corner_action
 top-right-corner-action = /apps/compiz-1/plugins/grid/screen0/options/top_right_corner_action
 
-
-[org.compiz.integrated]
-run-command-terminal = /apps/metacity/global_keybindings/run_command_terminal
-run-command-screenshot = /apps/metacity/global_keybindings/run_command_screenshot
-run-command-window-screenshot = /apps/metacity/global_keybindings/run_command_window_screenshot
-panel-run-dialog = /apps/metacity/global_keybindings/panel_run_dialog
-panel-main-menu = /apps/metacity/global_keybindings/panel_main_menu
-
-
-[org.gnome.desktop.wm.keybindings]
-move-to-workspace-1 = /apps/metacity/window_keybindings/move_to_workspace_1
-move-to-workspace-2 = /apps/metacity/window_keybindings/move_to_workspace_2
-move-to-workspace-3 = /apps/metacity/window_keybindings/move_to_workspace_3
-move-to-workspace-4 = /apps/metacity/window_keybindings/move_to_workspace_4
-move-to-workspace-5 = /apps/metacity/window_keybindings/move_to_workspace_5
-move-to-workspace-6 = /apps/metacity/window_keybindings/move_to_workspace_6
-move-to-workspace-7 = /apps/metacity/window_keybindings/move_to_workspace_7
-move-to-workspace-8 = /apps/metacity/window_keybindings/move_to_workspace_8
-move-to-workspace-9 = /apps/metacity/window_keybindings/move_to_workspace_9
-move-to-workspace-10 = /apps/metacity/window_keybindings/move_to_workspace_10
-move-to-workspace-11 = /apps/metacity/window_keybindings/move_to_workspace_11
-move-to-workspace-12 = /apps/metacity/window_keybindings/move_to_workspace_12
-move-to-workspace-left = /apps/metacity/window_keybindings/move_to_workspace_left
-move-to-workspace-right = /apps/metacity/window_keybindings/move_to_workspace_right
-move-to-workspace-up = /apps/metacity/window_keybindings/move_to_workspace_up
-move-to-workspace-down = /apps/metacity/window_keybindings/move_to_workspace_down
-switch-windows = /apps/metacity/global_keybindings/switch_windows
-switch-group = /apps/metacity/global_keybindings/switch_group
-show-desktop = /apps/metacity/global_keybindings/show_desktop
-switch-to-workspace-1 = /apps/metacity/global_keybindings/switch_to_workspace_1
-switch-to-workspace-2 = /apps/metacity/global_keybindings/switch_to_workspace_2
-switch-to-workspace-3 = /apps/metacity/global_keybindings/switch_to_workspace_3
-switch-to-workspace-4 = /apps/metacity/global_keybindings/switch_to_workspace_4
-switch-to-workspace-5 = /apps/metacity/global_keybindings/switch_to_workspace_5
-switch-to-workspace-6 = /apps/metacity/global_keybindings/switch_to_workspace_6
-switch-to-workspace-7 = /apps/metacity/global_keybindings/switch_to_workspace_7
-switch-to-workspace-8 = /apps/metacity/global_keybindings/switch_to_workspace_8
-switch-to-workspace-9 = /apps/metacity/global_keybindings/switch_to_workspace_9
-switch-to-workspace-10 = /apps/metacity/global_keybindings/switch_to_workspace_10
-switch-to-workspace-11 = /apps/metacity/global_keybindings/switch_to_workspace_11
-switch-to-workspace-12 = /apps/metacity/global_keybindings/switch_to_workspace_12
-switch-to-workspace-left = /apps/metacity/global_keybindings/switch_to_workspace_left
-switch-to-workspace-right = /apps/metacity/global_keybindings/switch_to_workspace_right
-switch-to-workspace-up = /apps/metacity/global_keybindings/switch_to_workspace_up
-switch-to-workspace-down = /apps/metacity/global_keybindings/switch_to_workspace_down
-activate-window-menu = /apps/metacity/window_keybindings/activate_window_menu
-toggle-fullscreen = /apps/metacity/window_keybindings/toggle_fullscreen
-toggle-maximized = /apps/metacity/window_keybindings/toggle_maximized
-maximize = /apps/metacity/window_keybindings/maximize
-unmaximize = /apps/metacity/window_keybindings/unmaximize
-toggle-shaded = /apps/metacity/window_keybindings/toggle_shaded
-close = /apps/metacity/window_keybindings/close
-minimize = /apps/metacity/window_keybindings/minimize
-begin-move = /apps/metacity/window_keybindings/begin_move
-begin-resize = /apps/metacity/window_keybindings/begin_resize
-raise = /apps/metacity/window_keybindings/raise
-lower = /apps/metacity/window_keybindings/lower
-maximize-vertically = /apps/metacity/window_keybindings/maximize_vertically
-maximize-horizontally = /apps/metacity/window_keybindings/maximize_horizontally
-

=== added file 'postinst/convert-files/compiz-profile-independent-keys.convert'
--- postinst/convert-files/compiz-profile-independent-keys.convert	1970-01-01 00:00:00 +0000
+++ postinst/convert-files/compiz-profile-independent-keys.convert	2012-09-11 08:14:21 +0000
@@ -0,0 +1,59 @@
+[org.compiz.integrated]
+run-command-terminal = /apps/metacity/global_keybindings/run_command_terminal
+run-command-screenshot = /apps/metacity/global_keybindings/run_command_screenshot
+run-command-window-screenshot = /apps/metacity/global_keybindings/run_command_window_screenshot
+panel-run-dialog = /apps/metacity/global_keybindings/panel_run_dialog
+panel-main-menu = /apps/metacity/global_keybindings/panel_main_menu
+
+
+[org.gnome.desktop.wm.keybindings]
+move-to-workspace-1 = /apps/metacity/window_keybindings/move_to_workspace_1
+move-to-workspace-2 = /apps/metacity/window_keybindings/move_to_workspace_2
+move-to-workspace-3 = /apps/metacity/window_keybindings/move_to_workspace_3
+move-to-workspace-4 = /apps/metacity/window_keybindings/move_to_workspace_4
+move-to-workspace-5 = /apps/metacity/window_keybindings/move_to_workspace_5
+move-to-workspace-6 = /apps/metacity/window_keybindings/move_to_workspace_6
+move-to-workspace-7 = /apps/metacity/window_keybindings/move_to_workspace_7
+move-to-workspace-8 = /apps/metacity/window_keybindings/move_to_workspace_8
+move-to-workspace-9 = /apps/metacity/window_keybindings/move_to_workspace_9
+move-to-workspace-10 = /apps/metacity/window_keybindings/move_to_workspace_10
+move-to-workspace-11 = /apps/metacity/window_keybindings/move_to_workspace_11
+move-to-workspace-12 = /apps/metacity/window_keybindings/move_to_workspace_12
+move-to-workspace-left = /apps/metacity/window_keybindings/move_to_workspace_left
+move-to-workspace-right = /apps/metacity/window_keybindings/move_to_workspace_right
+move-to-workspace-up = /apps/metacity/window_keybindings/move_to_workspace_up
+move-to-workspace-down = /apps/metacity/window_keybindings/move_to_workspace_down
+switch-windows = /apps/metacity/global_keybindings/switch_windows
+switch-group = /apps/metacity/global_keybindings/switch_group
+show-desktop = /apps/metacity/global_keybindings/show_desktop
+switch-to-workspace-1 = /apps/metacity/global_keybindings/switch_to_workspace_1
+switch-to-workspace-2 = /apps/metacity/global_keybindings/switch_to_workspace_2
+switch-to-workspace-3 = /apps/metacity/global_keybindings/switch_to_workspace_3
+switch-to-workspace-4 = /apps/metacity/global_keybindings/switch_to_workspace_4
+switch-to-workspace-5 = /apps/metacity/global_keybindings/switch_to_workspace_5
+switch-to-workspace-6 = /apps/metacity/global_keybindings/switch_to_workspace_6
+switch-to-workspace-7 = /apps/metacity/global_keybindings/switch_to_workspace_7
+switch-to-workspace-8 = /apps/metacity/global_keybindings/switch_to_workspace_8
+switch-to-workspace-9 = /apps/metacity/global_keybindings/switch_to_workspace_9
+switch-to-workspace-10 = /apps/metacity/global_keybindings/switch_to_workspace_10
+switch-to-workspace-11 = /apps/metacity/global_keybindings/switch_to_workspace_11
+switch-to-workspace-12 = /apps/metacity/global_keybindings/switch_to_workspace_12
+switch-to-workspace-left = /apps/metacity/global_keybindings/switch_to_workspace_left
+switch-to-workspace-right = /apps/metacity/global_keybindings/switch_to_workspace_right
+switch-to-workspace-up = /apps/metacity/global_keybindings/switch_to_workspace_up
+switch-to-workspace-down = /apps/metacity/global_keybindings/switch_to_workspace_down
+activate-window-menu = /apps/metacity/window_keybindings/activate_window_menu
+toggle-fullscreen = /apps/metacity/window_keybindings/toggle_fullscreen
+toggle-maximized = /apps/metacity/window_keybindings/toggle_maximized
+maximize = /apps/metacity/window_keybindings/maximize
+unmaximize = /apps/metacity/window_keybindings/unmaximize
+toggle-shaded = /apps/metacity/window_keybindings/toggle_shaded
+close = /apps/metacity/window_keybindings/close
+minimize = /apps/metacity/window_keybindings/minimize
+begin-move = /apps/metacity/window_keybindings/begin_move
+begin-resize = /apps/metacity/window_keybindings/begin_resize
+raise = /apps/metacity/window_keybindings/raise
+lower = /apps/metacity/window_keybindings/lower
+maximize-vertically = /apps/metacity/window_keybindings/maximize_vertically
+maximize-horizontally = /apps/metacity/window_keybindings/maximize_horizontally
+

=== added file 'postinst/migration-scripts/03_migrate_profile_independent.py'
--- postinst/migration-scripts/03_migrate_profile_independent.py	1970-01-01 00:00:00 +0000
+++ postinst/migration-scripts/03_migrate_profile_independent.py	2012-09-11 08:14:21 +0000
@@ -0,0 +1,44 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# Copyright (C) 2012 Canonical
+#
+# Authors:
+#  Łukasz 'sil2100' Zemczak <[e-mail]>
+#  Didier Roche <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUTa
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import gconf
+import glib
+import subprocess
+import os.path
+
+# this should point to the directory where all the .convert files are stored
+CONVERT_PATH = "/usr/lib/compiz/migration/"
+
+def migrate_file(convert_file):
+    subprocess.Popen(["gsettings-data-convert", "--file={}{}".format(CONVERT_PATH, convert_file)]).communicate()
+
+def migrate_gconf_to_gsettings():
+    client = gconf.client_get_default()
+
+    if not client:
+        print "WARNING: no gconf client found. No transitionning will be done"
+        sys.exit(1)
+
+    print "Will migrate profile independent keys"
+    migrate_file('compiz-profile-independent-keys.convert')
+
+if __name__ == '__main__':
+    migrate_gconf_to_gsettings ()