=== modified file 'debian/changelog'
--- debian/changelog 2015-01-22 01:36:43 +0000
+++ debian/changelog 2015-01-22 01:47:41 +0000
@@ -1,9 +1,9 @@
-xubuntu-default-settings (14.04.7) trusty; urgency=medium
+xubuntu-default-settings (14.04.7) trusty-proposed; urgency=medium
* etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml:
- Fix window manager keybinding breakage after reboot (LP: #1292290)
- -- Sean Davis <smd.seandavis@gmail.com> Wed, 21 Jan 2015 20:33:00 -0500
+ -- Sean Davis <smd.seandavis@gmail.com> Wed, 21 Jan 2015 20:47:33 -0500
xubuntu-default-settings (14.04.6) trusty; urgency=medium
=== modified file 'etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml'
--- etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 2015-01-22 01:36:43 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 2015-01-28 11:31:21 +0000
@@ -42,8 +42,8 @@
<property name="<Alt>Tab" type="string" value="cycle_windows_key"/>
<property name="<Alt><Shift>Tab" type="string" value="cycle_reverse_windows_key"/>
<property name="<Alt>Delete" type="string" value="del_workspace_key"/>
- <property name="<Control><Alt>Down" type="string" value="down_workspace_key"/>
- <property name="<Control><Alt>Left" type="string" value="left_workspace_key"/>
+ <property name="<Primary><Alt>Down" type="string" value="down_workspace_key"/>
+ <property name="<Primary><Alt>Left" type="string" value="left_workspace_key"/>
<property name="<Shift><Alt>Page_Down" type="string" value="lower_window_key"/>
<property name="<Alt>F4" type="string" value="close_window_key"/>
<property name="<Alt>F5" type="string" value="maximize_horiz_key"/>
@@ -54,38 +54,38 @@
<property name="<Alt>F10" type="empty"/>
<property name="<Alt>F11" type="string" value="fullscreen_key"/>
<property name="<Alt>F12" type="string" value="above_key"/>
- <property name="<Control><Shift><Alt>Left" type="string" value="move_window_left_key"/>
- <property name="<Alt><Control>End" type="string" value="move_window_next_workspace_key"/>
- <property name="<Alt><Control>Home" type="string" value="move_window_prev_workspace_key"/>
- <property name="<Control><Shift><Alt>Right" type="string" value="move_window_right_key"/>
- <property name="<Control><Shift><Alt>Up" type="string" value="move_window_up_key"/>
- <property name="<Alt><Control>KP_1" type="string" value="move_window_workspace_1_key"/>
- <property name="<Alt><Control>KP_2" type="string" value="move_window_workspace_2_key"/>
- <property name="<Alt><Control>KP_3" type="string" value="move_window_workspace_3_key"/>
- <property name="<Alt><Control>KP_4" type="string" value="move_window_workspace_4_key"/>
- <property name="<Alt><Control>KP_5" type="string" value="move_window_workspace_5_key"/>
- <property name="<Alt><Control>KP_6" type="string" value="move_window_workspace_6_key"/>
- <property name="<Alt><Control>KP_7" type="string" value="move_window_workspace_7_key"/>
- <property name="<Alt><Control>KP_8" type="string" value="move_window_workspace_8_key"/>
- <property name="<Alt><Control>KP_9" type="string" value="move_window_workspace_9_key"/>
+ <property name="<Primary><Shift><Alt>Left" type="string" value="move_window_left_key"/>
+ <property name="<Primary><Alt>End" type="string" value="move_window_next_workspace_key"/>
+ <property name="<Primary><Alt>Home" type="string" value="move_window_prev_workspace_key"/>
+ <property name="<Primary><Shift><Alt>Right" type="string" value="move_window_right_key"/>
+ <property name="<Primary><Shift><Alt>Up" type="string" value="move_window_up_key"/>
+ <property name="<Primary><Alt>KP_1" type="string" value="move_window_workspace_1_key"/>
+ <property name="<Primary><Alt>KP_2" type="string" value="move_window_workspace_2_key"/>
+ <property name="<Primary><Alt>KP_3" type="string" value="move_window_workspace_3_key"/>
+ <property name="<Primary><Alt>KP_4" type="string" value="move_window_workspace_4_key"/>
+ <property name="<Primary><Alt>KP_5" type="string" value="move_window_workspace_5_key"/>
+ <property name="<Primary><Alt>KP_6" type="string" value="move_window_workspace_6_key"/>
+ <property name="<Primary><Alt>KP_7" type="string" value="move_window_workspace_7_key"/>
+ <property name="<Primary><Alt>KP_8" type="string" value="move_window_workspace_8_key"/>
+ <property name="<Primary><Alt>KP_9" type="string" value="move_window_workspace_9_key"/>
<property name="<Alt>space" type="string" value="popup_menu_key"/>
<property name="<Shift><Alt>Page_Up" type="string" value="raise_window_key"/>
- <property name="<Control><Alt>Right" type="string" value="right_workspace_key"/>
- <property name="<Control><Alt>d" type="string" value="show_desktop_key"/>
- <property name="<Control><Alt>Up" type="string" value="up_workspace_key"/>
+ <property name="<Primary><Alt>Right" type="string" value="right_workspace_key"/>
+ <property name="<Primary><Alt>d" type="string" value="show_desktop_key"/>
+ <property name="<Primary><Alt>Up" type="string" value="up_workspace_key"/>
<property name="<Super>Tab" type="string" value="switch_window_key"/>
- <property name="<Control>F1" type="string" value="workspace_1_key"/>
- <property name="<Control>F2" type="string" value="workspace_2_key"/>
- <property name="<Control>F3" type="string" value="workspace_3_key"/>
- <property name="<Control>F4" type="string" value="workspace_4_key"/>
- <property name="<Control>F5" type="string" value="workspace_5_key"/>
- <property name="<Control>F6" type="string" value="workspace_6_key"/>
- <property name="<Control>F7" type="string" value="workspace_7_key"/>
- <property name="<Control>F8" type="string" value="workspace_8_key"/>
- <property name="<Control>F9" type="string" value="workspace_9_key"/>
- <property name="<Control>F10" type="string" value="workspace_10_key"/>
- <property name="<Control>F11" type="string" value="workspace_11_key"/>
- <property name="<Control>F12" type="string" value="workspace_12_key"/>
+ <property name="<Primary>F1" type="string" value="workspace_1_key"/>
+ <property name="<Primary>F2" type="string" value="workspace_2_key"/>
+ <property name="<Primary>F3" type="string" value="workspace_3_key"/>
+ <property name="<Primary>F4" type="string" value="workspace_4_key"/>
+ <property name="<Primary>F5" type="string" value="workspace_5_key"/>
+ <property name="<Primary>F6" type="string" value="workspace_6_key"/>
+ <property name="<Primary>F7" type="string" value="workspace_7_key"/>
+ <property name="<Primary>F8" type="string" value="workspace_8_key"/>
+ <property name="<Primary>F9" type="string" value="workspace_9_key"/>
+ <property name="<Primary>F10" type="string" value="workspace_10_key"/>
+ <property name="<Primary>F11" type="string" value="workspace_11_key"/>
+ <property name="<Primary>F12" type="string" value="workspace_12_key"/>
</property>
</property>
</channel>