diff -Nru gnome-shell-3.30.2/debian/changelog gnome-shell-3.30.2/debian/changelog --- gnome-shell-3.30.2/debian/changelog 2019-01-27 01:15:02.000000000 +0000 +++ gnome-shell-3.30.2/debian/changelog 2019-02-07 23:30:05.000000000 +0000 @@ -1,8 +1,20 @@ -gnome-shell (3.30.2-2ubuntu1~ppa0) cosmic; urgency=medium +gnome-shell (3.30.2-2ubuntu2~ppa0) cosmic; urgency=medium * Rebuilt for cosmic - -- Jacob Zimmermann Sun, 27 Jan 2019 11:15:02 +1000 + -- Jacob Zimmermann Fri, 08 Feb 2019 10:30:05 +1100 + +gnome-shell (3.30.2-2ubuntu2) disco; urgency=medium + + * debian/patches/ubuntu/smarter_alt_tab.patch: + Dropped, now that application switching is set to super-tab instead of + alt-tab + * Merge debian/patches/ubuntu/gdm.patch and + debian/patches/ubuntu/gdm_alternatives.patch: + - gdm_alternatives was a patch on a patch, merged them and remove + gdm.patch + + -- Didier Roche Thu, 07 Feb 2019 11:51:47 +0100 gnome-shell (3.30.2-2ubuntu1) disco; urgency=medium diff -Nru gnome-shell-3.30.2/debian/control gnome-shell-3.30.2/debian/control --- gnome-shell-3.30.2/debian/control 2019-01-27 01:15:02.000000000 +0000 +++ gnome-shell-3.30.2/debian/control 2019-02-07 23:30:02.000000000 +0000 @@ -7,7 +7,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Jacob Zimmermann +Uploaders: Iain Lane , Jeremy Bicha , Laurent Bigonville , Michael Biebl , Jacob Zimmermann Build-Depends: debhelper (>= 11.1.3), gir1.2-accountsservice-1.0 , gir1.2-gdm-1.0 (>= 3.18.2) , diff -Nru gnome-shell-3.30.2/debian/control.in gnome-shell-3.30.2/debian/control.in --- gnome-shell-3.30.2/debian/control.in 2019-01-27 01:14:58.000000000 +0000 +++ gnome-shell-3.30.2/debian/control.in 2019-02-07 23:29:59.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Jacob Zimmermann +Uploaders: @GNOME_TEAM@, Jacob Zimmermann Build-Depends: debhelper (>= 11.1.3), gir1.2-accountsservice-1.0 , gir1.2-gdm-1.0 (>= 3.18.2) , diff -Nru gnome-shell-3.30.2/debian/patches/series gnome-shell-3.30.2/debian/patches/series --- gnome-shell-3.30.2/debian/patches/series 2019-01-25 13:24:52.000000000 +0000 +++ gnome-shell-3.30.2/debian/patches/series 2019-02-07 10:51:47.000000000 +0000 @@ -4,10 +4,8 @@ tweener-Save-handlers-on-target-and-remove-them-on-destro.patch workaround_crasher_fractional_scaling.patch ubuntu/desktop_detect.patch -ubuntu/smarter_alt_tab.patch ubuntu/lightdm-user-switching.patch ubuntu/lock_on_suspend.patch -ubuntu/gdm.patch ubuntu/background_login.patch ubuntu/gdm_alternatives.patch ubuntu/block_mode_extension_update.patch diff -Nru gnome-shell-3.30.2/debian/patches/ubuntu/gdm_alternatives.patch gnome-shell-3.30.2/debian/patches/ubuntu/gdm_alternatives.patch --- gnome-shell-3.30.2/debian/patches/ubuntu/gdm_alternatives.patch 2019-01-25 13:24:52.000000000 +0000 +++ gnome-shell-3.30.2/debian/patches/ubuntu/gdm_alternatives.patch 2019-02-07 10:51:47.000000000 +0000 @@ -14,11 +14,10 @@ index d0c8f2a..f521c80 100644 --- a/js/ui/sessionMode.js +++ b/js/ui/sessionMode.js -@@ -42,7 +42,7 @@ const _modes = { +@@ -42,6 +42,7 @@ const _modes = { 'gdm': { hasNotifications: true, -- stylesheetName: 'ubuntu.css', + stylesheetName: 'gdm3.css', isGreeter: true, isPrimary: true, diff -Nru gnome-shell-3.30.2/debian/patches/ubuntu/gdm.patch gnome-shell-3.30.2/debian/patches/ubuntu/gdm.patch --- gnome-shell-3.30.2/debian/patches/ubuntu/gdm.patch 2019-01-25 13:24:52.000000000 +0000 +++ gnome-shell-3.30.2/debian/patches/ubuntu/gdm.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From: Didier Roche -Date: Wed, 20 Jun 2018 19:22:06 +0200 -Subject: Ensure gdm has an ubuntu styling by default. - -As it's system-wide and not user-wide, use the ubuntu.css stylesheet -for the gdm mode of GNOME Shell. This doesn't impact the aNOME -user session though. -Forwarded: not-needed -=================================================================== ---- - js/ui/sessionMode.js | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js -index e221764..d0c8f2a 100644 ---- a/js/ui/sessionMode.js -+++ b/js/ui/sessionMode.js -@@ -42,6 +42,7 @@ const _modes = { - - 'gdm': { - hasNotifications: true, -+ stylesheetName: 'ubuntu.css', - isGreeter: true, - isPrimary: true, - unlockDialog: imports.gdm.loginDialog.LoginDialog, diff -Nru gnome-shell-3.30.2/debian/patches/ubuntu/smarter_alt_tab.patch gnome-shell-3.30.2/debian/patches/ubuntu/smarter_alt_tab.patch --- gnome-shell-3.30.2/debian/patches/ubuntu/smarter_alt_tab.patch 2019-01-25 13:24:52.000000000 +0000 +++ gnome-shell-3.30.2/debian/patches/ubuntu/smarter_alt_tab.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -From: Ubuntu Developers -Date: Wed, 20 Jun 2018 19:22:06 +0200 -Subject: Build a smarter alt-tab in the ubuntu session - -In case of a quick alt-tab (before the switcher UI shows up), we want to cover -the power user use-case, which is to switch quickly between 2 windows. -The issue with current behavior is say: -- you have an application with one instance, maximized -- you have another application with multiple instances, like multiple - terminals, not maximized. -If you press alt-tab, even quickly, the whole second application would be -raised (as no window has been selected). The consequence is that you have -all terminal in front of, for instance, your browser or documentation viewer -you are using. -The behavior we implement enables this. However, as soon as the switcher ui -is displayed to the user, not selecting a particular window instance will -raise the whole applications. Consequently only "quick alt-tab" flow is -impacted. -Origin: ubuntu -Bug-Ubuntu: https://launchpad.net/bugs/1716921 -Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=787627 ---- - js/ui/altTab.js | 10 ++++++++++ - js/ui/switcherPopup.js | 4 +++- - 2 files changed, 13 insertions(+), 1 deletion(-) - -diff --git a/js/ui/altTab.js b/js/ui/altTab.js -index d0c3713..b2fa93c 100644 ---- a/js/ui/altTab.js -+++ b/js/ui/altTab.js -@@ -13,6 +13,7 @@ const Atk = imports.gi.Atk; - const Main = imports.ui.main; - const SwitcherPopup = imports.ui.switcherPopup; - const Tweener = imports.ui.tweener; -+const Desktop = imports.misc.desktop; - - var APP_ICON_HOVER_TIMEOUT = 200; // milliseconds - -@@ -285,6 +286,15 @@ var AppSwitcherPopup = new Lang.Class({ - - _finish(timestamp) { - let appIcon = this._items[this._selectedIndex]; -+ -+ // Only activate the first window of next app in case of fast alt-tab -+ // (popup switcher not displayed yet) -+ if (this._initialDelayTimeoutId !== 0 && -+ this._selectedIndex === 1 && -+ Desktop.is("ubuntu")) { -+ this._currentWindow = 0; -+ } -+ - if (this._currentWindow < 0) - appIcon.app.activate_window(appIcon.cachedWindows[0], timestamp); - else if (appIcon.cachedWindows[this._currentWindow]) -diff --git a/js/ui/switcherPopup.js b/js/ui/switcherPopup.js -index d645f1d..8909b36 100644 ---- a/js/ui/switcherPopup.js -+++ b/js/ui/switcherPopup.js -@@ -12,8 +12,10 @@ const St = imports.gi.St; - - const Main = imports.ui.main; - const Tweener = imports.ui.tweener; -+const Desktop = imports.misc.desktop; - --var POPUP_DELAY_TIMEOUT = 150; // milliseconds -+// we increase the timeout for ubuntu as we want smart alt-tab quick switch. -+var POPUP_DELAY_TIMEOUT = (Desktop.is("ubuntu")) ? 250 : 150 // milliseconds - - var POPUP_SCROLL_TIME = 0.10; // seconds - var POPUP_FADE_OUT_TIME = 0.1; // seconds