From 8de34e23a3721db5d814e2c13bce46e11af965f9 Mon Sep 17 00:00:00 2001 From: Andreas Henriksson Date: Thu, 21 Mar 2013 20:39:21 +0000 Subject: [PATCH 01/19] fix typo in changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6c7736df..81498de5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ gnome-shell-extensions (3.7.92-1) UNRELEASED; urgency=low * Enabled new extensions. * Dropped 'dock' and 'gajim'. * Use ./configure instead of autoreconf. - * Bunped Standards-Version to 3.9.4. + * Bumped Standards-Version to 3.9.4. * Updated Vcs-Svn. -- Jean Schurger Thu, 21 Mar 2013 12:31:37 -0400 From d12833afc49926258778ab8d81d26f38129d4017 Mon Sep 17 00:00:00 2001 From: Jean Schurger Date: Wed, 27 Mar 2013 15:19:05 +0000 Subject: [PATCH 02/19] New upstreap release. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 81498de5..6e77fdc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gnome-shell-extensions (3.8.0-1) UNRELEASED; urgency=low + + * New upstreap release. + + -- Jean Schurger Wed, 27 Mar 2013 09:49:48 -0400 + gnome-shell-extensions (3.7.92-1) UNRELEASED; urgency=low * New Upstream release. From 4abc92ef4449cc703b408be4f0eaa4bf9ab03720 Mon Sep 17 00:00:00 2001 From: Jean Schurger Date: Wed, 27 Mar 2013 15:19:34 +0000 Subject: [PATCH 03/19] New upstream release. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6e77fdc5..68a83692 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ gnome-shell-extensions (3.8.0-1) UNRELEASED; urgency=low - * New upstreap release. + * New upstream release. -- Jean Schurger Wed, 27 Mar 2013 09:49:48 -0400 From 0b840524580bac40cf92decb5a432f4eb28e812d Mon Sep 17 00:00:00 2001 From: Jean Schurger Date: Thu, 4 Apr 2013 13:35:51 +0000 Subject: [PATCH 04/19] * debian/patches - fix-places-volume-without-class.diff (fix 'places', #697266) --- debian/changelog | 4 +++- .../fix-places-volume-without-class.diff | 18 ++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix-places-volume-without-class.diff diff --git a/debian/changelog b/debian/changelog index 68a83692..908841ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ gnome-shell-extensions (3.8.0-1) UNRELEASED; urgency=low * New upstream release. + * debian/patches + - fix-places-volume-without-class.diff (fix 'places', #697266) - -- Jean Schurger Wed, 27 Mar 2013 09:49:48 -0400 + -- Jean Schurger Thu, 04 Apr 2013 09:32:25 -0400 gnome-shell-extensions (3.7.92-1) UNRELEASED; urgency=low diff --git a/debian/patches/fix-places-volume-without-class.diff b/debian/patches/fix-places-volume-without-class.diff new file mode 100644 index 00000000..a73da1ff --- /dev/null +++ b/debian/patches/fix-places-volume-without-class.diff @@ -0,0 +1,18 @@ +diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js +index 6d0625b..4b78310 100644 +--- a/extensions/places-menu/placeDisplay.js ++++ b/extensions/places-menu/placeDisplay.js +@@ -292,7 +292,12 @@ const PlacesManager = new Lang.Class({ + let volumes = drives[i].get_volumes(); + + for(let j = 0; j < volumes.length; j++) { +- if (volumes[j].get_identifier('class').indexOf('network') >= 0) { ++ let cls = volumes[j].get_identifier('class'); ++ let have_network_class = false; ++ if (cls != null) ++ if (volumes[j].get_identifier('class').indexOf('network') >= 0) ++ have_network_class = true; ++ if (have_network_class) { + networkVolumes.push(volumes[i]); + } else { + let mount = volumes[j].get_mount(); diff --git a/debian/patches/series b/debian/patches/series index e69de29b..c2b0b6c4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-places-volume-without-class.diff From 1e8ff58d82ada28ed5b37096fe8c638c8ff0e126 Mon Sep 17 00:00:00 2001 From: Jean Schurger Date: Thu, 4 Apr 2013 14:04:41 +0000 Subject: [PATCH 05/19] * debian/control.in - Added runtime dependency to 'gvfs' (>= 1.16.0). The 'Places' extension rely on a 'gvfs' linked to 'udisks2'. --- debian/changelog | 7 ++++--- debian/control | 3 ++- debian/control.in | 3 ++- .../fix-places-volume-without-class.diff | 18 ------------------ debian/patches/series | 1 - 5 files changed, 8 insertions(+), 24 deletions(-) delete mode 100644 debian/patches/fix-places-volume-without-class.diff diff --git a/debian/changelog b/debian/changelog index 908841ab..fd046ae3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ gnome-shell-extensions (3.8.0-1) UNRELEASED; urgency=low * New upstream release. - * debian/patches - - fix-places-volume-without-class.diff (fix 'places', #697266) + * debian/control.in + - Added runtime dependency to 'gvfs' (>= 1.16.0). + The 'Places' extension rely on a 'gvfs' linked to 'udisks2'. - -- Jean Schurger Thu, 04 Apr 2013 09:32:25 -0400 + -- Jean Schurger Thu, 04 Apr 2013 10:03:26 -0400 gnome-shell-extensions (3.7.92-1) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index 161063ba..a429007e 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,8 @@ Architecture: all Depends: ${misc:Depends}, gnome-shell (>= ${gnome:Version}), gnome-shell (<< ${gnome:NextVersion}), - gir1.2-gtop-2.0 + gir1.2-gtop-2.0, + 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 diff --git a/debian/control.in b/debian/control.in index d34875c9..0bcac17f 100644 --- a/debian/control.in +++ b/debian/control.in @@ -21,7 +21,8 @@ Architecture: all Depends: ${misc:Depends}, gnome-shell (>= ${gnome:Version}), gnome-shell (<< ${gnome:NextVersion}), - gir1.2-gtop-2.0 + gir1.2-gtop-2.0, + 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 diff --git a/debian/patches/fix-places-volume-without-class.diff b/debian/patches/fix-places-volume-without-class.diff deleted file mode 100644 index a73da1ff..00000000 --- a/debian/patches/fix-places-volume-without-class.diff +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js -index 6d0625b..4b78310 100644 ---- a/extensions/places-menu/placeDisplay.js -+++ b/extensions/places-menu/placeDisplay.js -@@ -292,7 +292,12 @@ const PlacesManager = new Lang.Class({ - let volumes = drives[i].get_volumes(); - - for(let j = 0; j < volumes.length; j++) { -- if (volumes[j].get_identifier('class').indexOf('network') >= 0) { -+ let cls = volumes[j].get_identifier('class'); -+ let have_network_class = false; -+ if (cls != null) -+ if (volumes[j].get_identifier('class').indexOf('network') >= 0) -+ have_network_class = true; -+ if (have_network_class) { - networkVolumes.push(volumes[i]); - } else { - let mount = volumes[j].get_mount(); diff --git a/debian/patches/series b/debian/patches/series index c2b0b6c4..e69de29b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -fix-places-volume-without-class.diff From 91e886c5641f0794d3a0d08fec6e28f894e76a9e Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 23 May 2013 08:07:17 +0000 Subject: [PATCH 06/19] New upstream release 3.8.2 * Install the "classic mode" * Enable windowNavigator extension (this means we have everything except example and xrandr, the same as in the Ubuntu gnome3-team's PPA) --- debian/changelog | 30 +++++++++++++++--------------- debian/rules | 10 +++++++--- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index fd046ae3..8222d2f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,28 +1,28 @@ -gnome-shell-extensions (3.8.0-1) UNRELEASED; urgency=low +gnome-shell-extensions (3.8.2-1) UNRELEASED; urgency=low - * New upstream release. - * debian/control.in - - Added runtime dependency to 'gvfs' (>= 1.16.0). - The 'Places' extension rely on a 'gvfs' linked to 'udisks2'. + * Team upload - -- Jean Schurger Thu, 04 Apr 2013 10:03:26 -0400 + [ Victor Seva ] + * Recommends gnome-tweak-tool -gnome-shell-extensions (3.7.92-1) UNRELEASED; urgency=low - - * New Upstream release. + [ Jean Schurger ] + * New upstream release 3.7.92 (LP: #1017979, #1059152). * Enabled new extensions. * Dropped 'dock' and 'gajim'. * Use ./configure instead of autoreconf. * Bumped Standards-Version to 3.9.4. * Updated Vcs-Svn. + * debian/control.in + - Added runtime dependency to 'gvfs' (>= 1.16.0). + The 'Places' extension rely on a 'gvfs' linked to 'udisks2'. - -- Jean Schurger Thu, 21 Mar 2013 12:31:37 -0400 + [ Simon McVittie ] + * New upstream release 3.8.2. + * Install the "classic mode" + * Enable windowNavigator extension (this means we have everything except + example and xrandr, the same as in the Ubuntu gnome3-team's PPA) -gnome-shell-extensions (3.4.0-3) UNRELEASED; urgency=low - - * Recommends gnome-tweak-tool - - -- Victor Seva Fri, 27 Jul 2012 09:26:15 +0200 + -- Jean Schurger Thu, 04 Apr 2013 10:03:26 -0400 gnome-shell-extensions (3.4.0-2) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 65cd4752..d65bab0c 100755 --- a/debian/rules +++ b/debian/rules @@ -9,8 +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\ - default-min-max launch-new-instance static-workspaces window-list" + default-min-max launch-new-instance static-workspaces window-list\ + windowsNavigator" -EXTENSIONS_DISABLED="xrandr-indicator" +EXTENSIONS_DISABLED="example xrandr-indicator" -DEB_CONFIGURE_EXTRA_FLAGS := --enable-extensions=$(EXTENSIONS_ENABLED) +DEB_CONFIGURE_EXTRA_FLAGS := \ + --enable-extensions=$(EXTENSIONS_ENABLED) \ + --enable-classic-mode \ + $(NULL) From 88b5fea2f9719dd4f0185f2d14313e3c7c4d65f7 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 23 May 2013 08:10:54 +0000 Subject: [PATCH 07/19] release to experimental --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8222d2f1..34f7ea65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gnome-shell-extensions (3.8.2-1) UNRELEASED; urgency=low +gnome-shell-extensions (3.8.2-1) experimental; urgency=low * Team upload @@ -22,7 +22,7 @@ gnome-shell-extensions (3.8.2-1) UNRELEASED; urgency=low * Enable windowNavigator extension (this means we have everything except example and xrandr, the same as in the Ubuntu gnome3-team's PPA) - -- Jean Schurger Thu, 04 Apr 2013 10:03:26 -0400 + -- Simon McVittie Thu, 23 May 2013 09:07:23 +0100 gnome-shell-extensions (3.4.0-2) unstable; urgency=low From 4d8bccc861707b0dfe0653c2dc87a56b1e01d23f Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Sat, 8 Jun 2013 23:57:29 +0000 Subject: [PATCH 08/19] * 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 and nautilus 3.8, needed for the new Classic mode. --- debian/changelog | 11 +++++++++++ debian/control | 5 +++-- debian/control.in | 4 +++- debian/rules | 3 +-- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 34f7ea65..707aff3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +gnome-shell-extensions (3.8.3-1) UNRELEASED; urgency=low + + * 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 and nautilus 3.8, needed for the new + Classic mode. + + -- Jeremy Bicha Sat, 08 Jun 2013 19:46:26 -0400 + gnome-shell-extensions (3.8.2-1) experimental; urgency=low * Team upload diff --git a/debian/control b/debian/control index a429007e..0daa6e3a 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,6 @@ # # 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 @@ -27,7 +26,9 @@ Depends: ${misc:Depends}, gnome-shell (>= ${gnome:Version}), gnome-shell (<< ${gnome:NextVersion}), gir1.2-gtop-2.0, - gvfs (>= 1.16.0) + gvfs (>= 1.16.0), + gnome-session (>= 3.8), + nautilus (>= 3.8) 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 diff --git a/debian/control.in b/debian/control.in index 0bcac17f..d0f4e96b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -22,7 +22,9 @@ Depends: ${misc:Depends}, gnome-shell (>= ${gnome:Version}), gnome-shell (<< ${gnome:NextVersion}), gir1.2-gtop-2.0, - gvfs (>= 1.16.0) + gvfs (>= 1.16.0), + gnome-session (>= 3.8), + nautilus (>= 3.8) 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 diff --git a/debian/rules b/debian/rules index d65bab0c..e7b5b00c 100755 --- a/debian/rules +++ b/debian/rules @@ -9,8 +9,7 @@ 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\ - default-min-max launch-new-instance static-workspaces window-list\ - windowsNavigator" + launch-new-instance window-list windowsNavigator" EXTENSIONS_DISABLED="example xrandr-indicator" From 491e9fb3e9c2ed8b4b36d72eda25f0e94819ed9d Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Sun, 9 Jun 2013 00:17:39 +0000 Subject: [PATCH 09/19] * debian/rules: - Specify the location of gnome-session-check-accelerated --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 707aff3e..62a79190 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ gnome-shell-extensions (3.8.3-1) UNRELEASED; urgency=low * debian/control.in: - Depend on gnome-session and nautilus 3.8, needed for the new Classic mode. + * debian/rules: + - Specify the location of gnome-session-check-accelerated -- Jeremy Bicha Sat, 08 Jun 2013 19:46:26 -0400 diff --git a/debian/rules b/debian/rules index e7b5b00c..d2ec7edc 100755 --- a/debian/rules +++ b/debian/rules @@ -16,4 +16,4 @@ EXTENSIONS_DISABLED="example xrandr-indicator" DEB_CONFIGURE_EXTRA_FLAGS := \ --enable-extensions=$(EXTENSIONS_ENABLED) \ --enable-classic-mode \ - $(NULL) + --libexecdir=\$${prefix}/lib/gnome-session From 695b533be172c78e7f8c21f17b08a4d864a1d384 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Sun, 9 Jun 2013 00:34:35 +0000 Subject: [PATCH 10/19] - Run autoreconf * debian/patches/git-drop-IsRunnableHelper.patch: - Don't run IsRunnableHelper since it's ignored anyway --- debian/changelog | 4 ++- .../patches/git-drop-IsRunnableHelper.patch | 32 +++++++++++++++++++ debian/patches/series | 1 + debian/rules | 4 +-- 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 debian/patches/git-drop-IsRunnableHelper.patch diff --git a/debian/changelog b/debian/changelog index 62a79190..54558e5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,9 @@ gnome-shell-extensions (3.8.3-1) UNRELEASED; urgency=low - Depend on gnome-session and nautilus 3.8, needed for the new Classic mode. * debian/rules: - - Specify the location of gnome-session-check-accelerated + - Run autoreconf + * debian/patches/git-drop-IsRunnableHelper.patch: + - Don't run IsRunnableHelper since it's ignored anyway -- Jeremy Bicha Sat, 08 Jun 2013 19:46:26 -0400 diff --git a/debian/patches/git-drop-IsRunnableHelper.patch b/debian/patches/git-drop-IsRunnableHelper.patch new file mode 100644 index 00000000..34a4dd80 --- /dev/null +++ b/debian/patches/git-drop-IsRunnableHelper.patch @@ -0,0 +1,32 @@ +From 85038e2f5624a1a6fc46c0b8e3649577799610aa Mon Sep 17 00:00:00 2001 +From: Jeremy Bicha +Date: Sat, 8 Jun 2013 20:22:09 -0400 +Subject: [PATCH] classic: Drop IsRunnableHelper + +https://bugzilla.gnome.org/show_bug.cgi?id=701886 +--- + data/Makefile.am | 1 - + data/gnome-classic.session.desktop.in.in | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/data/Makefile.am b/data/Makefile.am +index e203a29..af11e18 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -36,7 +36,6 @@ gsettings_SCHEMAS = $(gsettings_in_files:.xml.in=.xml) + + %.desktop.in:%.desktop.in.in + $(AM_V_GEN) sed \ +- -e "s|\@libexecdir\@|$(libexecdir)|" \ + -e "s|\@bindir\@|$(bindir)|" \ + -e "s|\@VERSION\@|$(VERSION)|" \ + $< > $@ +diff --git a/data/gnome-classic.session.desktop.in.in b/data/gnome-classic.session.desktop.in.in +index eddbacc..c52a82a 100644 +--- a/data/gnome-classic.session.desktop.in.in ++++ b/data/gnome-classic.session.desktop.in.in +@@ -1,4 +1,3 @@ + [GNOME Session] + _Name=GNOME Classic + RequiredComponents=gnome-shell-classic;gnome-settings-daemon;nautilus-classic; +-IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated diff --git a/debian/patches/series b/debian/patches/series index e69de29b..ece1c523 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +git-drop-IsRunnableHelper.patch diff --git a/debian/rules b/debian/rules index d2ec7edc..45ed72b6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,6 @@ #!/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 @@ -15,5 +16,4 @@ EXTENSIONS_DISABLED="example xrandr-indicator" DEB_CONFIGURE_EXTRA_FLAGS := \ --enable-extensions=$(EXTENSIONS_ENABLED) \ - --enable-classic-mode \ - --libexecdir=\$${prefix}/lib/gnome-session + --enable-classic-mode From 8fd89434602b669cb73b11810ef7da1de9aa3cf4 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Mon, 17 Jun 2013 20:14:26 +0000 Subject: [PATCH 11/19] new release, drop git patch --- debian/changelog | 6 ++-- .../patches/git-drop-IsRunnableHelper.patch | 32 ------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 debian/patches/git-drop-IsRunnableHelper.patch diff --git a/debian/changelog b/debian/changelog index 54558e5c..d521090f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,13 @@ -gnome-shell-extensions (3.8.3-1) UNRELEASED; urgency=low +gnome-shell-extensions (3.8.3.1-1) UNRELEASED; urgency=low * 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 and nautilus 3.8, needed for the new + - Depend on gnome-session 3.8 and nautilus 3.8, needed for the new Classic mode. * debian/rules: - Run autoreconf - * debian/patches/git-drop-IsRunnableHelper.patch: - - Don't run IsRunnableHelper since it's ignored anyway -- Jeremy Bicha Sat, 08 Jun 2013 19:46:26 -0400 diff --git a/debian/patches/git-drop-IsRunnableHelper.patch b/debian/patches/git-drop-IsRunnableHelper.patch deleted file mode 100644 index 34a4dd80..00000000 --- a/debian/patches/git-drop-IsRunnableHelper.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 85038e2f5624a1a6fc46c0b8e3649577799610aa Mon Sep 17 00:00:00 2001 -From: Jeremy Bicha -Date: Sat, 8 Jun 2013 20:22:09 -0400 -Subject: [PATCH] classic: Drop IsRunnableHelper - -https://bugzilla.gnome.org/show_bug.cgi?id=701886 ---- - data/Makefile.am | 1 - - data/gnome-classic.session.desktop.in.in | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/data/Makefile.am b/data/Makefile.am -index e203a29..af11e18 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -36,7 +36,6 @@ gsettings_SCHEMAS = $(gsettings_in_files:.xml.in=.xml) - - %.desktop.in:%.desktop.in.in - $(AM_V_GEN) sed \ -- -e "s|\@libexecdir\@|$(libexecdir)|" \ - -e "s|\@bindir\@|$(bindir)|" \ - -e "s|\@VERSION\@|$(VERSION)|" \ - $< > $@ -diff --git a/data/gnome-classic.session.desktop.in.in b/data/gnome-classic.session.desktop.in.in -index eddbacc..c52a82a 100644 ---- a/data/gnome-classic.session.desktop.in.in -+++ b/data/gnome-classic.session.desktop.in.in -@@ -1,4 +1,3 @@ - [GNOME Session] - _Name=GNOME Classic - RequiredComponents=gnome-shell-classic;gnome-settings-daemon;nautilus-classic; --IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated diff --git a/debian/patches/series b/debian/patches/series index ece1c523..e69de29b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -git-drop-IsRunnableHelper.patch From 2f70c6c8a7a88f9c3282e72932f9d056700be697 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Sat, 29 Jun 2013 02:18:49 +0000 Subject: [PATCH 12/19] update homepages --- 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 d521090f..c405799e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ gnome-shell-extensions (3.8.3.1-1) UNRELEASED; urgency=low * debian/control.in: - Depend on gnome-session 3.8 and nautilus 3.8, needed for the new Classic mode. + - Update homepage * debian/rules: - Run autoreconf diff --git a/debian/control b/debian/control index 0daa6e3a..4bde7a37 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,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: http://live.gnome.org/GnomeShell/Extensions +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 diff --git a/debian/control.in b/debian/control.in index d0f4e96b..cf395a47 100644 --- a/debian/control.in +++ b/debian/control.in @@ -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: http://live.gnome.org/GnomeShell/Extensions +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 From 2db7b6756d751bdd8ce206bd3917b794ab395d2e Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Sat, 29 Jun 2013 02:25:53 +0000 Subject: [PATCH 13/19] * debian/patches/dont-require-nautilus-classic.patch: - Don't require nautilus-classic since it forces desktop icons --- debian/changelog | 5 +++-- debian/control | 3 +-- debian/control.in | 3 +-- debian/patches/dont-require-nautilus-classic.patch | 13 +++++++++++++ debian/patches/series | 1 + 5 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 debian/patches/dont-require-nautilus-classic.patch diff --git a/debian/changelog b/debian/changelog index c405799e..c6c1806e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,9 +4,10 @@ gnome-shell-extensions (3.8.3.1-1) UNRELEASED; urgency=low - 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 and nautilus 3.8, needed for the new - Classic mode. + - 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/rules: - Run autoreconf diff --git a/debian/control b/debian/control index 4bde7a37..6e00e54a 100644 --- a/debian/control +++ b/debian/control @@ -27,8 +27,7 @@ Depends: ${misc:Depends}, gnome-shell (<< ${gnome:NextVersion}), gir1.2-gtop-2.0, gvfs (>= 1.16.0), - gnome-session (>= 3.8), - nautilus (>= 3.8) + gnome-session (>= 3.8) 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 diff --git a/debian/control.in b/debian/control.in index cf395a47..882b1e78 100644 --- a/debian/control.in +++ b/debian/control.in @@ -23,8 +23,7 @@ Depends: ${misc:Depends}, gnome-shell (<< ${gnome:NextVersion}), gir1.2-gtop-2.0, gvfs (>= 1.16.0), - gnome-session (>= 3.8), - nautilus (>= 3.8) + gnome-session (>= 3.8) 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 diff --git a/debian/patches/dont-require-nautilus-classic.patch b/debian/patches/dont-require-nautilus-classic.patch new file mode 100644 index 00000000..0af5d477 --- /dev/null +++ b/debian/patches/dont-require-nautilus-classic.patch @@ -0,0 +1,13 @@ +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 +@@ -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; diff --git a/debian/patches/series b/debian/patches/series index e69de29b..8e0ec36b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +dont-require-nautilus-classic.patch From ad52e75e9773233a8eb6b16ffe341dac030d3a0f Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Sun, 21 Jul 2013 21:01:44 +0000 Subject: [PATCH 14/19] * 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/changelog | 10 ++- ...-applications-menu-resolution-change.patch | 70 +++++++++++++++++++ debian/patches/fix-hibernate.patch | 24 +++++++ .../look-in-data-home-for-themes.patch | 23 ++++++ debian/patches/series | 3 + 5 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 debian/patches/fix-applications-menu-resolution-change.patch create mode 100644 debian/patches/fix-hibernate.patch create mode 100644 debian/patches/look-in-data-home-for-themes.patch diff --git a/debian/changelog b/debian/changelog index c6c1806e..bb1d7b0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,10 +8,18 @@ gnome-shell-extensions (3.8.3.1-1) UNRELEASED; urgency=low - 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 - -- Jeremy Bicha Sat, 08 Jun 2013 19:46:26 -0400 + -- Jeremy Bicha Sat, 21 Jul 2013 19:01:26 -0400 gnome-shell-extensions (3.8.2-1) experimental; urgency=low diff --git a/debian/patches/fix-applications-menu-resolution-change.patch b/debian/patches/fix-applications-menu-resolution-change.patch new file mode 100644 index 00000000..b18c754e --- /dev/null +++ b/debian/patches/fix-applications-menu-resolution-change.patch @@ -0,0 +1,70 @@ +From a2f14c57c5855a6214aeb66be159ed2a986783f9 Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna +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' }); + diff --git a/debian/patches/fix-hibernate.patch b/debian/patches/fix-hibernate.patch new file mode 100644 index 00000000..4caf38ca --- /dev/null +++ b/debian/patches/fix-hibernate.patch @@ -0,0 +1,24 @@ +From 6fbc63e9e6f19aa992ba01cbd905bf486a888bba Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna +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; + } + diff --git a/debian/patches/look-in-data-home-for-themes.patch b/debian/patches/look-in-data-home-for-themes.patch new file mode 100644 index 00000000..348a06bd --- /dev/null +++ b/debian/patches/look-in-data-home-for-themes.patch @@ -0,0 +1,23 @@ +From ae9df9f0010eaadc79d068c49f96c8265b181014 Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna +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); + diff --git a/debian/patches/series b/debian/patches/series index 8e0ec36b..afa8374c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,4 @@ dont-require-nautilus-classic.patch +fix-hibernate.patch +fix-applications-menu-resolution-change.patch +look-in-data-home-for-themes.patch From c53e5325c39291928775bdde2bf9420dac0c9e72 Mon Sep 17 00:00:00 2001 From: Andreas Henriksson Date: Fri, 16 Aug 2013 18:34:09 +0000 Subject: [PATCH 15/19] Upload to experimental --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bb1d7b0e..ba881a68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -gnome-shell-extensions (3.8.3.1-1) UNRELEASED; urgency=low +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 @@ -19,7 +20,7 @@ gnome-shell-extensions (3.8.3.1-1) UNRELEASED; urgency=low * debian/rules: - Run autoreconf - -- Jeremy Bicha Sat, 21 Jul 2013 19:01:26 -0400 + -- Andreas Henriksson Fri, 16 Aug 2013 20:25:30 +0200 gnome-shell-extensions (3.8.2-1) experimental; urgency=low From 06a9891d77aefe570bf34941470348c8a77c0a75 Mon Sep 17 00:00:00 2001 From: Jeremy Bicha Date: Wed, 11 Sep 2013 20:43:21 +0000 Subject: [PATCH 16/19] * 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 --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index ba881a68..cd859100 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +gnome-shell-extensions (3.8.4-1) UNRELEASED; urgency=low + + * 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 + + -- Jeremy Bicha Wed, 11 Sep 2013 16:42:22 -0400 + gnome-shell-extensions (3.8.3.1-1) experimental; urgency=low [ Jeremy Bicha ] From 42158401ac9a7d6f7cc6f03a7144e4a9d922fcf2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 11 Oct 2013 14:41:56 +0000 Subject: [PATCH 17/19] Actually drop the patches --- ...-applications-menu-resolution-change.patch | 70 ------------------- debian/patches/fix-hibernate.patch | 24 ------- .../look-in-data-home-for-themes.patch | 23 ------ debian/patches/series | 3 - 4 files changed, 120 deletions(-) delete mode 100644 debian/patches/fix-applications-menu-resolution-change.patch delete mode 100644 debian/patches/fix-hibernate.patch delete mode 100644 debian/patches/look-in-data-home-for-themes.patch diff --git a/debian/patches/fix-applications-menu-resolution-change.patch b/debian/patches/fix-applications-menu-resolution-change.patch deleted file mode 100644 index b18c754e..00000000 --- a/debian/patches/fix-applications-menu-resolution-change.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a2f14c57c5855a6214aeb66be159ed2a986783f9 Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -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' }); - diff --git a/debian/patches/fix-hibernate.patch b/debian/patches/fix-hibernate.patch deleted file mode 100644 index 4caf38ca..00000000 --- a/debian/patches/fix-hibernate.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 6fbc63e9e6f19aa992ba01cbd905bf486a888bba Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -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; - } - diff --git a/debian/patches/look-in-data-home-for-themes.patch b/debian/patches/look-in-data-home-for-themes.patch deleted file mode 100644 index 348a06bd..00000000 --- a/debian/patches/look-in-data-home-for-themes.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ae9df9f0010eaadc79d068c49f96c8265b181014 Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -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); - diff --git a/debian/patches/series b/debian/patches/series index afa8374c..8e0ec36b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1 @@ dont-require-nautilus-classic.patch -fix-hibernate.patch -fix-applications-menu-resolution-change.patch -look-in-data-home-for-themes.patch From 67c795b610d35b83449a9b906a594bf3f577f207 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 11 Oct 2013 16:52:46 +0000 Subject: [PATCH 18/19] 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. --- debian/changelog | 6 +++++ debian/control | 3 ++- debian/local/gnome-session-classic | 2 ++ ...gnome-session-classic-wrapper-script.patch | 25 +++++++++++++++++++ debian/patches/series | 1 + debian/rules | 4 +++ 6 files changed, 40 insertions(+), 1 deletion(-) create mode 100755 debian/local/gnome-session-classic create mode 100644 debian/patches/gnome-session-classic-wrapper-script.patch diff --git a/debian/changelog b/debian/changelog index cd859100..e9db2544 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,17 @@ gnome-shell-extensions (3.8.4-1) UNRELEASED; 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. + -- Jeremy Bicha Wed, 11 Sep 2013 16:42:22 -0400 gnome-shell-extensions (3.8.3.1-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 6e00e54a..fd28efc2 100644 --- a/debian/control +++ b/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 -Uploaders: Victor Seva , Michael Biebl +Uploaders: Victor Seva , Andreas Henriksson , Jeremy Bicha , Michael Biebl Build-Depends: debhelper (>= 8.0.0), cdbs, dh-autoreconf, diff --git a/debian/local/gnome-session-classic b/debian/local/gnome-session-classic new file mode 100755 index 00000000..d4065e31 --- /dev/null +++ b/debian/local/gnome-session-classic @@ -0,0 +1,2 @@ +#! /bin/sh +exec gnome-session --session gnome-classic "$@" diff --git a/debian/patches/gnome-session-classic-wrapper-script.patch b/debian/patches/gnome-session-classic-wrapper-script.patch new file mode 100644 index 00000000..e6c9ab85 --- /dev/null +++ b/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 + +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 diff --git a/debian/patches/series b/debian/patches/series index 8e0ec36b..6410b5c4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ dont-require-nautilus-classic.patch +gnome-session-classic-wrapper-script.patch diff --git a/debian/rules b/debian/rules index 45ed72b6..caba18db 100755 --- a/debian/rules +++ b/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 From 94306700194b037d1ea1a89c0c7059f3249ebb8d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 11 Oct 2013 16:56:11 +0000 Subject: [PATCH 19/19] Release version 3.8.4-1 to experimental --- debian/changelog | 4 ++-- debian/control | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index e9db2544..6099aeff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -gnome-shell-extensions (3.8.4-1) UNRELEASED; urgency=low +gnome-shell-extensions (3.8.4-1) experimental; urgency=low [ Jeremy Bicha ] * New upstream release @@ -12,7 +12,7 @@ gnome-shell-extensions (3.8.4-1) UNRELEASED; urgency=low Xsession doesn't allow to run gnome-session with custom arguments due to #653327. - -- Jeremy Bicha Wed, 11 Sep 2013 16:42:22 -0400 + -- Michael Biebl Fri, 11 Oct 2013 18:55:23 +0200 gnome-shell-extensions (3.8.3.1-1) experimental; urgency=low diff --git a/debian/control b/debian/control index fd28efc2..d80a26b6 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Source: gnome-shell-extensions Section: gnome Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Victor Seva , Andreas Henriksson , Jeremy Bicha , Michael Biebl +Uploaders: Victor Seva , Andreas Henriksson , Michael Biebl Build-Depends: debhelper (>= 8.0.0), cdbs, dh-autoreconf,