From 0017eaebfcbea20f7748575154199be3a99efc74 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 23 Sep 2014 23:14:55 +0000 Subject: [PATCH 01/16] * Drop xrandr from EXTENSIONS_DISABLED, this extension was removed upstream. * Add new screenshot-window-sizer extension to EXTENSIONS_ENABLED. --- debian/changelog | 8 ++++++++ debian/rules | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d2ea7c7..6c37d94c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gnome-shell-extensions (3.14.0-2) UNRELEASED; urgency=medium + + * Drop xrandr from EXTENSIONS_DISABLED, this extension was removed + upstream. + * Add new screenshot-window-sizer extension to EXTENSIONS_ENABLED. + + -- Michael Biebl Wed, 24 Sep 2014 01:12:37 +0200 + gnome-shell-extensions (3.14.0-1) unstable; urgency=medium * debian/watch: only scan for stable releases. diff --git a/debian/rules b/debian/rules index c5b51c20..3815c33f 100755 --- a/debian/rules +++ b/debian/rules @@ -9,9 +9,10 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk EXTENSIONS_ENABLED="alternate-tab auto-move-windows workspace-indicator\ native-window-placement user-theme apps-menu drive-menu places-menu\ - windowsNavigator systemMonitor launch-new-instance window-list" + windowsNavigator systemMonitor launch-new-instance window-list\ + screenshot-window-sizer" -EXTENSIONS_DISABLED="example xrandr-indicator" +EXTENSIONS_DISABLED="example" DEB_CONFIGURE_EXTRA_FLAGS := \ --enable-extensions=$(EXTENSIONS_ENABLED) \ From 82ff7afe2b1aaec2c1da7c69534390e7f07ee611 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 23 Sep 2014 23:16:17 +0000 Subject: [PATCH 02/16] Release version 3.14.0-2 to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6c37d94c..bba8fd70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -gnome-shell-extensions (3.14.0-2) UNRELEASED; urgency=medium +gnome-shell-extensions (3.14.0-2) unstable; urgency=medium * Drop xrandr from EXTENSIONS_DISABLED, this extension was removed upstream. * Add new screenshot-window-sizer extension to EXTENSIONS_ENABLED. - -- Michael Biebl Wed, 24 Sep 2014 01:12:37 +0200 + -- Michael Biebl Wed, 24 Sep 2014 01:15:32 +0200 gnome-shell-extensions (3.14.0-1) unstable; urgency=medium From 9e2a8e0fb26c4341aea8482c2bdd670b489fd775 Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Sun, 19 Oct 2014 19:17:54 +0000 Subject: [PATCH 03/16] * New upstream release. * debian/control.in: Bump Standards-Version to 3.9.6 (no further changes) * Add missing dependencies against gir packages, including gir1.2-gmenu-3.0, this should fix the apps-menu extension for some people (Closes: #765460). --- debian/changelog | 9 +++++++++ debian/control | 12 ++++++++++-- debian/control.in | 10 +++++++++- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index bba8fd70..bf489e91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +gnome-shell-extensions (3.14.1-1) UNRELEASED; urgency=medium + + * New upstream release. + * debian/control.in: Bump Standards-Version to 3.9.6 (no further changes) + * Add missing dependencies against gir packages, including gir1.2-gmenu-3.0, + this should fix the apps-menu extension for some people (Closes: #765460). + + -- Laurent Bigonville Sun, 19 Oct 2014 21:17:32 +0200 + gnome-shell-extensions (3.14.0-2) unstable; urgency=medium * Drop xrandr from EXTENSIONS_DISABLED, this extension was removed diff --git a/debian/control b/debian/control index d4f5d37e..3e8fcd19 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Source: gnome-shell-extensions Section: gnome Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Victor Seva , Andreas Henriksson , Emilio Pozuelo Monfort , Michael Biebl +Uploaders: Victor Seva , Andreas Henriksson , Emilio Pozuelo Monfort , Laurent Bigonville , Michael Biebl Build-Depends: debhelper (>= 8.0.0), cdbs, dh-autoreconf, @@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 8.0.0), intltool, libgnome-desktop-3-dev (>= 3.2.0), libgtop2-dev (>= 2.28.3) -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: https://wiki.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 @@ -25,7 +25,15 @@ Architecture: all Depends: ${misc:Depends}, gnome-shell (>= ${gnome:Version}), gnome-shell (<< ${gnome:NextVersion}), + gir1.2-atk-1.0, + gir1.2-clutter-1.0, + gir1.2-gdkpixbuf-2.0, + gir1.2-glib-2.0, + gir1.2-gmenu-3.0, + gir1.2-gtk-3.0, gir1.2-gtop-2.0, + gir1.2-mutter-3.0, + gir1.2-pango-1.0, gvfs (>= 1.16.0), gnome-session (>= 3.8) Recommends: gnome-tweak-tool (>= ${gnome:Version}) diff --git a/debian/control.in b/debian/control.in index fa2ac92d..73ec2461 100644 --- a/debian/control.in +++ b/debian/control.in @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 8.0.0), intltool, libgnome-desktop-3-dev (>= 3.2.0), libgtop2-dev (>= 2.28.3) -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Homepage: https://wiki.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 @@ -21,7 +21,15 @@ Architecture: all Depends: ${misc:Depends}, gnome-shell (>= ${gnome:Version}), gnome-shell (<< ${gnome:NextVersion}), + gir1.2-atk-1.0, + gir1.2-clutter-1.0, + gir1.2-gdkpixbuf-2.0, + gir1.2-glib-2.0, + gir1.2-gmenu-3.0, + gir1.2-gtk-3.0, gir1.2-gtop-2.0, + gir1.2-mutter-3.0, + gir1.2-pango-1.0, gvfs (>= 1.16.0), gnome-session (>= 3.8) Recommends: gnome-tweak-tool (>= ${gnome:Version}) From 61dd96a29ea4d99b5db48ef7314e4f5e011cf499 Mon Sep 17 00:00:00 2001 From: Laurent Bigonville Date: Sun, 19 Oct 2014 19:18:06 +0000 Subject: [PATCH 04/16] Release to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bf489e91..426dcd25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -gnome-shell-extensions (3.14.1-1) UNRELEASED; urgency=medium +gnome-shell-extensions (3.14.1-1) unstable; urgency=medium * New upstream release. * debian/control.in: Bump Standards-Version to 3.9.6 (no further changes) * Add missing dependencies against gir packages, including gir1.2-gmenu-3.0, this should fix the apps-menu extension for some people (Closes: #765460). - -- Laurent Bigonville Sun, 19 Oct 2014 21:17:32 +0200 + -- Laurent Bigonville Sun, 19 Oct 2014 21:17:58 +0200 gnome-shell-extensions (3.14.0-2) unstable; urgency=medium From 6d4341f8a46e20407372ad64a74c1be822c5ef03 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Sun, 30 Nov 2014 15:07:11 +0000 Subject: [PATCH 05/16] * New upstream bugfix release. * menu-arrows-icons: new patch. Make arrows consistent with the rest of the shell. * apps-center-labels.patch: patch from upstream git. Center labels vertically in the applications menu. * window-list-pointerInNotification.patch: patch from upstream git. Update window-list extension for an older shell API change. --- debian/changelog | 12 +++++ debian/patches/apps-center-labels.patch | 27 +++++++++++ debian/patches/menu-arrows-icons.patch | 45 +++++++++++++++++++ debian/patches/series | 3 ++ .../window-list-pointerInNotification.patch | 24 ++++++++++ 5 files changed, 111 insertions(+) create mode 100644 debian/patches/apps-center-labels.patch create mode 100644 debian/patches/menu-arrows-icons.patch create mode 100644 debian/patches/window-list-pointerInNotification.patch diff --git a/debian/changelog b/debian/changelog index 426dcd25..518684fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +gnome-shell-extensions (3.14.2-1) unstable; urgency=medium + + * New upstream bugfix release. + * menu-arrows-icons: new patch. Make arrows consistent with the rest + of the shell. + * apps-center-labels.patch: patch from upstream git. Center labels + vertically in the applications menu. + * window-list-pointerInNotification.patch: patch from upstream git. + Update window-list extension for an older shell API change. + + -- Josselin Mouette Sun, 30 Nov 2014 16:06:59 +0100 + gnome-shell-extensions (3.14.1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/apps-center-labels.patch b/debian/patches/apps-center-labels.patch new file mode 100644 index 00000000..afa7261f --- /dev/null +++ b/debian/patches/apps-center-labels.patch @@ -0,0 +1,27 @@ +From 79f263d1edbd6f7cfe13cf89933941b439325cee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Wed, 26 Nov 2014 19:03:49 +0100 +Subject: apps-menu: Center app labels + +Currently labels are not vertically centered, unlike icons. +Fix this. + +https://bugzilla.gnome.org/show_bug.cgi?id=740724 + +diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js +index a8fb74d..f8438fd 100644 +--- a/extensions/apps-menu/extension.js ++++ b/extensions/apps-menu/extension.js +@@ -58,7 +58,8 @@ const ApplicationMenuItem = new Lang.Class({ + this._iconBin = new St.Bin(); + this.actor.add_child(this._iconBin); + +- let appLabel = new St.Label({ text: app.get_name() }); ++ let appLabel = new St.Label({ text: app.get_name(), y_expand: true, ++ y_align: Clutter.ActorAlign.CENTER }); + this.actor.add_child(appLabel, { expand: true }); + this.actor.label_actor = appLabel; + +-- +cgit v0.10.1 + diff --git a/debian/patches/menu-arrows-icons.patch b/debian/patches/menu-arrows-icons.patch new file mode 100644 index 00000000..3038769b --- /dev/null +++ b/debian/patches/menu-arrows-icons.patch @@ -0,0 +1,45 @@ +Index: gnome-shell-extensions-3.14.2/extensions/apps-menu/extension.js +=================================================================== +--- gnome-shell-extensions-3.14.2.orig/extensions/apps-menu/extension.js 2014-10-07 13:54:01.000000000 +0200 ++++ gnome-shell-extensions-3.14.2/extensions/apps-menu/extension.js 2014-11-30 15:59:57.300620972 +0100 +@@ -283,9 +283,7 @@ const ApplicationsButton = new Lang.Clas + y_expand: true, + y_align: Clutter.ActorAlign.CENTER }); + hbox.add_child(this._label); +- hbox.add_child(new St.Label({ text: '\u25BE', +- y_expand: true, +- y_align: Clutter.ActorAlign.CENTER })); ++ hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM)); + + this.actor.add_actor(hbox); + this.actor.name = 'panelApplications'; +Index: gnome-shell-extensions-3.14.2/extensions/drive-menu/extension.js +=================================================================== +--- gnome-shell-extensions-3.14.2.orig/extensions/drive-menu/extension.js 2014-11-30 15:59:14.629264311 +0100 ++++ gnome-shell-extensions-3.14.2/extensions/drive-menu/extension.js 2014-11-30 15:59:32.344997226 +0100 +@@ -128,9 +128,7 @@ const DriveMenu = new Lang.Class({ + style_class: 'system-status-icon' }); + + hbox.add_child(icon); +- hbox.add_child(new St.Label({ text: '\u25BE', +- y_expand: true, +- y_align: Clutter.ActorAlign.CENTER })); ++ hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM)); + this.actor.add_child(hbox); + + this._monitor = Gio.VolumeMonitor.get(); +Index: gnome-shell-extensions-3.14.2/extensions/places-menu/extension.js +=================================================================== +--- gnome-shell-extensions-3.14.2.orig/extensions/places-menu/extension.js 2014-10-07 13:54:01.000000000 +0200 ++++ gnome-shell-extensions-3.14.2/extensions/places-menu/extension.js 2014-11-30 15:57:44.382624700 +0100 +@@ -82,9 +82,7 @@ const PlacesMenu = new Lang.Class({ + y_expand: true, + y_align: Clutter.ActorAlign.CENTER }); + hbox.add_child(label); +- hbox.add_child(new St.Label({ text: '\u25BE', +- y_expand: true, +- y_align: Clutter.ActorAlign.CENTER })); ++ hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM)); + this.actor.add_actor(hbox); + + this.placesManager = new PlaceDisplay.PlacesManager(); diff --git a/debian/patches/series b/debian/patches/series index 6410b5c4..c3746d7d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,5 @@ dont-require-nautilus-classic.patch gnome-session-classic-wrapper-script.patch +menu-arrows-icons.patch +apps-center-labels.patch +window-list-pointerInNotification.patch diff --git a/debian/patches/window-list-pointerInNotification.patch b/debian/patches/window-list-pointerInNotification.patch new file mode 100644 index 00000000..e720122b --- /dev/null +++ b/debian/patches/window-list-pointerInNotification.patch @@ -0,0 +1,24 @@ +From 2f49d77931b57d20ba37f03b9a0733f18cbba5c8 Mon Sep 17 00:00:00 2001 +From: Sylvain Pasche +Date: Sat, 1 Nov 2014 22:03:43 +0100 +Subject: window-list: _pointerInTray was renamed to _pointerInNotification in + bug 695800 + +https://bugzilla.gnome.org/show_bug.cgi?id=737486 + +diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js +index 5115a68..0cee654 100644 +--- a/extensions/window-list/extension.js ++++ b/extensions/window-list/extension.js +@@ -1188,7 +1188,7 @@ function enable() { + + windowList.actor.connect('notify::hover', Lang.bind(Main.messageTray, + function() { +- this._pointerInTray = windowList.actor.hover; ++ this._pointerInNotification = windowList.actor.hover; + this._updateState(); + })); + +-- +cgit v0.10.1 + From 79d866e9b510bf2889ce802ef9a4a956f2555352 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Sun, 14 Jun 2015 12:18:06 +0000 Subject: [PATCH 06/16] New upstream release. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 518684fb..f1df56b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gnome-shell-extensions (3.16.1-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Emilio Pozuelo Monfort Sun, 14 Jun 2015 14:17:27 +0200 + gnome-shell-extensions (3.14.2-1) unstable; urgency=medium * New upstream bugfix release. From 269e0085411bf225ee20c961f0b6f92153b40ed5 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Sun, 14 Jun 2015 12:22:40 +0000 Subject: [PATCH 07/16] * debian/control.in, debian/rules: + The system monitor extension was removed. Drop the libgtop build and runtime dependencies and stop enabling it. --- debian/changelog | 4 ++++ debian/control | 4 +--- debian/control.in | 2 -- debian/rules | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index f1df56b8..af0d7505 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ gnome-shell-extensions (3.16.1-1) UNRELEASED; urgency=medium * New upstream release. + * debian/control.in, + debian/rules: + + The system monitor extension was removed. Drop the libgtop + build and runtime dependencies and stop enabling it. -- Emilio Pozuelo Monfort Sun, 14 Jun 2015 14:17:27 +0200 diff --git a/debian/control b/debian/control index 3e8fcd19..6a6f124d 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Source: gnome-shell-extensions Section: gnome Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Victor Seva , Andreas Henriksson , Emilio Pozuelo Monfort , Laurent Bigonville , Michael Biebl +Uploaders: Victor Seva , Andreas Henriksson , Emilio Pozuelo Monfort , Josselin Mouette , Laurent Bigonville , Michael Biebl Build-Depends: debhelper (>= 8.0.0), cdbs, dh-autoreconf, @@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 8.0.0), gnome-pkg-tools, intltool, libgnome-desktop-3-dev (>= 3.2.0), - libgtop2-dev (>= 2.28.3) Standards-Version: 3.9.6 Homepage: https://wiki.gnome.org/GnomeShell/Extensions Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gnome-shell-extensions @@ -31,7 +30,6 @@ Depends: ${misc:Depends}, gir1.2-glib-2.0, gir1.2-gmenu-3.0, gir1.2-gtk-3.0, - gir1.2-gtop-2.0, gir1.2-mutter-3.0, gir1.2-pango-1.0, gvfs (>= 1.16.0), diff --git a/debian/control.in b/debian/control.in index 73ec2461..ee114e67 100644 --- a/debian/control.in +++ b/debian/control.in @@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 8.0.0), gnome-pkg-tools, intltool, libgnome-desktop-3-dev (>= 3.2.0), - libgtop2-dev (>= 2.28.3) Standards-Version: 3.9.6 Homepage: https://wiki.gnome.org/GnomeShell/Extensions Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gnome-shell-extensions @@ -27,7 +26,6 @@ Depends: ${misc:Depends}, gir1.2-glib-2.0, gir1.2-gmenu-3.0, gir1.2-gtk-3.0, - gir1.2-gtop-2.0, gir1.2-mutter-3.0, gir1.2-pango-1.0, gvfs (>= 1.16.0), diff --git a/debian/rules b/debian/rules index 3815c33f..11bcbd8c 100755 --- a/debian/rules +++ b/debian/rules @@ -5,11 +5,11 @@ 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 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk --include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk EXTENSIONS_ENABLED="alternate-tab auto-move-windows workspace-indicator\ native-window-placement user-theme apps-menu drive-menu places-menu\ - windowsNavigator systemMonitor launch-new-instance window-list\ + windowsNavigator launch-new-instance window-list\ screenshot-window-sizer" EXTENSIONS_DISABLED="example" From 31a5de25770f3a21539a8cb2b4a2ad7539fe77e6 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Sun, 14 Jun 2015 12:29:29 +0000 Subject: [PATCH 08/16] * debian/patches/apps-center-labels.patch, debian/patches/dont-require-nautilus-classic.patch, debian/patches/menu-arrows-icons.patch: + Dropped, merged upstream. --- debian/changelog | 4 ++ debian/patches/apps-center-labels.patch | 27 ----------- .../dont-require-nautilus-classic.patch | 10 ++--- debian/patches/menu-arrows-icons.patch | 45 ------------------- debian/patches/series | 3 -- 5 files changed, 8 insertions(+), 81 deletions(-) delete mode 100644 debian/patches/apps-center-labels.patch delete mode 100644 debian/patches/menu-arrows-icons.patch diff --git a/debian/changelog b/debian/changelog index af0d7505..462527a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ gnome-shell-extensions (3.16.1-1) UNRELEASED; urgency=medium debian/rules: + The system monitor extension was removed. Drop the libgtop build and runtime dependencies and stop enabling it. + * debian/patches/apps-center-labels.patch, + debian/patches/dont-require-nautilus-classic.patch, + debian/patches/menu-arrows-icons.patch: + + Dropped, merged upstream. -- Emilio Pozuelo Monfort Sun, 14 Jun 2015 14:17:27 +0200 diff --git a/debian/patches/apps-center-labels.patch b/debian/patches/apps-center-labels.patch deleted file mode 100644 index afa7261f..00000000 --- a/debian/patches/apps-center-labels.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 79f263d1edbd6f7cfe13cf89933941b439325cee Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Wed, 26 Nov 2014 19:03:49 +0100 -Subject: apps-menu: Center app labels - -Currently labels are not vertically centered, unlike icons. -Fix this. - -https://bugzilla.gnome.org/show_bug.cgi?id=740724 - -diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js -index a8fb74d..f8438fd 100644 ---- a/extensions/apps-menu/extension.js -+++ b/extensions/apps-menu/extension.js -@@ -58,7 +58,8 @@ const ApplicationMenuItem = new Lang.Class({ - this._iconBin = new St.Bin(); - this.actor.add_child(this._iconBin); - -- let appLabel = new St.Label({ text: app.get_name() }); -+ let appLabel = new St.Label({ text: app.get_name(), y_expand: true, -+ y_align: Clutter.ActorAlign.CENTER }); - this.actor.add_child(appLabel, { expand: true }); - this.actor.label_actor = appLabel; - --- -cgit v0.10.1 - diff --git a/debian/patches/dont-require-nautilus-classic.patch b/debian/patches/dont-require-nautilus-classic.patch index 0af5d477..0f6f65c6 100644 --- a/debian/patches/dont-require-nautilus-classic.patch +++ b/debian/patches/dont-require-nautilus-classic.patch @@ -2,12 +2,10 @@ Description: Don't use nautilus-classic since it forces desktop icons Author: Jeremy Bicha 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 +--- a/data/gnome-classic.session.desktop.in.in ++++ b/data/gnome-classic.session.desktop.in.in @@ -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; +-RequiredComponents=gnome-shell;gnome-settings-daemon;nautilus-classic; ++RequiredComponents=gnome-shell;gnome-settings-daemon; diff --git a/debian/patches/menu-arrows-icons.patch b/debian/patches/menu-arrows-icons.patch deleted file mode 100644 index 3038769b..00000000 --- a/debian/patches/menu-arrows-icons.patch +++ /dev/null @@ -1,45 +0,0 @@ -Index: gnome-shell-extensions-3.14.2/extensions/apps-menu/extension.js -=================================================================== ---- gnome-shell-extensions-3.14.2.orig/extensions/apps-menu/extension.js 2014-10-07 13:54:01.000000000 +0200 -+++ gnome-shell-extensions-3.14.2/extensions/apps-menu/extension.js 2014-11-30 15:59:57.300620972 +0100 -@@ -283,9 +283,7 @@ const ApplicationsButton = new Lang.Clas - y_expand: true, - y_align: Clutter.ActorAlign.CENTER }); - hbox.add_child(this._label); -- hbox.add_child(new St.Label({ text: '\u25BE', -- y_expand: true, -- y_align: Clutter.ActorAlign.CENTER })); -+ hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM)); - - this.actor.add_actor(hbox); - this.actor.name = 'panelApplications'; -Index: gnome-shell-extensions-3.14.2/extensions/drive-menu/extension.js -=================================================================== ---- gnome-shell-extensions-3.14.2.orig/extensions/drive-menu/extension.js 2014-11-30 15:59:14.629264311 +0100 -+++ gnome-shell-extensions-3.14.2/extensions/drive-menu/extension.js 2014-11-30 15:59:32.344997226 +0100 -@@ -128,9 +128,7 @@ const DriveMenu = new Lang.Class({ - style_class: 'system-status-icon' }); - - hbox.add_child(icon); -- hbox.add_child(new St.Label({ text: '\u25BE', -- y_expand: true, -- y_align: Clutter.ActorAlign.CENTER })); -+ hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM)); - this.actor.add_child(hbox); - - this._monitor = Gio.VolumeMonitor.get(); -Index: gnome-shell-extensions-3.14.2/extensions/places-menu/extension.js -=================================================================== ---- gnome-shell-extensions-3.14.2.orig/extensions/places-menu/extension.js 2014-10-07 13:54:01.000000000 +0200 -+++ gnome-shell-extensions-3.14.2/extensions/places-menu/extension.js 2014-11-30 15:57:44.382624700 +0100 -@@ -82,9 +82,7 @@ const PlacesMenu = new Lang.Class({ - y_expand: true, - y_align: Clutter.ActorAlign.CENTER }); - hbox.add_child(label); -- hbox.add_child(new St.Label({ text: '\u25BE', -- y_expand: true, -- y_align: Clutter.ActorAlign.CENTER })); -+ hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM)); - this.actor.add_actor(hbox); - - this.placesManager = new PlaceDisplay.PlacesManager(); diff --git a/debian/patches/series b/debian/patches/series index c3746d7d..6410b5c4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,2 @@ dont-require-nautilus-classic.patch gnome-session-classic-wrapper-script.patch -menu-arrows-icons.patch -apps-center-labels.patch -window-list-pointerInNotification.patch From 22256eec46195e0c221fddaf7f005f7b153884f6 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Sun, 14 Jun 2015 12:30:51 +0000 Subject: [PATCH 09/16] fix changelog --- debian/changelog | 4 +++- .../window-list-pointerInNotification.patch | 24 ------------------- 2 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 debian/patches/window-list-pointerInNotification.patch diff --git a/debian/changelog b/debian/changelog index 462527a0..d77a813b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,9 +6,11 @@ gnome-shell-extensions (3.16.1-1) UNRELEASED; urgency=medium + The system monitor extension was removed. Drop the libgtop build and runtime dependencies and stop enabling it. * debian/patches/apps-center-labels.patch, - debian/patches/dont-require-nautilus-classic.patch, + debian/patches/window-list-pointerInNotification.patch, debian/patches/menu-arrows-icons.patch: + Dropped, merged upstream. + * debian/patches/dont-require-nautilus-classic.patch: + + Updated for the new version. -- Emilio Pozuelo Monfort Sun, 14 Jun 2015 14:17:27 +0200 diff --git a/debian/patches/window-list-pointerInNotification.patch b/debian/patches/window-list-pointerInNotification.patch deleted file mode 100644 index e720122b..00000000 --- a/debian/patches/window-list-pointerInNotification.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2f49d77931b57d20ba37f03b9a0733f18cbba5c8 Mon Sep 17 00:00:00 2001 -From: Sylvain Pasche -Date: Sat, 1 Nov 2014 22:03:43 +0100 -Subject: window-list: _pointerInTray was renamed to _pointerInNotification in - bug 695800 - -https://bugzilla.gnome.org/show_bug.cgi?id=737486 - -diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js -index 5115a68..0cee654 100644 ---- a/extensions/window-list/extension.js -+++ b/extensions/window-list/extension.js -@@ -1188,7 +1188,7 @@ function enable() { - - windowList.actor.connect('notify::hover', Lang.bind(Main.messageTray, - function() { -- this._pointerInTray = windowList.actor.hover; -+ this._pointerInNotification = windowList.actor.hover; - this._updateState(); - })); - --- -cgit v0.10.1 - From 6f1475e944cb4bae79a5bf6fa634ed7c04c8c878 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Sun, 14 Jun 2015 13:24:17 +0000 Subject: [PATCH 10/16] release to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d77a813b..041c3a2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gnome-shell-extensions (3.16.1-1) UNRELEASED; urgency=medium +gnome-shell-extensions (3.16.1-1) unstable; urgency=medium * New upstream release. * debian/control.in, @@ -12,7 +12,7 @@ gnome-shell-extensions (3.16.1-1) UNRELEASED; urgency=medium * debian/patches/dont-require-nautilus-classic.patch: + Updated for the new version. - -- Emilio Pozuelo Monfort Sun, 14 Jun 2015 14:17:27 +0200 + -- Emilio Pozuelo Monfort Sun, 14 Jun 2015 15:23:59 +0200 gnome-shell-extensions (3.14.2-1) unstable; urgency=medium From 4624ca952ef24091983cafe57c4e163bbf5b124b Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Mon, 29 Jun 2015 08:40:05 +0000 Subject: [PATCH 11/16] * debian/gnome-shell-extensions.gsettings-override: + Dropped, no longer needed as the enabled extension no longer exists. Thanks Artur Rona for noticing. --- debian/changelog | 8 ++++++++ debian/gnome-shell-extensions.gsettings-override | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) delete mode 100644 debian/gnome-shell-extensions.gsettings-override diff --git a/debian/changelog b/debian/changelog index 041c3a2d..53b25ca3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gnome-shell-extensions (3.16.1-2) UNRELEASED; urgency=medium + + * debian/gnome-shell-extensions.gsettings-override: + + Dropped, no longer needed as the enabled extension no longer exists. + Thanks Artur Rona for noticing. + + -- Emilio Pozuelo Monfort Mon, 29 Jun 2015 10:39:33 +0200 + gnome-shell-extensions (3.16.1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/gnome-shell-extensions.gsettings-override b/debian/gnome-shell-extensions.gsettings-override deleted file mode 100644 index 9d0e0976..00000000 --- a/debian/gnome-shell-extensions.gsettings-override +++ /dev/null @@ -1,2 +0,0 @@ -[org.gnome.shell] -enabled-extensions=['alternative-status-menu@gnome-shell-extensions.gcampax.github.com'] From 380cf618110539f63ffff28b4243362f3236f59b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 2 Jul 2015 17:06:14 +0000 Subject: [PATCH 12/16] New upstream release. --- debian/changelog | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 53b25ca3..8dcf7fe3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ -gnome-shell-extensions (3.16.1-2) UNRELEASED; urgency=medium +gnome-shell-extensions (3.16.2-1) UNRELEASED; urgency=medium + [ Emilio Pozuelo Monfort ] * debian/gnome-shell-extensions.gsettings-override: + Dropped, no longer needed as the enabled extension no longer exists. Thanks Artur Rona for noticing. + [ Michael Biebl ] + * New upstream release. + -- Emilio Pozuelo Monfort Mon, 29 Jun 2015 10:39:33 +0200 gnome-shell-extensions (3.16.1-1) unstable; urgency=medium From 6dc066f7ddd5ae5def5d265982156aeb0aaccf0b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 2 Jul 2015 17:06:24 +0000 Subject: [PATCH 13/16] Update Homepage. --- debian/changelog | 1 + debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8dcf7fe3..e3fe083d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ gnome-shell-extensions (3.16.2-1) UNRELEASED; urgency=medium [ Michael Biebl ] * New upstream release. + * Update Homepage. -- Emilio Pozuelo Monfort Mon, 29 Jun 2015 10:39:33 +0200 diff --git a/debian/control b/debian/control index 6a6f124d..657f0a5b 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 8.0.0), intltool, libgnome-desktop-3-dev (>= 3.2.0), Standards-Version: 3.9.6 -Homepage: https://wiki.gnome.org/GnomeShell/Extensions +Homepage: https://wiki.gnome.org/Projects/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 diff --git a/debian/control.in b/debian/control.in index ee114e67..472d618d 100644 --- a/debian/control.in +++ b/debian/control.in @@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 8.0.0), intltool, libgnome-desktop-3-dev (>= 3.2.0), Standards-Version: 3.9.6 -Homepage: https://wiki.gnome.org/GnomeShell/Extensions +Homepage: https://wiki.gnome.org/Projects/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 From 5ef6525be781faa3b5ebb1c1850a32428f5469b1 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 2 Jul 2015 17:08:31 +0000 Subject: [PATCH 14/16] Bump debhelper compatibility level to 9. --- debian/changelog | 1 + debian/compat | 2 +- debian/control | 2 +- debian/control.in | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e3fe083d..59ff8d89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ gnome-shell-extensions (3.16.2-1) UNRELEASED; urgency=medium [ Michael Biebl ] * New upstream release. * Update Homepage. + * Bump debhelper compatibility level to 9. -- Emilio Pozuelo Monfort Mon, 29 Jun 2015 10:39:33 +0200 diff --git a/debian/compat b/debian/compat index 45a4fb75..ec635144 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index 657f0a5b..d9f5144c 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Section: gnome Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: Victor Seva , Andreas Henriksson , Emilio Pozuelo Monfort , Josselin Mouette , Laurent Bigonville , Michael Biebl -Build-Depends: debhelper (>= 8.0.0), +Build-Depends: debhelper (>= 9), cdbs, dh-autoreconf, gnome-common, diff --git a/debian/control.in b/debian/control.in index 472d618d..1dfa5793 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,7 +3,7 @@ Section: gnome Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: Victor Seva , @GNOME_TEAM@ -Build-Depends: debhelper (>= 8.0.0), +Build-Depends: debhelper (>= 9), cdbs, dh-autoreconf, gnome-common, From 64923382b44c47e8b5868d477076fbe3b744df04 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 2 Jul 2015 17:13:24 +0000 Subject: [PATCH 15/16] Add bug ref to changelog for #782747 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 59ff8d89..c10c0ec8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ gnome-shell-extensions (3.16.2-1) UNRELEASED; urgency=medium [ Emilio Pozuelo Monfort ] * debian/gnome-shell-extensions.gsettings-override: + Dropped, no longer needed as the enabled extension no longer exists. - Thanks Artur Rona for noticing. + Thanks Artur Rona for noticing. (Closes: #782747) [ Michael Biebl ] * New upstream release. From b561655503aa29ede5d14e2075eee3719f24dcb6 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 2 Jul 2015 17:13:48 +0000 Subject: [PATCH 16/16] Release version 3.16.2-1 to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c10c0ec8..93bf9f92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gnome-shell-extensions (3.16.2-1) UNRELEASED; urgency=medium +gnome-shell-extensions (3.16.2-1) unstable; urgency=medium [ Emilio Pozuelo Monfort ] * debian/gnome-shell-extensions.gsettings-override: @@ -10,7 +10,7 @@ gnome-shell-extensions (3.16.2-1) UNRELEASED; urgency=medium * Update Homepage. * Bump debhelper compatibility level to 9. - -- Emilio Pozuelo Monfort Mon, 29 Jun 2015 10:39:33 +0200 + -- Michael Biebl Thu, 02 Jul 2015 19:13:32 +0200 gnome-shell-extensions (3.16.1-1) unstable; urgency=medium