diff -Nru gnome-shell-extension-log-out-button-1.0.7/debian/changelog gnome-shell-extension-log-out-button-1.0.8/debian/changelog --- gnome-shell-extension-log-out-button-1.0.7/debian/changelog 2018-01-11 10:30:42.000000000 +0000 +++ gnome-shell-extension-log-out-button-1.0.8/debian/changelog 2019-10-16 21:46:24.000000000 +0000 @@ -1,3 +1,15 @@ +gnome-shell-extension-log-out-button (1.0.8-1) unstable; urgency=medium + + * Update watch file + * New upstream version 1.0.8 (Closes: #941960) + * Update maintainer email + * Bump Standards-Version to 4.4.1 (no change) + * Bump copyright years + * Use debhelper-compat + * Move git repo to debian group + + -- Kyle Robbertze Wed, 16 Oct 2019 23:46:24 +0200 + gnome-shell-extension-log-out-button (1.0.7-1) unstable; urgency=medium * New upstream release diff -Nru gnome-shell-extension-log-out-button-1.0.7/debian/compat gnome-shell-extension-log-out-button-1.0.8/debian/compat --- gnome-shell-extension-log-out-button-1.0.7/debian/compat 2018-01-09 09:57:55.000000000 +0000 +++ gnome-shell-extension-log-out-button-1.0.8/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru gnome-shell-extension-log-out-button-1.0.7/debian/control gnome-shell-extension-log-out-button-1.0.8/debian/control --- gnome-shell-extension-log-out-button-1.0.7/debian/control 2018-01-10 13:52:52.000000000 +0000 +++ gnome-shell-extension-log-out-button-1.0.8/debian/control 2019-10-16 21:45:46.000000000 +0000 @@ -1,12 +1,15 @@ Source: gnome-shell-extension-log-out-button Section: gnome Priority: optional -Maintainer: Kyle Robbertze -Build-Depends: debhelper (>= 10), libglib2.0-bin, gettext -Standards-Version: 4.1.3 +Maintainer: Kyle Robbertze +Build-Depends: debhelper (>= 10), + debhelper-compat (=12), + libglib2.0-bin, + gettext +Standards-Version: 4.4.1 Homepage: https://gitlab.com/paddatrapper/log-out-button-gnome-extension -Vcs-Git: https://salsa.debian.org/paddatrapper-guest/log-out-button-gnome-extension -Vcs-Browser: https://salsa.debian.org/paddatrapper-guest/log-out-button-gnome-extension +Vcs-Git: https://salsa.debian.org/debian/gnome-shell-extension-log-out-button.git +Vcs-Browser: https://salsa.debian.org/debian/gnome-shell-extension-log-out-button Package: gnome-shell-extension-log-out-button Architecture: all diff -Nru gnome-shell-extension-log-out-button-1.0.7/debian/copyright gnome-shell-extension-log-out-button-1.0.8/debian/copyright --- gnome-shell-extension-log-out-button-1.0.7/debian/copyright 2018-01-09 09:57:55.000000000 +0000 +++ gnome-shell-extension-log-out-button-1.0.8/debian/copyright 2019-10-16 21:39:18.000000000 +0000 @@ -7,7 +7,7 @@ License: GPL-3 Files: debian/* -Copyright: 2016 Kyle Robbertze +Copyright: 2016-2019 Kyle Robbertze License: GPL-3 Files: src/convenience.js diff -Nru gnome-shell-extension-log-out-button-1.0.7/debian/watch gnome-shell-extension-log-out-button-1.0.8/debian/watch --- gnome-shell-extension-log-out-button-1.0.7/debian/watch 2018-01-10 13:52:48.000000000 +0000 +++ gnome-shell-extension-log-out-button-1.0.8/debian/watch 2019-10-16 21:36:22.000000000 +0000 @@ -1,3 +1,3 @@ -version=3 -opts=filenamemangle=s/.*\/(\d\S\d\S+)\/archive\.tar\.gz/log-out-button-gnome-extension-$1\.tar\.gz/g \ - https://gitlab.com/paddatrapper/log-out-button-gnome-extension/tags?sort=updated_desc .*(\d\S\d\S+)/archive\.tar\.gz +version=4 +opts=filenamemangle=s/.*\/archive\/(\d\S+)\/log-out-button-gnome-extension.*\.tar\.gz/gnome-shell-extension-log-out-button-$1\.tar\.gz/g \ + https://gitlab.com/paddatrapper/log-out-button-gnome-extension/tags?sort=updated_desc .*/archive/(\d\S+)/.*\.tar\.gz.* diff -Nru gnome-shell-extension-log-out-button-1.0.7/README.md gnome-shell-extension-log-out-button-1.0.8/README.md --- gnome-shell-extension-log-out-button-1.0.7/README.md 2018-01-11 10:26:59.000000000 +0000 +++ gnome-shell-extension-log-out-button-1.0.8/README.md 2019-10-16 21:17:53.000000000 +0000 @@ -3,15 +3,15 @@ power-off, lock and settings buttons in the system action list. ## Install -### Dependencies: Building LogOutButton from source requires: - Glib development files (`libglib2.0-dev`) - `gettext` -### Install +To install run: - ./install.sh + $ sudo apt install libglib2.0-dev gettext + $ ./install.sh local-install You may need to restart GNOME (Alt + F2, r) before you see LogOutButton in your list of extensions diff -Nru gnome-shell-extension-log-out-button-1.0.7/src/extension.js gnome-shell-extension-log-out-button-1.0.8/src/extension.js --- gnome-shell-extension-log-out-button-1.0.7/src/extension.js 2018-01-11 10:26:59.000000000 +0000 +++ gnome-shell-extension-log-out-button-1.0.8/src/extension.js 2019-10-16 21:17:53.000000000 +0000 @@ -15,15 +15,16 @@ * along with LogOutButton. If not, see . **********************************************************************/ -const Gettext = imports.gettext; const ExtensionUtils = imports.misc.extensionUtils; const Main = imports.ui.main; const Me = ExtensionUtils.getCurrentExtension(); const Convenience = Me.imports.convenience; -const _ = Gettext.gettext; +const _ = imports.gettext.gettext; const System = Main.panel.statusArea.aggregateMenu._system; +const GnomeSession = imports.misc.gnomeSession; +const LOGOUT_MODE_NORMAL = 0; -let _logoutButton = null; +var _logoutButton = null; /** * Initialises the extension @@ -35,10 +36,12 @@ /* * Enables the extension */ -function enable () { +function enable() { _logoutButton = System._createActionButton('application-exit-symbolic', _("Log Out")); _logoutButton.connect('button-press-event', _logout); - if (System._session === undefined) { // GNOME >=3.26 + if (System._actionsItem === undefined) { // GNOME >= 3.33 + System.buttonGroup.add(_logoutButton, { expand: true, x_fill: false }); + } else if (System._session === undefined) { // GNOME >=3.26 System._actionsItem.actor.add_child(_logoutButton); } else { System._actionsItem.actor.add_child(_logoutButton, { expand: true, x_fill: false }); @@ -48,18 +51,23 @@ /* * Disables the extension */ -function disable () { - System._actionsItem.actor.remove_child(_logoutButton); +function disable() { + if (System._actionsItem === undefined) { // GNOME >= 3.33 + System.buttonGroup.remove_child(_logoutButton); + } else { + System._actionsItem.actor.remove_child(_logoutButton); + } } /* * Initiates a log out when the log out button is clicked */ -function _logout () { +function _logout() { System.menu.itemActivated(); Main.overview.hide(); if (System._session === undefined) { // GNOME >=3.26 - System._systemActions.activateLogout(); + var sessionManager = new GnomeSession.SessionManager(); + sessionManager.LogoutRemote(LOGOUT_MODE_NORMAL); } else { System._session.LogoutRemote(0) }