Team upload

Closes: #888608

debian/changelog

@@ -1,3 +1,18 @@
+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

debian/control

@@ -13,9 +13,9 @@ Build-Depends: debhelper (>= 10),
                gnome-pkg-tools,
                libgnome-desktop-3-dev (>= 3.2.0),
 Standards-Version: 4.1.2
+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
-Vcs-Git: https://anonscm.debian.org/git/pkg-gnome/gnome-shell-extensions.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-gnome/gnome-shell-extensions.git
 
 Package: gnome-shell-extensions
 Architecture: all

debian/control.in

@@ -9,9 +9,9 @@ Build-Depends: debhelper (>= 10),
                gnome-pkg-tools,
                libgnome-desktop-3-dev (>= 3.2.0),
 Standards-Version: 4.1.2
+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
-Vcs-Git: https://anonscm.debian.org/git/pkg-gnome/gnome-shell-extensions.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-gnome/gnome-shell-extensions.git
 
 Package: gnome-shell-extensions
 Architecture: all

debian/patches/dont-require-nautilus-classic.patch

@@ -1,7 +1,14 @@
-Description: Don't use nautilus-classic since it forces desktop icons
-Author: Jeremy Bicha <jbicha@ubuntu.com>
-Bug: https://bugzilla.gnome.org/695088
+From: Jeremy Bicha <jbicha@ubuntu.com>
+Date: Tue, 30 Jan 2018 09:04:03 +0000
+Subject: Don't use nautilus-classic since it forces desktop icons
 
+Bug: https://bugzilla.gnome.org/695088
+---
+ data/gnome-classic.session.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/gnome-classic.session.desktop.in b/data/gnome-classic.session.desktop.in
+index 392ec37..258096e 100644
 --- a/data/gnome-classic.session.desktop.in
 +++ b/data/gnome-classic.session.desktop.in
 @@ -1,3 +1,3 @@

debian/patches/gnome-session-classic-wrapper-script.patch

@@ -1,19 +1,24 @@
-Description: 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.
-Author: Michael Biebl <biebl@debian.org>
+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
 
-Index: gnome-shell-extensions-3.21.90/data/gnome-classic.desktop.in
-===================================================================
---- gnome-shell-extensions-3.21.90.orig/data/gnome-classic.desktop.in
-+++ gnome-shell-extensions-3.21.90/data/gnome-classic.desktop.in
+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

debian/patches/places-menu-Don-t-force-dispose-of-uninitialized-proxies.patch

@@ -0,0 +1,63 @@
+From: =?utf-8?q?Florian_M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Wed, 17 Jan 2018 21:57:49 +0100
+Subject: places-menu: Don't force dispose() of uninitialized proxies
+
+Trying to dispose a proxy object before it has been properly
+initialized triggers an "uncatchable exception", which gjs
+treats as a fatal error since commit c7bdcaab4. We only have
+anything to clean up once the proxy is initialized anyway, so
+don't force dispose() before that.
+
+Origin: upstream, 3.26.2, commit:61594afd687bf5883cc39fa79c5fbdb0d4cc9eda
+Bug: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues/44
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=888608
+---
+ extensions/places-menu/placeDisplay.js | 28 ++++++++++++++++------------
+ 1 file changed, 16 insertions(+), 12 deletions(-)
+
+diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js
+index ba316bf..9647d63 100644
+--- a/extensions/places-menu/placeDisplay.js
++++ b/extensions/places-menu/placeDisplay.js
+@@ -136,17 +136,18 @@ const RootInfo = new Lang.Class({
+     _init: function() {
+         this.parent('devices', Gio.File.new_for_path('/'), _("Computer"));
+ 
+-        this._proxy = new Hostname1(Gio.DBus.system,
+-                                    'org.freedesktop.hostname1',
+-                                    '/org/freedesktop/hostname1',
+-                                    Lang.bind(this, function(obj, error) {
+-                                        if (error)
+-                                            return;
+-
+-                                        this._proxy.connect('g-properties-changed',
+-                                                            Lang.bind(this, this._propertiesChanged));
+-                                        this._propertiesChanged(obj);
+-                                    }));
++        new Hostname1(Gio.DBus.system,
++                      'org.freedesktop.hostname1',
++                      '/org/freedesktop/hostname1',
++                      Lang.bind(this, function(obj, error) {
++                          if (error)
++                              return;
++
++                          this._proxy = obj;
++                          this._proxy.connect('g-properties-changed',
++                                              Lang.bind(this, this._propertiesChanged));
++                          this._propertiesChanged(obj);
++                      }));
+     },
+ 
+     getIcon: function() {
+@@ -163,7 +164,10 @@ const RootInfo = new Lang.Class({
+     },
+ 
+     destroy: function() {
+-        this._proxy.run_dispose();
++        if (this._proxy) {
++            this._proxy.run_dispose();
++            this._proxy = null;
++        }
+         this.parent();
+     }
+ });

debian/patches/series

@@ -1,2 +1,3 @@
+places-menu-Don-t-force-dispose-of-uninitialized-proxies.patch
 dont-require-nautilus-classic.patch
 gnome-session-classic-wrapper-script.patch