3.29.3+really3.28.1-1

Hard-code compatible Shell versions for this branch
${gnome:Version} doesn't understand the +really workaround.
2018-07-27 23:48:06 +01:00 · 2018-07-27 23:46:52 +01:00 · 2018-07-27 23:20:57 +01:00 · 2018-07-27 23:20:52 +01:00 · 2018-07-27 23:20:47 +01:00 · 2018-05-14 21:54:28 -04:00
33 changed files with 918 additions and 231 deletions
--- a/32
+++ b/32
@@ -1,35 +1,3 @@
-3.30.0
-======
-* Bump version
-
-3.29.91
-=======
-* Misc. bug fixes [Florian; #90]
-
-Contributors:
-  Florian Müllner
-
-3.29.90
-=======
-* Misc. bug fixes [Florian; #786496]
-
-Contributors:
-  Florian Müllner
-
-3.29.3
-======
-* Adjust to global.screen removal [Jonas; #759538]
-
-Contributors:
-  Jonas Ådahl, Florian Müllner
-
-3.29.2
-======
-* Misc. bug fixes [Florian; #69]
-
-Contributors:
-  Florian Müllner
-
 3.28.1
 ======
 * Misc. bug fixes [Xiaoguang, Florian; #59, #62]
--- a/data/00_org.gnome.shell.extensions.classic.gschema.override
+++ b/data/00_org.gnome.shell.extensions.classic.gschema.override
@@ -1,9 +0,0 @@
-[org.gnome.mutter:GNOME-Classic]
-dynamic-workspaces=false
-
-[org.gnome.desktop.wm.preferences:GNOME-Classic]
-button-layout='appmenu:minimize,maximize,close'
-
-[org.gnome.desktop.wm.keybindings:GNOME-Classic]
-switch-applications=[]
-switch-windows=['<Super>Tab','<Alt>Tab']
--- a/data/gnome-shell-sass/HACKING
+++ b/data/gnome-shell-sass/HACKING
@@ -0,0 +1,6 @@
+--- Generating the css file ---
+
+You need sass to generate the css file.
+
+To generate them run from a command line in the project directory:
+sass --sourcemap=none --update ./
--- a/data/gnome-shell-sass/README
+++ b/data/gnome-shell-sass/README
@@ -0,0 +1,7 @@
+GNOME Shell Sass is a project intended to allow the sharing of the theme sources in sass between gnome-shell and other projects like gnome-shell-extensions.
+
+License
+=======
+GNOME Shell Sass is distributed under the terms of the GNU General Public License,
+version 2 or later. See the COPYING file for details.
+
--- a/data/gnome-shell-sass/README.md
+++ b/data/gnome-shell-sass/README.md
@@ -1,16 +0,0 @@
-# GNOME Shell Sass
-GNOME Shell Sass is a project intended to allow the sharing of the
-theme sources in sass between gnome-shell and other projects like
-gnome-shell-extensions.
-
-Any changes should be done in the [GNOME Shell subtree][shell-subtree]
-and not the stand-alone [gnome-shell-sass repository][sass-repo]. They
-will then be synchronized periodically before releases.
-
-## License
-GNOME Shell Sass is distributed under the terms of the GNU General Public
-License, version 2 or later. See the [COPYING][license] file for details.
-
-[shell-subtree]: https://gitlab.gnome.org/GNOME/gnome-shell/tree/master/data/theme/gnome-shell-sass
-[sass-repo]: https://gitlab.gnome.org/GNOME/gnome-shell-sass
-[license]: COPYING
--- a/data/gnome-shell-sass/_common.scss
+++ b/data/gnome-shell-sass/_common.scss
@@ -128,15 +128,12 @@ StScrollBar {

 .slider {
  height: 1em;
-  -barlevel-height: 0.3em;
-  -barlevel-background-color: $insensitive_bg_color; //background of the trough
-  -barlevel-border-color: $borders_color; //trough border color
-  -barlevel-active-background-color: $selected_bg_color; //active trough fill
-  -barlevel-active-border-color: darken($selected_bg_color,10%); //active trough border
-  -barlevel-overdrive-color: $destructive_color;
-  -barlevel-overdrive-border-color: darken($destructive_color,10%);
-  -barlevel-overdrive-separator-width: 0.2em;
-  -barlevel-border-width: 1px;
+  -slider-height: 0.3em;
+  -slider-background-color: $insensitive_bg_color; //background of the trough
+  -slider-border-color: $borders_color; //trough border color
+  -slider-active-background-color: $selected_bg_color; //active trough fill
+  -slider-active-border-color: darken($selected_bg_color,10%); //active trough border
+  -slider-border-width: 1px;
  -slider-handle-radius: 6px;
 }

@@ -588,11 +585,13 @@ StScrollBar {
  .osd-monitor-label { font-size: 3em; }
  .level {
    height: 0.6em;
-    -barlevel-height: 0.6em;
-    -barlevel-background-color: transparentize(darken($osd_bg_color,15%),0.5);
-    -barlevel-active-background-color: $osd_fg_color;
-    -barlevel-overdrive-color: $destructive_color;
-    -barlevel-overdrive-separator-width: 0.2em;
+    border-radius: 0.3em;
+    background-color: transparentize(darken($osd_bg_color,15%),0.5);
+    color: $osd_fg_color;
+  }
+  .level-bar {
+    background-color: $osd_fg_color;
+    border-radius: 0.3em;
  }
 }

@@ -734,7 +733,6 @@ StScrollBar {
  transition-duration: 500ms;
  font-weight: bold;
  height: 1.86em;
-  font-feature-settings: "tnum";

  &.unlock-screen,
  &.login-screen,
@@ -826,8 +824,6 @@ StScrollBar {

  .screencast-indicator { color: $warning_color; }

-  .remote-access-indicator { color: $warning_color; }
-
  &.solid {
    background-color: black;
    /* transition from transparent to solid */
@@ -962,7 +958,6 @@ StScrollBar {
      padding: 0.1em;
      margin: 2px;
      border-radius: 1.4em;
-      font-feature-settings: "tnum";
      &:hover,&:focus { background-color: lighten($bg_color,5%); }
      &:active,&:selected {
        color: lighten($selected_fg_color,5%);
@@ -1116,7 +1111,7 @@ StScrollBar {
  .aggregate-menu {
    min-width: 21em;
    .popup-menu-icon { padding: 0 4px; }
-    .popup-sub-menu .popup-menu-item > :first-child {
+    .popup-sub-menu .popup-menu-item :first-child {
      &:ltr { /* 12px spacing + 2*4px padding */
              padding-left: 20px; margin-left: 1.09em; }
      &:rtl { /* 12px spacing + 2*4px padding */
@@ -1125,7 +1120,6 @@ StScrollBar {
  }

  .system-menu-action {
-    -st-icon-style: symbolic;
    color: $fg_color;
    border-radius: 32px; /* wish we could do 50% */
    padding: 13px;
@@ -1794,19 +1788,20 @@ StScrollBar {
  .login-dialog-user-list-view { -st-vfade-offset: 1em; }
  .login-dialog-user-list {
    spacing: 12px;
+    padding: .2em;
    width: 23em;
    &:expanded .login-dialog-user-list-item:selected { background-color: $selected_bg_color; color: $selected_fg_color; }
    &:expanded .login-dialog-user-list-item:logged-in { border-right: 2px solid $selected_bg_color; }
  }
  .login-dialog-user-list-item {
    border-radius: 5px;
-    padding: 6px;
+    padding: .2em;
    color: darken($osd_fg_color,30%);
-    &:ltr .user-widget { padding-right: 1em; }
-    &:rtl .user-widget { padding-left: 1em; }
+    &:ltr { padding-right: 1em; }
+    &:rtl { padding-left: 1em; }
    .login-dialog-timed-login-indicator {
      height: 2px;
-      margin-top: 6px;
+      margin: 2px 0 0 0;
      background-color: $osd_fg_color;
    }
    &:focus .login-dialog-timed-login-indicator { background-color: $selected_fg_color; }
@@ -1821,8 +1816,8 @@ StScrollBar {
    padding-left: 15px;
  }
    .user-widget-label {
-      &:ltr { padding-left: 14px; }
-      &:rtl { padding-right: 14px; }
+      &:ltr { padding-left: 18px; }
+      &:rtl { padding-right: 18px; }
    }

  .login-dialog-prompt-layout {
@@ -1873,7 +1868,6 @@ StScrollBar {
 .screen-shield-clock-time {
  font-size: 72pt;
  text-shadow: 0px 2px 2px rgba(0,0,0,0.4);
-  font-feature-settings: "tnum";
 }

 .screen-shield-clock-date { 
--- a/data/meson.build
+++ b/data/meson.build
@@ -59,5 +59,5 @@ custom_target(style + '.css',

 install_data(theme_data, install_dir: themedir)

-classic_override = '00_org.gnome.shell.extensions.classic.gschema.override'
-install_data(classic_override, install_dir: schemadir)
+classic_schema = 'org.gnome.shell.extensions.classic-overrides.gschema.xml'
+install_data(classic_schema, install_dir: schemadir)
--- a/data/org.gnome.shell.extensions.classic-overrides.gschema.xml
+++ b/data/org.gnome.shell.extensions.classic-overrides.gschema.xml
@@ -0,0 +1,46 @@
+<schemalist>
+  <schema id="org.gnome.shell.extensions.classic-overrides"
+          path="/org/gnome/shell/extensions/classic-overrides/"
+	  gettext-domain="gnome-shell-extensions">
+    <key name="attach-modal-dialogs" type="b">
+      <default>true</default>
+      <summary>Attach modal dialog to the parent window</summary>
+      <description>
+        This key overrides the key in org.gnome.mutter when running
+        GNOME Shell.
+      </description>
+    </key>
+
+    <key name="button-layout" type="s">
+      <default>"appmenu:minimize,maximize,close"</default>
+      <summary>Arrangement of buttons on the titlebar</summary>
+      <description>
+        This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Shell.
+      </description>
+    </key>
+
+    <key name="edge-tiling" type="b">
+      <default>true</default>
+      <summary>Enable edge tiling when dropping windows on screen edges</summary>
+      <description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </description>
+    </key>
+
+    <key name="workspaces-only-on-primary" type="b">
+      <default>true</default>
+      <summary>Workspaces only on primary monitor</summary>
+      <description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </description>
+    </key>
+
+    <key name="focus-change-on-pointer-rest" type="b">
+      <default>true</default>
+      <summary>Delay focus changes in mouse mode until the pointer stops moving</summary>
+      <description>
+        This key overrides the key in org.gnome.mutter when running GNOME Shell.
+      </description>
+    </key>
+  </schema>
+</schemalist>
--- a/debian/changelog
+++ b/debian/changelog
@@ -0,0 +1,523 @@
+gnome-shell-extensions (3.29.3+really3.28.1-1) unstable; urgency=medium
+
+  * Team upload
+  * Revert unintended upload of 3.29.3 to unstable
+  * d/gbp.conf: Use debian/unstable and upstream/3.28.x branches
+  * Bump Standards-Version to 4.1.5
+  * Set Rules-Requires-Root to no
+  * Hard-code compatible Shell versions for this branch since
+    ${gnome:Version} doesn't understand the +really workaround
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 27 Jul 2018 23:47:37 +0100
+
+gnome-shell-extensions (3.28.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump Standards-Version to 4.1.4
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 14 May 2018 21:51:46 -0400
+
+gnome-shell-extensions (3.28.0-2) unstable; urgency=medium
+
+  * Fix typo in configure flag that resulted in missing
+    auto-move-windows, native-window-placement, & user-theme extensions
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 19 Mar 2018 18:20:53 -0400
+
+gnome-shell-extensions (3.28.0-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sun, 18 Mar 2018 20:17:17 -0400
+
+gnome-shell-extensions (3.27.92-2) unstable; urgency=medium
+
+  * Release to unstable
+
+ -- Jeremy Bicha <jbicha@debian.org>  Sat, 10 Mar 2018 19:37:45 -0500
+
+gnome-shell-extensions (3.27.92-1) experimental; urgency=medium
+
+  [ Jeremy Bicha ]
+  * New upstream release candidate
+  * Drop explicit dependency on mutter's gir. gnome-shell-extensions depends
+    on gnome-shell which depends on the gir. Dropping it will make transitions
+    easier.
+
+  [ Simon McVittie ]
+  * Recommend gnome-tweaks instead of transitional gnome-tweak-tool
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 05 Mar 2018 21:02:01 -0500
+
+gnome-shell-extensions (3.27.91-1) experimental; urgency=medium
+
+  * New upstream development release
+  * Build with meson
+  * Build-Depend on sassc
+  * Bump debhelper compat to 11
+  * Drop places-menu-Don-t-force-dispose-of-uninitialized-proxies.patch &
+    dont-require-nautilus-classic.patch: Applied in new release
+
+ -- Jeremy Bicha <jbicha@debian.org>  Fri, 23 Feb 2018 19:49:59 -0500
+
+gnome-shell-extensions (3.26.2-3) unstable; urgency=medium
+
+  * Team upload
+
+  [ Jeremy Bicha ]
+  * Update Vcs fields for migration to https://salsa.debian.org/
+
+  [ Simon McVittie ]
+  * d/patches: Re-export with gbp pq export
+  * d/p/places-menu-Don-t-force-dispose-of-uninitialized-proxies.patch:
+    Take patch from upstream to avoid frequent tracebacks from the Places
+    menu with gjs >= 1.50.2-3 (Closes: #888608)
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 30 Jan 2018 09:15:54 +0000
+
+gnome-shell-extensions (3.26.2-2) unstable; urgency=medium
+
+  * Update Vcs fields for conversion to git
+  * Add debian/gbp.conf
+  * Bump Standards-Version to 4.1.2
+
+ -- Jeremy Bicha <jbicha@debian.org>  Fri, 15 Dec 2017 15:19:14 -0500
+
+gnome-shell-extensions (3.26.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 05 Nov 2017 20:17:03 +0100
+
+gnome-shell-extensions (3.26.1-2) unstable; urgency=medium
+
+  * Release to unstable
+  * Bump Standards-Version to 4.1.1
+
+ -- Jeremy Bicha <jbicha@debian.org>  Fri, 13 Oct 2017 16:49:30 -0400
+
+gnome-shell-extensions (3.26.1-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream stable release
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 06 Oct 2017 11:01:11 +0100
+
+gnome-shell-extensions (3.26.0-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream stable release
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 13 Sep 2017 11:33:19 +0100
+
+gnome-shell-extensions (3.25.91-1) experimental; urgency=medium
+
+  * Team upload
+  * New upstream release, for GNOME Shell 3.25.91
+    - d/p/adapt-to-gsd324.patch: Drop, applied upstream
+    - Switch dependency to gir1.2-mutter-1
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 05 Sep 2017 16:43:01 +0100
+
+gnome-shell-extensions (3.22.2-2) unstable; urgency=medium
+
+  * Add adapt-to-gsd324.patch (Closes: #869948):
+    - Adjust gnome-session file for gnome-settings-daemon 3.24
+  * debian/control.in:
+    - Bump Standards-Version to 4.0.0
+    - Explicitly depend on gnome-settings-daemon >= 3.24
+    - Drop version from gnome-tweak-tool recommends
+    - Depend on gnome-session-bin instead of gnome-session (LP: #1702832)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 06 Aug 2017 17:38:06 -0400
+
+gnome-shell-extensions (3.22.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 10 Nov 2016 19:36:44 +0100
+
+gnome-shell-extensions (3.22.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 11 Oct 2016 17:58:31 +0200
+
+gnome-shell-extensions (3.22.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 20 Sep 2016 01:59:50 +0200
+
+gnome-shell-extensions (3.21.92-1) unstable; urgency=medium
+
+  * New upstream development release.
+  * Replace Build-Depends gnome-common with pkg-config and gettext.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 13 Sep 2016 22:13:19 +0200
+
+gnome-shell-extensions (3.21.91-1) unstable; urgency=medium
+
+  * New upstream beta release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 30 Aug 2016 19:57:32 +0200
+
+gnome-shell-extensions (3.21.90-1) experimental; urgency=medium
+
+  [ Andreas Henriksson ]
+  * New upstream beta release.
+  * Update build-dependencies according to configure.ac changes:
+    - drop intltool, now gettext is used instead.
+
+  [ Jeremy Bicha ]
+  * Convert from cdbs to dh
+  * Add debian/docs to install NEWS and README
+  * Bump dh compat to 10
+  * Update Vcs fields
+  * Refresh patches
+
+ -- Andreas Henriksson <andreas@fatal.se>  Sun, 21 Aug 2016 05:36:17 +0200
+
+gnome-shell-extensions (3.21.4-1) experimental; urgency=medium
+
+  * New upstream development release.
+  * Stop hard-coding Victor Seva in the Uploaders field
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 12 Aug 2016 16:28:33 +0200
+
+gnome-shell-extensions (3.20.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.8.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 11 May 2016 15:21:35 +0200
+
+gnome-shell-extensions (3.20.0-2) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 17 Apr 2016 00:25:25 +0200
+
+gnome-shell-extensions (3.20.0-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 25 Mar 2016 10:48:00 +0100
+
+gnome-shell-extensions (3.19.92-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Update dont-require-nautilus-classic.patch to apply.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Thu, 17 Mar 2016 12:51:13 +0100
+
+gnome-shell-extensions (3.18.4-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.7.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 06 Mar 2016 22:38:57 +0100
+
+gnome-shell-extensions (3.18.3-2) unstable; urgency=medium
+
+  * Add Breaks/Replaces gnome-shell-common (<< 3.18) (Closes: #808906)
+    - Helps upgrades from Jessie by allowing overwriting
+      /usr/share/gnome-shell/theme/calendar-today.svg et.al.
+      which was previously shipped in gnome-shell-common.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Wed, 10 Feb 2016 01:24:42 +0100
+
+gnome-shell-extensions (3.18.3-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 14 Jan 2016 22:49:16 +0100
+
+gnome-shell-extensions (3.18.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 13 Nov 2015 00:04:09 +0100
+
+gnome-shell-extensions (3.18.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 16 Oct 2015 22:09:01 +0200
+
+gnome-shell-extensions (3.18.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 11 Oct 2015 16:29:18 +0200
+
+gnome-shell-extensions (3.17.92-1) experimental; urgency=medium
+
+  * New upstream release candidate.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 18 Sep 2015 17:28:06 +0200
+
+gnome-shell-extensions (3.16.2-1) unstable; urgency=medium
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/gnome-shell-extensions.gsettings-override:
+    + Dropped, no longer needed as the enabled extension no longer exists.
+      Thanks Artur Rona for noticing. (Closes: #782747)
+
+  [ Michael Biebl ]
+  * New upstream release.
+  * Update Homepage.
+  * Bump debhelper compatibility level to 9.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 02 Jul 2015 19:13:32 +0200
+
+gnome-shell-extensions (3.16.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control.in,
+    debian/rules:
+    + The system monitor extension was removed. Drop the libgtop
+      build and runtime dependencies and stop enabling it.
+  * debian/patches/apps-center-labels.patch,
+    debian/patches/window-list-pointerInNotification.patch,
+    debian/patches/menu-arrows-icons.patch:
+    + Dropped, merged upstream.
+  * debian/patches/dont-require-nautilus-classic.patch:
+    + Updated for the new version.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 14 Jun 2015 15:23:59 +0200
+
+gnome-shell-extensions (3.14.2-1) unstable; urgency=medium
+
+  * New upstream bugfix release.
+  * menu-arrows-icons: new patch. Make arrows consistent with the rest
+    of the shell.
+  * apps-center-labels.patch: patch from upstream git. Center labels
+    vertically in the applications menu.
+  * window-list-pointerInNotification.patch: patch from upstream git.
+    Update window-list extension for an older shell API change.
+
+ -- Josselin Mouette <joss@debian.org>  Sun, 30 Nov 2014 16:06:59 +0100
+
+gnome-shell-extensions (3.14.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control.in: Bump Standards-Version to 3.9.6 (no further changes)
+  * Add missing dependencies against gir packages, including gir1.2-gmenu-3.0,
+    this should fix the apps-menu extension for some people (Closes: #765460).
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 19 Oct 2014 21:17:58 +0200
+
+gnome-shell-extensions (3.14.0-2) unstable; urgency=medium
+
+  * Drop xrandr from EXTENSIONS_DISABLED, this extension was removed
+    upstream.
+  * Add new screenshot-window-sizer extension to EXTENSIONS_ENABLED.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 24 Sep 2014 01:15:32 +0200
+
+gnome-shell-extensions (3.14.0-1) unstable; urgency=medium
+
+  * debian/watch: only scan for stable releases.
+  * New upstream release.
+  * Upload to unstable.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 23 Sep 2014 15:46:30 +0200
+
+gnome-shell-extensions (3.13.91-1) experimental; urgency=medium
+
+  * New upstream development release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Sat, 06 Sep 2014 11:16:39 -0700
+
+gnome-shell-extensions (3.12.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.5
+  * Upload to unstable.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 15 Jul 2014 00:06:09 +0200
+
+gnome-shell-extensions (3.12.0-1) experimental; urgency=low
+
+  [ Jean Schurger ]
+  * New upstream release (3.10.1)
+  * debian/rules: remove one of the 'windowsNavigator' extension listed twice
+    and the 'alternative-system-menu' extension (does not exists anymore)
+  * debian/copyright: Update 'Format:' line
+
+  [ Andreas Henriksson ]
+  * New upstream release (3.12.0)
+  * debian/local/gnome-session-classic,
+    debian/patches/gnome-session-classic-wrapper-script.patch:
+    - update script to include new GNOME_SHELL_SESSION_MODE env variable
+      and update patch to apply again.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 04 Apr 2014 21:43:18 +0200
+
+gnome-shell-extensions (3.8.4-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 13 Oct 2013 18:11:33 +0200
+
+gnome-shell-extensions (3.8.4-1) experimental; urgency=low
+
+  [ Jeremy Bicha ]
+  * New upstream release
+  * Dropped patches applied in new version:
+    - fix-hibernate.patch
+    - fix-applications-menu-resolution-change.patch
+    - look-in-data-home-for-themes.patch
+
+  [ Michael Biebl ]
+  * Add a wrapper script to start the GNOME Classic session as currently
+    Xsession doesn't allow to run gnome-session with custom arguments due to
+    #653327.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 11 Oct 2013 18:55:23 +0200
+
+gnome-shell-extensions (3.8.3.1-1) experimental; urgency=low
+
+  [ Jeremy Bicha ]
+  * New upstream release
+    - default-min-max and static-workspaces extensions have been dropped.
+      Use Classic Mode or tweak org.gnome.shell.overrides in dconf-editor
+  * debian/control.in:
+    - Depend on gnome-session 3.8, required for the new Classic mode.
+    - Update homepage
+  * debian/patches/dont-require-nautilus-classic.patch:
+    - Don't require nautilus-classic since it forces desktop icons
+  * debian/patches/fix-applications-menu-resolution-change.patch:
+    - Backport commit to not break applications menu when screen resolution
+      changes
+  * debian/patches/fix-hibernate.patch:
+    - Backport patch to fix checking whether hibernate is allowed
+  * debian/patches/look-in-data-home-for-themes.patch:
+    - Backport commit to also look in XDG_DATA_HOME (usually ~/.local/share/)
+      for user themes
+  * debian/rules:
+    - Run autoreconf
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 16 Aug 2013 20:25:30 +0200
+
+gnome-shell-extensions (3.8.2-1) experimental; urgency=low
+
+  * Team upload
+
+  [ Victor Seva ]
+  * Recommends gnome-tweak-tool
+
+  [ Jean Schurger ]
+  * New upstream release 3.7.92 (LP: #1017979, #1059152).
+  * Enabled new extensions.
+  * Dropped 'dock' and 'gajim'.
+  * Use ./configure instead of autoreconf.
+  * Bumped Standards-Version to 3.9.4.
+  * Updated Vcs-Svn.
+  * debian/control.in
+    - Added runtime dependency to 'gvfs' (>= 1.16.0).
+      The 'Places' extension rely on a 'gvfs' linked to 'udisks2'.
+
+  [ Simon McVittie ]
+  * New upstream release 3.8.2.
+  * Install the "classic mode"
+  * Enable windowNavigator extension (this means we have everything except
+    example and xrandr, the same as in the Ubuntu gnome3-team's PPA)
+
+ -- Simon McVittie <smcv@debian.org>  Thu, 23 May 2013 09:07:23 +0100
+
+gnome-shell-extensions (3.4.0-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 30 May 2012 13:22:54 +0200
+
+gnome-shell-extensions (3.4.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Remove 01_status-menu_disable_accounts.patch: The alternative-status-menu
+    extension no longer recreates the complete user menu but reuses the one
+    from gnome-shell, so we can't easily get rid of the "Online Accounts" menu
+    entry. We will patch gnome-shell directly instead.
+  * Remove 02-Revert-all-remove-all-GSettings-usage.patch and
+    03-Revert-Remove-all-references-to-localedir-from-metad.patch, no longer
+    required.
+  * Bump Standards-Version to 3.9.3
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 21 May 2012 00:24:56 +0200
+
+gnome-shell-extensions (3.2.3-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * gnome-shell-extensions.gsettings-override: enable the alternative
+    status menu by default. Closes: #648112.
+  * Use ${gnome:Version} to generate strict dependencies, it’s very
+    unlikely that extensions remain compatible after a major upgrade.
+
+  [ Michael Biebl ]
+  * Upload to unstable.
+
+  [ Josselin Mouette ]
+  * 01_status-menu_disable_accounts.patch: new patch. Drop the unusable
+    advertisement for Google. It is already available in the control
+    center anyway.
+
+  [ Michael Biebl ]
+  * New upstream release.
+  * Drop patches which have been merged upstream:
+    - debian/patches/upstream/*
+    - debian/patches/fix-*
+  * Refresh 01_status-menu_disable_accounts.patch.
+  * Add 02-Revert-all-remove-all-GSettings-usage.patch: Use GSettings since we
+    install the extensions system-wide.
+  * Use dh-autoreconf to generate the build system.
+  * Add 03-Revert-Remove-all-references-to-localedir-from-metad.patch: Use
+    locales from system-wide location.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 11 Feb 2012 23:28:53 +0100
+
+gnome-shell-extensions (3.2.0-1) experimental; urgency=low
+
+  [ Victor Seva ]
+  * Initial release (Closes: #627515)
+    Package based on the work by Bilal Akhtar <bilalakhtar@ubuntu.com>
+  * debian/copyright
+    - Added myself
+    - Fixed syntax-error-in-dep5-copyright syntax error
+  * debian/control.in
+    - Added myself as maintainer.
+    - Fix gnome-shell dependency.
+    - Fix gir1.2-gtop-2.0 dependency for systemMonitor ext.
+  * debian/rules
+    - Added uploaders.mk gnome-version.mk includes.
+    - Removed unused variables.
+  * debian/watch added.
+  * No more gnome-shell-extension-* packages.
+  * debian/patches/upstream
+    - patch_967aee7aad2accfb38d91ab56b6c5e91d86a2722.diff
+      popup menu fix
+    - patch_66242aa76a5d59fb4659551575c1fbb42e50b8fb.diff
+      dock fix.
+    - patch_4c5a36e4c0cbe38f2e26b6b3c8b02e88b4b939f7.diff
+      patch_2bba98d6214cffae2eb5cecb9d7c1f6b6d244052.diff
+      systemMonitor: Properly enable/disable
+  * debian/patches
+    - fix_dock_gnome-shell_version.diff
+    - fix_alternate-tab_661281.diff
+    - fix_alternate-tab_gnome-shell_version.diff
+  * debian/rules
+    - EXTENSIONS_ENABLED, EXTENSIONS_DISABLED variables
+    - disabled xrandr-indicator
+
+  [ Michael Biebl ]
+  * debian/watch: Track .xz tarballs.
+  * debian/control.in:
+    - Set pkg-gnome-maintainers@lists.alioth.debian.org as Maintainer and add
+      Victor Seva <linuxmaniac@torreviejawireless.org> to Uploaders.
+    - Wrap (Build-)Depends.
+    - Add Vcs-Svn and Vcs-Browser field.
+  * debian/rules:
+    - Include gnome-get-source.mk.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 12 Nov 2011 18:32:22 +0100
--- a/debian/compat
+++ b/debian/compat
@@ -0,0 +1 @@
+11
--- a/debian/control
+++ b/debian/control
@@ -0,0 +1,49 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+Source: gnome-shell-extensions
+Section: gnome
+Priority: optional
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: Jeremy Bicha <jbicha@debian.org>, Michael Biebl <biebl@debian.org>
+Build-Depends: debhelper (>= 11.1.3),
+               gnome-pkg-tools,
+               meson (>= 0.44.0),
+               sassc
+Rules-Requires-Root: no
+Standards-Version: 4.1.5
+Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
+Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
+
+Package: gnome-shell-extensions
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-shell (>= 3.28),
+         gnome-shell (<< 3.29),
+         gir1.2-atk-1.0,
+         gir1.2-clutter-1.0,
+         gir1.2-gdkpixbuf-2.0,
+         gir1.2-glib-2.0,
+         gir1.2-gmenu-3.0,
+         gir1.2-gtk-3.0,
+         gir1.2-pango-1.0,
+         gvfs (>= 1.16.0),
+         gnome-session-bin (>= 3.8),
+         gnome-settings-daemon (>= 3.24)
+Recommends: gnome-tweaks
+Replaces: gnome-shell-common (<< 3.18)
+Breaks: gnome-shell-common (<< 3.18)
+Description: Extensions to extend functionality of GNOME Shell
+ The GNOME Shell redefines user interactions with the GNOME desktop. In
+ particular, it offers new paradigms for launching applications,
+ accessing documents, and organizing open windows in GNOME. Later, it
+ will introduce a new applets eco-system and offer new solutions for
+ other desktop features, such as notifications and contacts management.
+ The GNOME Shell is intended to replace functions handled by the GNOME
+ Panel and by the window manager in previous versions of GNOME. The GNOME
+ Shell has rich visual effects enabled by new graphical technologies.
+ .
+ GNOME Shell is extensible using extensions. This package contains
+ official GNOME Shell extensions.
--- a/debian/control.in
+++ b/debian/control.in
@@ -0,0 +1,45 @@
+Source: gnome-shell-extensions
+Section: gnome
+Priority: optional
+Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Uploaders: @GNOME_TEAM@
+Build-Depends: debhelper (>= 11.1.3),
+               gnome-pkg-tools,
+               meson (>= 0.44.0),
+               sassc
+Rules-Requires-Root: no
+Standards-Version: 4.1.5
+Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
+Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
+
+Package: gnome-shell-extensions
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-shell (>= 3.28),
+         gnome-shell (<< 3.29),
+         gir1.2-atk-1.0,
+         gir1.2-clutter-1.0,
+         gir1.2-gdkpixbuf-2.0,
+         gir1.2-glib-2.0,
+         gir1.2-gmenu-3.0,
+         gir1.2-gtk-3.0,
+         gir1.2-pango-1.0,
+         gvfs (>= 1.16.0),
+         gnome-session-bin (>= 3.8),
+         gnome-settings-daemon (>= 3.24)
+Recommends: gnome-tweaks
+Replaces: gnome-shell-common (<< 3.18)
+Breaks: gnome-shell-common (<< 3.18)
+Description: Extensions to extend functionality of GNOME Shell
+ The GNOME Shell redefines user interactions with the GNOME desktop. In
+ particular, it offers new paradigms for launching applications,
+ accessing documents, and organizing open windows in GNOME. Later, it
+ will introduce a new applets eco-system and offer new solutions for
+ other desktop features, such as notifications and contacts management.
+ The GNOME Shell is intended to replace functions handled by the GNOME
+ Panel and by the window manager in previous versions of GNOME. The GNOME
+ Shell has rich visual effects enabled by new graphical technologies.
+ .
+ GNOME Shell is extensible using extensions. This package contains
+ official GNOME Shell extensions.
--- a/debian/copyright
+++ b/debian/copyright
@@ -0,0 +1,31 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: gnome-shell-extensions
+Upstream-Contact: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
+Source: https://download.gnome.org/sources/gnome-shell-extensions/
+
+Files: *
+Copyright: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
+License: GPL-2+
+
+Files: debian/*
+Copyright:
+    2011 Victor Seva <linuxmaniac@torreviejawireless.org>
+    2011 Bilal Akhtar <bilalakhtar@ubuntu.com>
+License: GPL-2+
+
+License: GPL-2+
+ This package 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; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT 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, see 
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
--- a/debian/docs
+++ b/debian/docs
@@ -0,0 +1,2 @@
+NEWS
+README.md
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -0,0 +1,5 @@
+[DEFAULT]
+pristine-tar = True
+debian-branch = debian/unstable
+upstream-branch = upstream/3.28.x
+upstream-vcs-tag = %(version)s
--- a/debian/install
+++ b/debian/install
@@ -0,0 +1 @@
+debian/local/gnome-session-classic usr/bin
--- a/debian/local/gnome-session-classic
+++ b/debian/local/gnome-session-classic
@@ -0,0 +1,2 @@
+#! /bin/sh
+env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic "$@"
--- a/debian/patches/gnome-session-classic-wrapper-script.patch
+++ b/debian/patches/gnome-session-classic-wrapper-script.patch
@@ -0,0 +1,30 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Tue, 30 Jan 2018 09:04:03 +0000
+Subject: Use a wrapper script to start GNOME classic session
+
+Xsession currently doesn't allow to pass more then one argument, as it
+otherwise fails with
+Xsession: unable to launch "gnome-session --session classic" X session ---
+"gnome-session --session classic" not found; falling back to default session.
+
+This is due to [1]. Add a wrapper script to start the GNOME classic session
+as a workaround. Once [1] is fixed, this should be removed again.
+
+[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653327.
+---
+ data/gnome-classic.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/gnome-classic.desktop.in b/data/gnome-classic.desktop.in
+index 055ce64..34827ee 100644
+--- a/data/gnome-classic.desktop.in
+++ b/data/gnome-classic.desktop.in
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Name=GNOME Classic
+ Comment=This session logs you into GNOME Classic
+-Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
+Exec=gnome-session-classic
+ TryExec=gnome-session
+ Type=Application
+ DesktopNames=GNOME-Classic;GNOME;
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+#dont-require-nautilus-classic.patch
+gnome-session-classic-wrapper-script.patch
--- a/debian/rules
+++ b/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+EXTENSIONS_ENABLED='alternate-tab, apps-menu, places-menu, \
+ launch-new-instance, window-list, \
+ drive-menu, screenshot-window-sizer, \
+ windowsNavigator, workspace-indicator, \
+ auto-move-windows, native-window-placement, user-theme'
+
+EXTENSIONS_DISABLED='example'
+
+%:
+	dh $@ --with gnome
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		-Denable_extensions=$(EXTENSIONS_ENABLED) \
+		-Dclassic_mode=true
--- a/debian/source/format
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--- a/debian/watch
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=4
+https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \
+	@PACKAGE@@ANY_VERSION@\.tar\.xz
--- a/export-zips.sh
+++ b/export-zips.sh
@@ -22,7 +22,6 @@ for f in $extensiondir/*; do
  schema=$schemadir/org.gnome.shell.extensions.$name.gschema.xml

  cp $srcdir/NEWS $srcdir/COPYING $f
-  cp -r $localedir $f

  if [ -f $schema ]; then
    mkdir $f/schemas
--- a/extensions/alternate-tab/extension.js
+++ b/extensions/alternate-tab/extension.js
@@ -31,7 +31,7 @@ function enable() {
        return injections['_keyPressHandler'].call(this, keysym, action);
    };

-    Main.wm._forcedWindowSwitcher = function(display, window, binding) {
+    Main.wm._forcedWindowSwitcher = function(display, screen, window, binding) {
        /* prevent a corner case where both popups show up at once */
        if (this._workspaceSwitcherPopup != null)
            this._workspaceSwitcherPopup.destroy();
--- a/extensions/auto-move-windows/extension.js
+++ b/extensions/auto-move-windows/extension.js
@@ -79,10 +79,9 @@ class WindowMover {
            return;

        // ensure we have the required number of workspaces
-        let workspaceManager = global.workspace_manager;
-        for (let i = workspaceManager.n_workspaces; i <= workspaceNum; i++) {
+        for (let i = global.screen.n_workspaces; i <= workspaceNum; i++) {
            window.change_workspace_by_index(i - 1, false);
-            workspaceManager.append_new_workspace(false, 0);
+            global.screen.append_new_workspace(false, 0);
        }

        window.change_workspace_by_index(workspaceNum, false);
--- a/extensions/drive-menu/extension.js
+++ b/extensions/drive-menu/extension.js
@@ -175,11 +175,11 @@ class DriveMenu extends PanelMenu.Button {
    }

    destroy() {
-        if (this._addedId) {
-            this._monitor.disconnect(this._addedId);
-            this._monitor.disconnect(this._removedId);
-            this._addedId = 0;
-            this._removedId = 0;
+        if (this._connectedId) {
+            this._monitor.disconnect(this._connectedId);
+            this._monitor.disconnect(this._disconnectedId);
+            this._connectedId = 0;
+            this._disconnectedId = 0;
        }

        super.destroy();
--- a/extensions/places-menu/placeDisplay.js
+++ b/extensions/places-menu/placeDisplay.js
@@ -50,35 +50,33 @@ class PlaceInfo {
        return (_ignored, result) => {
            try {
                Gio.AppInfo.launch_default_for_uri_finish(result);
-            } catch(e) {
-                if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
-                    let source = {
-                        get_icon: () => { return this.icon; }
-                    };
-                    let op = new ShellMountOperation.ShellMountOperation(source);
-                    this.file.mount_enclosing_volume(0, op.mountOp, null, (file, result) => {
-                        try {
-                            op.close();
-                            file.mount_enclosing_volume_finish(result);
-                        } catch(e) {
-                            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
-                                // e.g. user canceled the password dialog
-                                return;
-                            Main.notifyError(_("Failed to mount volume for “%s”").format(this.name), e.message);
-                            return;
-                        }
+            } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
+                let source = {
+                    get_icon: () => { return this.icon; }
+                };
+                let op = new ShellMountOperation.ShellMountOperation(source);
+                this.file.mount_enclosing_volume(0, op.mountOp, null, (file, result) => {
+                    try {
+                        op.close();
+                        file.mount_enclosing_volume_finish(result);
+                    } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED)) {
+                        // e.g. user canceled the password dialog
+                        return;
+                    } catch(e) {
+                        Main.notifyError(_("Failed to mount volume for “%s”").format(this.name), e.message);
+                        return;
+                    }

-                        if (tryMount) {
-                            let callback = this._createLaunchCallback(launchContext, false);
-                            Gio.AppInfo.launch_default_for_uri_async(file.get_uri(),
-                                                                     launchContext,
-                                                                     null,
-                                                                     callback);
-                        }
-                    });
-                } else {
-                    Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message);
-                }
+                    if (tryMount) {
+                        let callback = this._createLaunchCallback(launchContext, false);
+                        Gio.AppInfo.launch_default_for_uri_async(file.get_uri(),
+                                                                 launchContext,
+                                                                 null,
+                                                                 callback);
+                    }
+                });
+            } catch(e) {
+                Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message);
            }
        }
    }
@@ -99,10 +97,8 @@ class PlaceInfo {
                                           let info = file.query_info_finish(result);
                                           this.icon = info.get_symbolic_icon();
                                           this.emit('changed');
-                                       } catch(e) {
-                                           if (e instanceof Gio.IOErrorEnum)
-                                               return;
-                                           throw e;
+                                       } catch(e if e instanceof Gio.IOErrorEnum) {
+                                           return;
                                       }
                                   });

@@ -127,10 +123,8 @@ class PlaceInfo {
        try {
            let info = this.file.query_info('standard::display-name', 0, null);
            return info.get_display_name();
-        } catch(e) {
-            if (e instanceof Gio.IOErrorEnum)
-                return this.file.get_basename();
-            throw e;
+        } catch(e if e instanceof Gio.IOErrorEnum) {
+            return this.file.get_basename();
        }
    }
 };
@@ -355,10 +349,8 @@ var PlacesManager = class {
            let file = Gio.File.new_for_path(specialPath), info;
            try {
                info = new PlaceInfo('special', file);
-            } catch(e) {
-                if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                    continue;
-                throw e;
+            } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
+                continue;
            }

            specials.push(info);
@@ -522,10 +514,8 @@ var PlacesManager = class {

        try {
            devItem = new PlaceDeviceInfo(kind, mount);
-        } catch(e) {
-            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                return;
-            throw e;
+        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
+            return;
        }

        this._places[kind].push(devItem);
@@ -536,10 +526,8 @@ var PlacesManager = class {

        try {
            volItem = new PlaceVolumeInfo(kind, volume);
-        } catch(e) {
-            if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
-                return;
-            throw e;
+        } catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
+            return;
        }

        this._places[kind].push(volItem);
--- a/extensions/screenshot-window-sizer/extension.js
+++ b/extensions/screenshot-window-sizer/extension.js
@@ -69,7 +69,7 @@ let SIZES = [
    [1600, 900]
 ];

-function cycleScreenshotSizes(display, window, binding) {
+function cycleScreenshotSizes(display, screen, window, binding) {
    // Probably this isn't useful with 5 sizes, but you can decrease instead
    // of increase by holding down shift.
    let modifiers = binding.get_modifiers();
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -238,10 +238,10 @@ class BaseButton {

        if (this._perMonitor) {
            this._windowEnteredMonitorId =
-                global.display.connect('window-entered-monitor',
+                global.screen.connect('window-entered-monitor',
                    this._windowEnteredOrLeftMonitor.bind(this));
            this._windowLeftMonitorId =
-                global.display.connect('window-left-monitor',
+                global.screen.connect('window-left-monitor',
                    this._windowEnteredOrLeftMonitor.bind(this));
        }
    }
@@ -282,12 +282,12 @@ class BaseButton {
            this.actor.remove_style_class_name('focused');
    }

-    _windowEnteredOrLeftMonitor(metaDisplay, monitorIndex, metaWindow) {
+    _windowEnteredOrLeftMonitor(metaScreen, monitorIndex, metaWindow) {
        throw new Error('Not implemented');
    }

    _isWindowVisible(window) {
-        let workspace = global.workspace_manager.get_active_workspace();
+        let workspace = global.screen.get_active_workspace();

        return !window.skip_taskbar &&
               window.located_on_workspace(workspace) &&
@@ -315,11 +315,11 @@ class BaseButton {
        global.window_manager.disconnect(this._switchWorkspaceId);

        if (this._windowEnteredMonitorId)
-            global.display.disconnect(this._windowEnteredMonitorId);
+            global.screen.disconnect(this._windowEnteredMonitorId);
        this._windowEnteredMonitorId = 0;

        if (this._windowLeftMonitorId)
-            global.display.disconnect(this._windowLeftMonitorId);
+            global.screen.disconnect(this._windowLeftMonitorId);
        this._windowLeftMonitorId = 0;
    }
 };
@@ -377,7 +377,7 @@ class WindowButton extends BaseButton {
            this.actor.remove_style_class_name('minimized');
    }

-    _windowEnteredOrLeftMonitor(metaDisplay, monitorIndex, metaWindow) {
+    _windowEnteredOrLeftMonitor(metaScreen, monitorIndex, metaWindow) {
        if (monitorIndex == this._monitorIndex && metaWindow == this.metaWindow)
            this._updateVisibility();
    }
@@ -518,7 +518,7 @@ class AppButton extends BaseButton {
        this._updateStyle();
    }

-    _windowEnteredOrLeftMonitor(metaDisplay, monitorIndex, metaWindow) {
+    _windowEnteredOrLeftMonitor(metaScreen, monitorIndex, metaWindow) {
        if (this._windowTracker.get_window_app(metaWindow) == this.app &&
            monitorIndex == this._monitorIndex) {
            this._updateVisibility();
@@ -529,7 +529,7 @@ class AppButton extends BaseButton {
    _updateVisibility() {
        if (!this._perMonitor) {
            // fast path: use ShellApp API to avoid iterating over all windows.
-            let workspace = global.workspace_manager.get_active_workspace();
+            let workspace = global.screen.get_active_workspace();
            this.actor.visible = this.app.is_on_workspace(workspace);
        } else {
            this.actor.visible = this.getWindowList().length >= 1;
@@ -652,9 +652,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
                                        x_expand: true, y_expand: true });
        this.actor.add_actor(container);

-        let workspaceManager = global.workspace_manager;
-
-        this._currentWorkspace = workspaceManager.get_active_workspace().index();
+        this._currentWorkspace = global.screen.get_active_workspace().index();
        this.statusLabel = new St.Label({ text: this._getStatusText(),
                                          x_align: Clutter.ActorAlign.CENTER,
                                          y_align: Clutter.ActorAlign.CENTER });
@@ -662,11 +660,11 @@ class WorkspaceIndicator extends PanelMenu.Button {

        this.workspacesItems = [];

-        this._workspaceManagerSignals = [];
-        this._workspaceManagerSignals.push(workspaceManager.connect('notify::n-workspaces',
-                                                                    this._updateMenu.bind(this)));
-        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-switched',
-                                                                          this._updateIndicator.bind(this)));
+        this._screenSignals = [];
+        this._screenSignals.push(global.screen.connect('notify::n-workspaces',
+                                                       this._updateMenu.bind(this)));
+        this._screenSignals.push(global.screen.connect_after('workspace-switched',
+                                                             this._updateIndicator.bind(this)));

        this.actor.connect('scroll-event', this._onScrollEvent.bind(this));
        this._updateMenu();
@@ -678,8 +676,8 @@ class WorkspaceIndicator extends PanelMenu.Button {
    }

    destroy() {
-        for (let i = 0; i < this._workspaceManagerSignals.length; i++)
-            global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
+        for (let i = 0; i < this._screenSignals.length; i++)
+            global.screen.disconnect(this._screenSignals[i]);

        if (this._settingsChangedId) {
            this._settings.disconnect(this._settingsChangedId);
@@ -691,28 +689,25 @@ class WorkspaceIndicator extends PanelMenu.Button {

    _updateIndicator() {
        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
-        this._currentWorkspace = global.workspace_manager.get_active_workspace().index();
+        this._currentWorkspace = global.screen.get_active_workspace().index();
        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);

        this.statusLabel.set_text(this._getStatusText());
    }

    _getStatusText() {
-        let workspaceManager = global.workspace_manager;
-        let current = workspaceManager.get_active_workspace().index();
-        let total = workspaceManager.n_workspaces;
+        let current = global.screen.get_active_workspace().index();
+        let total = global.screen.n_workspaces;

        return '%d / %d'.format(current + 1, total);
    }

    _updateMenu() {
-        let workspaceManager = global.workspace_manager;
-
        this.menu.removeAll();
        this.workspacesItems = [];
-        this._currentWorkspace = workspaceManager.get_active_workspace().index();
+        this._currentWorkspace = global.screen.get_active_workspace().index();

-        for(let i = 0; i < workspaceManager.n_workspaces; i++) {
+        for(let i = 0; i < global.screen.n_workspaces; i++) {
            let name = Meta.prefs_get_workspace_name(i);
            let item = new PopupMenu.PopupMenuItem(name);
            item.workspaceId = i;
@@ -732,10 +727,8 @@ class WorkspaceIndicator extends PanelMenu.Button {
    }

    _activate(index) {
-        let workspaceManager = global.workspace_manager;
-
-        if(index >= 0 && index < workspaceManager.n_workspaces) {
-            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
+        if(index >= 0 && index < global.screen.n_workspaces) {
+            let metaWorkspace = global.screen.get_workspace_by_index(index);
            metaWorkspace.activate(global.get_current_time());
        }
    }
@@ -799,12 +792,14 @@ class WindowList {
        indicatorsBox.add(this._workspaceIndicator.container, { expand: false, y_fill: true });

        this._mutterSettings = new Gio.Settings({ schema_id: 'org.gnome.mutter' });
+        this._workspaceSettings = this._getWorkspaceSettings();
        this._workspacesOnlyOnPrimaryChangedId =
-            this._mutterSettings.connect('changed::workspaces-only-on-primary',
-                                         this._updateWorkspaceIndicatorVisibility.bind(this));
+            this._workspaceSettings.connect('changed::workspaces-only-on-primary',
+                                            this._updateWorkspaceIndicatorVisibility.bind(this));
+        this._dynamicWorkspacesSettings = this._getDynamicWorkspacesSettings();
        this._dynamicWorkspacesChangedId =
-            this._mutterSettings.connect('changed::dynamic-workspaces',
-                                         this._updateWorkspaceIndicatorVisibility.bind(this));
+            this._dynamicWorkspacesSettings.connect('changed::dynamic-workspaces',
+                                                    this._updateWorkspaceIndicatorVisibility.bind(this));
        this._updateWorkspaceIndicatorVisibility();

        this._menuManager = new PopupMenu.PopupMenuManager(this);
@@ -838,12 +833,10 @@ class WindowList {
                    this._updateKeyboardAnchor();
                });

-        let workspaceManager = global.workspace_manager;
-
        this._workspaceSignals = new Map();
        this._nWorkspacesChangedId =
-            workspaceManager.connect('notify::n-workspaces',
-                                     this._onWorkspacesChanged.bind(this));
+            global.screen.connect('notify::n-workspaces',
+                                  this._onWorkspacesChanged.bind(this));
        this._onWorkspacesChanged();

        this._switchWorkspaceId =
@@ -863,7 +856,7 @@ class WindowList {
            });

        this._fullscreenChangedId =
-            global.display.connect('in-fullscreen-changed', () => {
+            global.screen.connect('in-fullscreen-changed', () => {
                this._updateKeyboardAnchor();
            });

@@ -888,6 +881,19 @@ class WindowList {
        this._groupingModeChanged();
    }

+    _getDynamicWorkspacesSettings() {
+        if (this._workspaceSettings.list_keys().includes('dynamic-workspaces'))
+            return this._workspaceSettings;
+        return this._mutterSettings;
+    }
+
+    _getWorkspaceSettings() {
+        let settings = global.get_overrides_settings() || this._mutterSettings;
+        if (settings.list_keys().includes('workspaces-only-on-primary'))
+            return settings;
+        return this._mutterSettings;
+    }
+
    _onScrollEvent(actor, event) {
        let direction = event.get_scroll_direction();
        let diff = 0;
@@ -917,11 +923,10 @@ class WindowList {
    }

    _updateWorkspaceIndicatorVisibility() {
-        let workspaceManager = global.workspace_manager;
-        let hasWorkspaces = this._mutterSettings.get_boolean('dynamic-workspaces') ||
-                            workspaceManager.n_workspaces > 1;
+        let hasWorkspaces = this._dynamicWorkspacesSettings.get_boolean('dynamic-workspaces') ||
+                            global.screen.n_workspaces > 1;
        let workspacesOnMonitor = this._monitor == Main.layoutManager.primaryMonitor ||
-                                  !this._mutterSettings.get_boolean('workspaces-only-on-primary');
+                                  !this._workspaceSettings.get_boolean('workspaces-only-on-primary');

        this._workspaceIndicator.actor.visible = hasWorkspaces && workspacesOnMonitor;
    }
@@ -934,7 +939,7 @@ class WindowList {
        let [, childWidth] = children[0].get_preferred_width(-1);
        let spacing = this._windowList.layout_manager.spacing;

-        let workspace = global.workspace_manager.get_active_workspace();
+        let workspace = global.screen.get_active_workspace();
        let windows = global.display.get_tab_list(Meta.TabList.NORMAL, workspace);
        if (this._perMonitor)
            windows = windows.filter(w => w.get_monitor() == this._monitor.index);
@@ -1074,11 +1079,9 @@ class WindowList {
    }

    _onWorkspacesChanged() {
-        let workspaceManager = global.workspace_manager;
-        let numWorkspaces = workspaceManager.n_workspaces;
-
+        let numWorkspaces = global.screen.n_workspaces;
        for (let i = 0; i < numWorkspaces; i++) {
-            let workspace = workspaceManager.get_workspace_by_index(i);
+            let workspace = global.screen.get_workspace_by_index(i);
            if (this._workspaceSignals.has(workspace))
                continue;

@@ -1096,11 +1099,9 @@ class WindowList {
    }

    _disconnectWorkspaceSignals() {
-        let workspaceManager = global.workspace_manager;
-        let numWorkspaces = workspaceManager.n_workspaces;
-
+        let numWorkspaces = global.screen.n_workspaces;
        for (let i = 0; i < numWorkspaces; i++) {
-            let workspace = workspaceManager.get_workspace_by_index(i);
+            let workspace = global.screen.get_workspace_by_index(i);
            let signals = this._workspaceSignals.get(workspace);
            this._workspaceSignals.delete(workspace);
            workspace.disconnect(signals._windowAddedId);
@@ -1162,8 +1163,8 @@ class WindowList {
    }

    _onDestroy() {
-        this._mutterSettings.disconnect(this._workspacesOnlyOnPrimaryChangedId);
-        this._mutterSettings.disconnect(this._dynamicWorkspacesChangedId);
+        this._workspaceSettings.disconnect(this._workspacesOnlyOnPrimaryChangedId);
+        this._dynamicWorkspacesSettings.disconnect(this._dynamicWorkspacesChangedId);

        this._workspaceIndicator.destroy();

@@ -1178,7 +1179,7 @@ class WindowList {
        Main.layoutManager.hideKeyboard();

        this._disconnectWorkspaceSignals();
-        global.workspace_manager.disconnect(this._nWorkspacesChangedId);
+        global.screen.disconnect(this._nWorkspacesChangedId);
        this._nWorkspacesChangedId = 0;

        global.window_manager.disconnect(this._switchWorkspaceId);
@@ -1188,7 +1189,7 @@ class WindowList {
        Main.overview.disconnect(this._overviewShowingId);
        Main.overview.disconnect(this._overviewHidingId);

-        global.display.disconnect(this._fullscreenChangedId);
+        global.screen.disconnect(this._fullscreenChangedId);

        Main.xdndHandler.disconnect(this._dragBeginId);
        Main.xdndHandler.disconnect(this._dragEndId);
--- a/extensions/windowsNavigator/extension.js
+++ b/extensions/windowsNavigator/extension.js
@@ -135,16 +135,14 @@ function enable() {
        if(Main.overview.viewSelector._activePage != Main.overview.viewSelector._workspacesPage)
            return false;

-        let workspaceManager = global.workspace_manager;
-
        if ((o.get_key_symbol() == Clutter.KEY_Alt_L ||
             o.get_key_symbol() == Clutter.KEY_Alt_R)
            && !this._pickWorkspace) {
            this._prevFocusActor = global.stage.get_key_focus();
            global.stage.set_key_focus(null);
-            this._active = workspaceManager.get_active_workspace_index();
+            this._active = global.screen.get_active_workspace_index();
            this._pickWindow = true;
-            this._workspaces[workspaceManager.get_active_workspace_index()].showWindowsTooltips();
+            this._workspaces[global.screen.get_active_workspace_index()].showWindowsTooltips();
            return true;
        }
        if ((o.get_key_symbol() == Clutter.KEY_Control_L ||
@@ -168,7 +166,7 @@ function enable() {
            return true;

        if (this._pickWindow) {
-            if (this._active != workspaceManager.get_active_workspace_index()) {
+            if (this._active != global.screen.get_active_workspace_index()) {
                this._hideTooltips();
                return false;
            }
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -25,9 +25,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
    constructor() {
        super(0.0, _("Workspace Indicator"));

-        let workspaceManager = global.workspace_manager;
-
-        this._currentWorkspace = workspaceManager.get_active_workspace().index();
+        this._currentWorkspace = global.screen.get_active_workspace().index();
        this.statusLabel = new St.Label({ y_align: Clutter.ActorAlign.CENTER,
                                          text: this._labelText() });

@@ -37,13 +35,12 @@ class WorkspaceIndicator extends PanelMenu.Button {
        this._workspaceSection = new PopupMenu.PopupMenuSection();
        this.menu.addMenuItem(this._workspaceSection);

-        this._workspaceManagerSignals = [];
-        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-added',
-                                                                          this._createWorkspacesSection.bind(this)));
-        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-removed',
-                                                                          this._createWorkspacesSection.bind(this)));
-        this._workspaceManagerSignals.push(workspaceManager.connect_after('workspace-switched',
-                                                                          this._updateIndicator.bind(this)));
+        this._screenSignals = [];
+        this._screenSignals.push(global.screen.connect_after('workspace-added',                                                              this._createWorkspacesSection.bind(this)));
+        this._screenSignals.push(global.screen.connect_after('workspace-removed',
+                                                             this._createWorkspacesSection.bind(this)));
+        this._screenSignals.push(global.screen.connect_after('workspace-switched',
+                                                             this._updateIndicator.bind(this)));

        this.actor.connect('scroll-event', this._onScrollEvent.bind(this));
        this._createWorkspacesSection();
@@ -58,8 +55,8 @@ class WorkspaceIndicator extends PanelMenu.Button {
    }

    destroy() {
-        for (let i = 0; i < this._workspaceManagerSignals.length; i++)
-            global.workspace_manager.disconnect(this._workspaceManagerSignals[i]);
+        for (let i = 0; i < this._screenSignals.length; i++)
+            global.screen.disconnect(this._screenSignals[i]);

        if (this._settingsChangedId) {
            this._settings.disconnect(this._settingsChangedId);
@@ -71,7 +68,7 @@ class WorkspaceIndicator extends PanelMenu.Button {

    _updateIndicator() {
        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.NONE);
-        this._currentWorkspace = global.workspace_manager.get_active_workspace().index();
+        this._currentWorkspace = global.screen.get_active_workspace().index();
        this.workspacesItems[this._currentWorkspace].setOrnament(PopupMenu.Ornament.DOT);

        this.statusLabel.set_text(this._labelText());
@@ -86,14 +83,12 @@ class WorkspaceIndicator extends PanelMenu.Button {
    }

    _createWorkspacesSection() {
-        let workspaceManager = global.workspace_manager;
-
        this._workspaceSection.removeAll();
        this.workspacesItems = [];
-        this._currentWorkspace = workspaceManager.get_active_workspace().index();
+        this._currentWorkspace = global.screen.get_active_workspace().index();

        let i = 0;
-        for(; i < workspaceManager.n_workspaces; i++) {
+        for(; i < global.screen.n_workspaces; i++) {
            this.workspacesItems[i] = new PopupMenu.PopupMenuItem(this._labelText(i));
            this._workspaceSection.addMenuItem(this.workspacesItems[i]);
            this.workspacesItems[i].workspaceId = i;
@@ -111,10 +106,8 @@ class WorkspaceIndicator extends PanelMenu.Button {
    }

    _activate(index) {
-        let workspaceManager = global.workspace_manager;
-
-        if(index >= 0 && index <  workspaceManager.n_workspaces) {
-            let metaWorkspace = workspaceManager.get_workspace_by_index(index);
+        if(index >= 0 && index <  global.screen.n_workspaces) {
+            let metaWorkspace = global.screen.get_workspace_by_index(index);
            metaWorkspace.activate(global.get_current_time());
        }
    }
@@ -130,7 +123,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
            return;
        }

-        let newIndex = global.workspace_manager.get_active_workspace().index() + diff;
+        let newIndex = global.screen.get_active_workspace().index() + diff;
        this._activate(newIndex);
    }
 };
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-shell-extensions',
-  version: '3.30.0',
+  version: '3.28.1',
  meson_version: '>= 0.44.0',
  license: 'GPL2+'
 )
@@ -34,6 +34,7 @@ endif
 uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'

 classic_extensions = [
+  'alternate-tab',
  'apps-menu',
  'places-menu',
  'launch-new-instance',
@@ -42,7 +43,6 @@ classic_extensions = [

 default_extensions = classic_extensions
 default_extensions += [
-  'alternate-tab',
  'drive-menu',
  'screenshot-window-sizer',
  'windowsNavigator',
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,6 @@
 data/gnome-classic.desktop.in
 data/gnome-classic.session.desktop.in
+data/org.gnome.shell.extensions.classic-overrides.gschema.xml
 extensions/alternate-tab/prefs.js
 extensions/apps-menu/extension.js
 extensions/auto-move-windows/extension.js