diff -Nru metacity-3.14.3/debian/changelog metacity-3.14.3/debian/changelog --- metacity-3.14.3/debian/changelog 2014-11-28 07:41:01.000000000 +0100 +++ metacity-3.14.3/debian/changelog 2015-01-06 11:19:10.000000000 +0100 @@ -1,3 +1,15 @@ +metacity (1:3.14.3-1ubuntu1) vivid; urgency=low + + * Merge from Debian unstable. (LP: #1407920) Remaining changes: + - debian/patches/05_raise_on_click_for_click_mode.patch: + + Force raise on click option. + - debian/patches/22_fix_above_tab_switching.patch: + + For Above_Tab, don't compare keysym (fixes group switching). + - debian/metacity-common.links: + + Show keybindings in Unity control center. + + -- Artur Rona Tue, 06 Jan 2015 11:19:07 +0100 + metacity (1:3.14.3-1) unstable; urgency=medium * New upstream bugfix release. @@ -5,6 +17,27 @@ -- Dmitry Shachnev Fri, 28 Nov 2014 09:35:28 +0300 +metacity (1:3.14.2-0ubuntu2) vivid; urgency=medium + + * Really keep debian/metacity-common.links. + + -- Dmitry Shachnev Mon, 24 Nov 2014 17:20:40 +0300 + +metacity (1:3.14.2-0ubuntu1) vivid; urgency=medium + + * Merge with Debian unstable, remaining changes: + - 05_raise_on_click_for_click_mode.patch: + Force raise on click option. + - 22_fix_above_tab_switching.patch: + For Above_Tab, don't compare keysym (fixes group switching). + - debian/metacity-common.links: + Show keybindings in Unity control center. + - Use Ubuntu Desktop team Vcs fields. + * Drop all other patches, they were needed only for Unity 2D. + * New upstream bugfix release. + + -- Dmitry Shachnev Tue, 18 Nov 2014 18:13:01 +0300 + metacity (1:3.14.1-2) unstable; urgency=medium * Backport initialize_variables.patch from upstream to fix a bug diff -Nru metacity-3.14.3/debian/control metacity-3.14.3/debian/control --- metacity-3.14.3/debian/control 2014-11-28 07:46:25.000000000 +0100 +++ metacity-3.14.3/debian/control 2015-01-06 11:19:15.000000000 +0100 @@ -5,8 +5,9 @@ Source: metacity Section: x11 Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Dmitry Shachnev , Josselin Mouette , Michael Biebl +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Michael Biebl Build-Depends: cdbs (>= 0.4.41), debhelper (>= 8), dh-autoreconf, diff -Nru metacity-3.14.3/debian/control.in metacity-3.14.3/debian/control.in --- metacity-3.14.3/debian/control.in 2014-11-28 07:41:01.000000000 +0100 +++ metacity-3.14.3/debian/control.in 2015-01-06 00:59:00.000000000 +0100 @@ -1,7 +1,8 @@ Source: metacity Section: x11 Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: cdbs (>= 0.4.41), debhelper (>= 8), diff -Nru metacity-3.14.3/debian/metacity-common.links metacity-3.14.3/debian/metacity-common.links --- metacity-3.14.3/debian/metacity-common.links 1970-01-01 01:00:00.000000000 +0100 +++ metacity-3.14.3/debian/metacity-common.links 2014-11-24 15:20:35.000000000 +0100 @@ -0,0 +1,3 @@ +usr/share/gnome-control-center/keybindings/50-metacity-navigation.xml usr/share/unity-control-center/keybindings/50-metacity-navigation.xml +usr/share/gnome-control-center/keybindings/50-metacity-windows.xml usr/share/unity-control-center/keybindings/50-metacity-windows.xml +usr/share/gnome-control-center/keybindings/50-metacity-system.xml usr/share/unity-control-center/keybindings/50-metacity-system.xml diff -Nru metacity-3.14.3/debian/patches/05_raise_on_click_for_click_mode.patch metacity-3.14.3/debian/patches/05_raise_on_click_for_click_mode.patch --- metacity-3.14.3/debian/patches/05_raise_on_click_for_click_mode.patch 1970-01-01 01:00:00.000000000 +0100 +++ metacity-3.14.3/debian/patches/05_raise_on_click_for_click_mode.patch 2014-11-18 16:20:26.000000000 +0100 @@ -0,0 +1,14 @@ +Description: Force raise on click option. +Bug: https://bugs.launchpad.net/bugs/44710 + +--- a/src/core/prefs.c ++++ b/src/core/prefs.c +@@ -927,7 +927,7 @@ + /* Force raise_on_click on for click-to-focus, as requested by Havoc + * in #326156. + */ +- return raise_on_click || focus_mode == G_DESKTOP_FOCUS_MODE_CLICK; ++ return raise_on_click; + } + + const char* diff -Nru metacity-3.14.3/debian/patches/22_fix_above_tab_switching.patch metacity-3.14.3/debian/patches/22_fix_above_tab_switching.patch --- metacity-3.14.3/debian/patches/22_fix_above_tab_switching.patch 1970-01-01 01:00:00.000000000 +0100 +++ metacity-3.14.3/debian/patches/22_fix_above_tab_switching.patch 2014-11-18 16:20:18.000000000 +0100 @@ -0,0 +1,18 @@ +Description: For Above_Tab, don't compare keysym (fixes group switching) +Author: Jeffrey Knockel +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/metacity/+bug/907640 +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=692437 + +--- a/src/core/keybindings.c ++++ b/src/core/keybindings.c +@@ -501,7 +501,9 @@ + i = display->n_key_bindings - 1; + while (i >= 0) + { +- if (display->key_bindings[i].keysym == keysym && ++ if ((display->key_bindings[i].keysym == keysym || ++ /* Don't need to compare keysym if META_KEY_ABOVE_TAB */ ++ display->key_bindings[i].keysym == META_KEY_ABOVE_TAB) && + display->key_bindings[i].keycode == keycode && + display->key_bindings[i].mask == mask) + { diff -Nru metacity-3.14.3/debian/patches/series metacity-3.14.3/debian/patches/series --- metacity-3.14.3/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ metacity-3.14.3/debian/patches/series 2014-11-18 16:19:50.000000000 +0100 @@ -0,0 +1,2 @@ +05_raise_on_click_for_click_mode.patch +22_fix_above_tab_switching.patch