Compare commits

..

1 Commits

Author SHA1 Message Date
Simon McVittie
5bc9028932 [svn-buildpackage] Tagging gnome-shell-extensions 3.8.2-1 2013-05-23 08:11:09 +00:00
9 changed files with 9 additions and 167 deletions

24
debian/changelog vendored
View File

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

6
debian/control vendored
View File

@@ -2,6 +2,7 @@
#
# 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
@@ -16,7 +17,7 @@ Build-Depends: debhelper (>= 8.0.0),
libgnome-desktop-3-dev (>= 3.2.0),
libgtop2-dev (>= 2.28.3)
Standards-Version: 3.9.4
Homepage: https://wiki.gnome.org/GnomeShell/Extensions
Homepage: http://live.gnome.org/GnomeShell/Extensions
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gnome-shell-extensions
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/gnome-shell-extensions
@@ -26,8 +27,7 @@ Depends: ${misc:Depends},
gnome-shell (>= ${gnome:Version}),
gnome-shell (<< ${gnome:NextVersion}),
gir1.2-gtop-2.0,
gvfs (>= 1.16.0),
gnome-session (>= 3.8)
gvfs (>= 1.16.0)
Recommends: gnome-tweak-tool (>= ${gnome:Version})
Description: Extensions to extend functionality of GNOME Shell
The GNOME Shell redefines user interactions with the GNOME desktop. In

5
debian/control.in vendored
View File

@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 8.0.0),
libgnome-desktop-3-dev (>= 3.2.0),
libgtop2-dev (>= 2.28.3)
Standards-Version: 3.9.4
Homepage: https://wiki.gnome.org/GnomeShell/Extensions
Homepage: http://live.gnome.org/GnomeShell/Extensions
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gnome-shell-extensions
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/gnome-shell-extensions
@@ -22,8 +22,7 @@ Depends: ${misc:Depends},
gnome-shell (>= ${gnome:Version}),
gnome-shell (<< ${gnome:NextVersion}),
gir1.2-gtop-2.0,
gvfs (>= 1.16.0),
gnome-session (>= 3.8)
gvfs (>= 1.16.0)
Recommends: gnome-tweak-tool (>= ${gnome:Version})
Description: Extensions to extend functionality of GNOME Shell
The GNOME Shell redefines user interactions with the GNOME desktop. In

View File

@@ -1,13 +0,0 @@
Description: Don't use nautilus-classic since it forces desktop icons
Author: Jeremy Bicha <jbicha@ubuntu.com>
Bug: https://bugzilla.gnome.org/695088
Index: gnome-shell-extensions-3.8.3.1/data/gnome-classic.session.desktop.in.in
===================================================================
--- gnome-shell-extensions-3.8.3.1.orig/data/gnome-classic.session.desktop.in.in 2013-06-17 15:42:43.000000000 -0400
+++ gnome-shell-extensions-3.8.3.1/data/gnome-classic.session.desktop.in.in 2013-06-19 10:31:47.900318151 -0400
@@ -1,3 +1,3 @@
[GNOME Session]
_Name=GNOME Classic
-RequiredComponents=gnome-shell-classic;gnome-settings-daemon;nautilus-classic;
+RequiredComponents=gnome-shell-classic;gnome-settings-daemon;

View File

@@ -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' });

View File

@@ -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;
}

View File

@@ -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);

View File

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

7
debian/rules vendored
View File

@@ -1,6 +1,5 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
@@ -10,10 +9,12 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
EXTENSIONS_ENABLED="alternate-tab auto-move-windows workspace-indicator\
alternative-status-menu native-window-placement user-theme\
apps-menu drive-menu places-menu windowsNavigator systemMonitor\
launch-new-instance window-list windowsNavigator"
default-min-max launch-new-instance static-workspaces window-list\
windowsNavigator"
EXTENSIONS_DISABLED="example xrandr-indicator"
DEB_CONFIGURE_EXTRA_FLAGS := \
--enable-extensions=$(EXTENSIONS_ENABLED) \
--enable-classic-mode
--enable-classic-mode \
$(NULL)