Release version 3.8.4-1 to experimental

Xsession doesn't allow to run gnome-session with custom arguments due to
#653327.

debian/changelog

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

debian/control

@@ -2,11 +2,12 @@
 # 
 # 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: Victor Seva <linuxmaniac@torreviejawireless.org>, Michael Biebl <biebl@debian.org>
+Uploaders: Victor Seva <linuxmaniac@torreviejawireless.org>, Andreas Henriksson <andreas@fatal.se>, Michael Biebl <biebl@debian.org>
 Build-Depends: debhelper (>= 8.0.0),
                cdbs,
                dh-autoreconf,

debian/local/gnome-session-classic

@@ -0,0 +1,2 @@
+#! /bin/sh
+exec gnome-session --session gnome-classic "$@"

debian/patches/fix-applications-menu-resolution-change.patch

@@ -1,70 +0,0 @@
-From a2f14c57c5855a6214aeb66be159ed2a986783f9 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Thu, 04 Jul 2013 13:45:04 +0000
-Subject: apps-menu: don't store the hot corner at creation
-
-HotCorners become invalid when the xrandr configuration changes,
-so instead of storing it fetch it directly from layoutManager when
-needed.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=702038
----
-diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
-index 8e6a4a2..a822d44 100644
---- a/extensions/apps-menu/extension.js
-+++ b/extensions/apps-menu/extension.js
-@@ -227,24 +227,23 @@ const ApplicationsMenu = new Lang.Class({
-     Name: 'ApplicationsMenu',
-     Extends: PopupMenu.PopupMenu,
- 
--    _init: function(sourceActor, arrowAlignment, arrowSide, button, hotCorner) {
-+    _init: function(sourceActor, arrowAlignment, arrowSide, button) {
-         this.parent(sourceActor, arrowAlignment, arrowSide);
-         this._button = button;
--        this._hotCorner = hotCorner;
-     },
- 
-     open: function(animate) {
--        this._hotCorner.setBarrierSize(0);
--        if (this._hotCorner.actor) // fallback corner
--            this._hotCorner.actor.hide();
-+        this._button.hotCorner.setBarrierSize(0);
-+        if (this._button.hotCorner.actor) // fallback corner
-+            this._button.hotCorner.actor.hide();
-         this.parent(animate);
-     },
- 
-     close: function(animate) {
-         let size = Main.layoutManager.panelBox.height;
--        this._hotCorner.setBarrierSize(size);
--        if (this._hotCorner.actor) // fallback corner
--            this._hotCorner.actor.show();
-+        this._button.hotCorner.setBarrierSize(size);
-+        if (this._button.hotCorner.actor) // fallback corner
-+            this._button.hotCorner.actor.show();
-         this.parent(animate);
-     },
- 
-@@ -265,9 +264,8 @@ const ApplicationsButton = new Lang.Class({
- 
-     _init: function() {
-         this.parent(1.0, null, false);
--        this._hotCorner = Main.layoutManager.hotCorners[Main.layoutManager.primaryIndex];
- 
--        this.setMenu(new ApplicationsMenu(this.actor, 1.0, St.Side.TOP, this, this._hotCorner));
-+        this.setMenu(new ApplicationsMenu(this.actor, 1.0, St.Side.TOP, this));
-         Main.panel.menuManager.addMenu(this.menu);
- 
-         // At this moment applications menu is not keyboard navigable at
-@@ -310,6 +308,10 @@ const ApplicationsButton = new Lang.Class({
-         }));
-     },
- 
-+    get hotCorner() {
-+        return Main.layoutManager.hotCorners[Main.layoutManager.primaryIndex];
-+    },
-+
-     _createVertSeparator: function() {
-         let separator = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
-                                              pseudo_class: 'highlighted' });
-

debian/patches/fix-hibernate.patch

@@ -1,24 +0,0 @@
-From 6fbc63e9e6f19aa992ba01cbd905bf486a888bba Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Thu, 04 Jul 2013 14:46:25 +0000
-Subject: alternative-status-menu: unpack the result of CanHibernate
-
-The DBus call yields a GVariant, which we need to unpack to
-obtain the JS value to compare.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=702300
----
-diff --git a/extensions/alternative-status-menu/extension.js b/extensions/alternative-status-menu/extension.js
-index 44c4f75..4285edd 100644
---- a/extensions/alternative-status-menu/extension.js
-+++ b/extensions/alternative-status-menu/extension.js
-@@ -47,7 +47,7 @@ function loginManager_canHibernate(asyncCallback) {
-                              let result, error;
- 
-                              try {
--                                 result = proxy.call_finish(asyncResult);
-+                                 result = proxy.call_finish(asyncResult).deep_unpack();
-                              } catch(e) {
-                                  error = e;
-                              }
-

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

@@ -0,0 +1,25 @@
+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>
+
+Index: gnome-shell-extensions-3.8.4/data/gnome-classic.desktop.in
+===================================================================
+--- gnome-shell-extensions-3.8.4.orig/data/gnome-classic.desktop.in	2013-07-16 13:12:50.000000000 +0200
++++ gnome-shell-extensions-3.8.4/data/gnome-classic.desktop.in	2013-10-11 18:45:36.749513420 +0200
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ _Name=GNOME Classic
+ _Comment=This session logs you into GNOME Classic
+-Exec=gnome-session --session gnome-classic
++Exec=gnome-session-classic
+ TryExec=gnome-session
+ Icon=
+ Type=Application

debian/patches/look-in-data-home-for-themes.patch

@@ -1,23 +0,0 @@
-From ae9df9f0010eaadc79d068c49f96c8265b181014 Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Sun, 14 Jul 2013 13:18:08 +0000
-Subject: user-theme: look for gnome-shell themes in ~/.local/share too
-
-Just like we look in XDG_DATA_DIRS, we should honor XDG_DATA_HOME
-as well.
-For compatibility reasons, we look in ~/.themes first, then ~/.local/share,
-then /usr/share.
----
-diff --git a/extensions/user-theme/extension.js b/extensions/user-theme/extension.js
-index 7d8f922..b36d36a 100644
---- a/extensions/user-theme/extension.js
-+++ b/extensions/user-theme/extension.js
-@@ -45,6 +45,7 @@ const ThemeManager = new Lang.Class({
-                 _stylesheet = _userCssStylesheet;
-             else {
-                 let sysdirs = GLib.get_system_data_dirs();
-+                sysdirs.unshift(GLib.get_user_data_dir());
-                 for (let i = 0; i < sysdirs.length; i++) {
-                     _userCssStylesheet = sysdirs[i] + '/themes/' + _themeName + '/gnome-shell/gnome-shell.css';
-                     let file = Gio.file_new_for_path(_userCssStylesheet);
-

debian/patches/series

@@ -1,4 +1,2 @@
 dont-require-nautilus-classic.patch
-fix-hibernate.patch
-fix-applications-menu-resolution-change.patch
-look-in-data-home-for-themes.patch
+gnome-session-classic-wrapper-script.patch

debian/rules

@@ -17,3 +17,7 @@ EXTENSIONS_DISABLED="example xrandr-indicator"
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--enable-extensions=$(EXTENSIONS_ENABLED) \
 	--enable-classic-mode
+
+binary-install/gnome-shell-extensions::
+	install -m 755 -D debian/local/gnome-session-classic \
+		debian/$(cdbs_curpkg)/usr/bin/gnome-session-classic