Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: pu
Hi,
please find attached a proposed update for gnome-shell. It includes
these changes:
- a bugfix in the “gdm-shell” mode of the login manager;
- a move of the first GC pass much earlier in the session, to avoid
losing several minutes worth of work if it locks up (I hope you
remember the trouble with this crappy GC during the freeze);
- a watchdog to suicide the process (and let gnome-session restart it)
if the GC actually locks up.
Unfortunately I couldn’t have definite confirmation, in sid, that the
latter change does the trick for the handful of users affected by the
deadlock, since most of them migrated to gnome-fallback or another DE,
but it should be harmless, and from my testing of a simulated deadlock,
it worked.
Thanks for considering,
--
Joss
Index: debian/changelog
===
--- debian/changelog (révision 38749)
+++ debian/changelog (copie de travail)
@@ -1,3 +1,20 @@
+gnome-shell (3.4.2-7+deb7u1) UNRELEASED; urgency=low
+
+ [ Josselin Mouette ]
+ * 30_lockup_gc.patch:
++ Run the GC a first time after 15 seconds, and next every 10
+ minutes. This is to avoid running into a deadlock (which often
+ happens the first time) and lose 10 minutes of work.
++ Add a watchdog thread to suicide the process after 10 seconds if
+ the GC locks up.
+
+ [ Sébastien Villemot ]
+ * debian/patches/61-disable-restart-buttons.patch: new patch, backported from
+upstream. Makes the 'disable-restart-buttons' option of gdm-shell work.
+(Closes: #714862)
+
+ -- Josselin Mouette j...@debian.org Thu, 20 Jun 2013 00:56:14 +0200
+
gnome-shell (3.4.2-7) unstable; urgency=low
[ Michael Biebl ]
Index: debian/patches/61-disable-restart-buttons.patch
===
--- debian/patches/61-disable-restart-buttons.patch (révision 0)
+++ debian/patches/61-disable-restart-buttons.patch (révision 39004)
@@ -0,0 +1,62 @@
+Description: loginScreen: Add support for 'disable-restart-buttons'
+ GDM's GSettings schema contains a 'disable-restart-buttons' key
+ that currently is only supported by the fallback greeter.
+ Implement support in the shell greeter as well.
+ .
+ Compared to the original upstream fix, this patch handles gracefully the case
+ where gdm's schema are not available, in order to prevent crashes if gdm3 is
+ not installed.
+Origin: backport, https://git.gnome.org/browse/gnome-shell/commit/?id=86c85a752eacf4f89d8d5ca5ef1000692385c1af
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=686247
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=714862
+Last-Update: 2013-07-03
+--- a/js/gdm/powerMenu.js
b/js/gdm/powerMenu.js
+@@ -18,6 +18,7 @@
+ * 02111-1307, USA.
+ */
+
++const Gio = imports.gi.Gio;
+ const Lang = imports.lang;
+ const UPowerGlib = imports.gi.UPowerGlib;
+
+@@ -27,6 +28,8 @@
+ const PanelMenu = imports.ui.panelMenu;
+ const PopupMenu = imports.ui.popupMenu;
+
++const _LOGIN_SCREEN_SCHEMA = 'org.gnome.login-screen';
++
+ const PowerMenuButton = new Lang.Class({
+ Name: 'PowerMenuButton',
+ Extends: PanelMenu.SystemStatusButton,
+@@ -40,6 +43,12 @@
+ else
+ this._consoleKitManager = new ConsoleKit.ConsoleKitManager();
+
++if (Gio.Settings.list_schemas().indexOf(_LOGIN_SCREEN_SCHEMA) != -1) {
++this._settings = new Gio.Settings({ schema: _LOGIN_SCREEN_SCHEMA });
++this._settings.connect('changed::disable-restart-buttons',
++ Lang.bind(this, this._updateVisibility));
++}
++
+ this._createSubMenu();
+
+ this._upClient.connect('notify::can-suspend',
+@@ -59,8 +68,16 @@
+ this._updateHaveRestart();
+ },
+
++_hasDisableRestartButtons: function() {
++if (this._settings)
++return this._settings.get_boolean('disable-restart-buttons');
++else
++return false;
++},
++
+ _updateVisibility: function() {
+-if (!this._haveSuspend !this._haveShutdown !this._haveRestart)
++if ((!this._haveSuspend !this._haveShutdown !this._haveRestart)
++|| this._hasDisableRestartButtons())
+ this.actor.hide();
+ else
+ this.actor.show();
Index: debian/patches/series
===
--- debian/patches/series (révision 38749)
+++ debian/patches/series (copie de travail)
@@ -15,3 +15,4 @@
33-screen-reader-l10n.patch
40-force-online.patch
50-remove-folks-integration.patch
+61-disable-restart-buttons.patch
Index: debian/patches/30_lockup_gc.patch
===
--- debian/patches/30_lockup_gc.patch (révision 38749)
+++ debian/patches/30_lockup_gc.patch (copie de travail)
@@ -1,24 +1,30 @@
Index:
