r26842 - in /packages/experimental/gnome-shell/debian: changelog control.in patches/03_fix_dconf_service_location.patch patches/04_gnome_session_quit.patch patches/series
fpeters at users.alioth.debian.org
fpeters at users.alioth.debian.org
Sat Mar 12 18:44:17 UTC 2011
Author: fpeters
Date: Sat Mar 12 18:44:15 2011
New Revision: 26842
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26842
Log:
* debian/control.in:
+ Don't depend on mutter, it now links against libmutter-wm0.
* debian/patches/03_fix_dconf_service_location.patch: remove, no longer
necessary now that gnome-shell is a real binary and doesn't try to arrange
its own environment.
* debian/patches/04_gnome_session_quit.patch: use gnome-session-save in
fallback if gnome-session-quit doesn't work, so gnome-shell keeps working
with older gnome-session versions.
Added:
packages/experimental/gnome-shell/debian/patches/04_gnome_session_quit.patch
Removed:
packages/experimental/gnome-shell/debian/patches/03_fix_dconf_service_location.patch
Modified:
packages/experimental/gnome-shell/debian/changelog
packages/experimental/gnome-shell/debian/control.in
packages/experimental/gnome-shell/debian/patches/series
Modified: packages/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/changelog?rev=26842&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/changelog [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/changelog [utf-8] Sat Mar 12 18:44:15 2011
@@ -1,10 +1,23 @@
-gnome-shell (2.91.90-2) UNRELEASED; urgency=low
-
+gnome-shell (2.91.91-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ [ Emilio Pozuelo Monfort ]
* debian/control.in:
+ Depend on gsettings-desktop-schemas. Closes: #614945.
+ Depend on gir1.2-mutter-2.91. Closes: #615588.
- -- Emilio Pozuelo Monfort <pochu at debian.org> Sat, 26 Feb 2011 11:02:14 +0000
+ [ Frederic Peters ]
+ * debian/control.in:
+ + Don't depend on mutter, it now links against libmutter-wm0.
+ * debian/patches/03_fix_dconf_service_location.patch: remove, no longer
+ necessary now that gnome-shell is a real binary and doesn't try to arrange
+ its own environment.
+ * debian/patches/04_gnome_session_quit.patch: use gnome-session-save in
+ fallback if gnome-session-quit doesn't work, so gnome-shell keeps working
+ with older gnome-session versions.
+
+ -- Frederic Peters <fpeters at debian.org> Sat, 12 Mar 2011 19:40:06 +0100
gnome-shell (2.91.90-1) experimental; urgency=low
Modified: packages/experimental/gnome-shell/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/control.in?rev=26842&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/control.in [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/control.in [utf-8] Sat Mar 12 18:44:15 2011
@@ -20,7 +20,6 @@
gir1.2-mutter-2.91,
gir1.2-polkit-1.0,
gir1.2-telepathyglib-0.12,
- mutter (>= 2.91.90),
libcroco3-dev (>= 0.6),
libdbus-glib-1-dev,
libgconf2-dev,
@@ -32,7 +31,7 @@
libgstreamer0.10-dev (>= 0.10.16),
libgtk-3-dev (>= 3.0.0),
libstartup-notification0-dev,
- libmutter-dev (>= 2.91.90),
+ libmutter-dev (>= 2.91.91),
librsvg2-dev,
libwnck-dev,
libclutter-1.0-dev (>= 1.5.15),
@@ -56,14 +55,13 @@
gjs,
${shlibs:Depends},
${misc:Depends},
- mutter (>= 2.91.4),
libdconf0 | gsettings-backend,
gnome-settings-daemon (>= 2.91.5.1),
gnome-control-center (>= 2.91),
gsettings-desktop-schemas (>= 0.1.7),
gir1.2-gconf-2.0,
gir1.2-gkbd-3.0,
- gir1.2-mutter-2.91 (>= 2.91.90),
+ gir1.2-mutter-2.91 (>= 2.91.91),
gir1.2-polkit-1.0,
gir1.2-upowerglib-1.0,
gir1.2-telepathyglib-0.12,
Added: packages/experimental/gnome-shell/debian/patches/04_gnome_session_quit.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/patches/04_gnome_session_quit.patch?rev=26842&op=file
==============================================================================
--- packages/experimental/gnome-shell/debian/patches/04_gnome_session_quit.patch (added)
+++ packages/experimental/gnome-shell/debian/patches/04_gnome_session_quit.patch [utf-8] Sat Mar 12 18:44:15 2011
@@ -1,0 +1,33 @@
+Use gnome-session-save in fallback if gnome-session-quit doesn't work, so
+gnome-shell keeps working with older gnome-session versions.
+
+Index: gnome-shell-2.91.91/js/ui/statusMenu.js
+===================================================================
+--- gnome-shell-2.91.91.orig/js/ui/statusMenu.js 2011-03-12 19:15:58.068843000 +0100
++++ gnome-shell-2.91.91/js/ui/statusMenu.js 2011-03-12 19:22:18.140843002 +0100
+@@ -199,7 +199,11 @@
+
+ _onQuitSessionActivate: function() {
+ Main.overview.hide();
+- Util.spawn(['gnome-session-quit', '--logout']);
++ try {
++ Util.trySpawn(['gnome-session-quit', '--logout']);
++ } catch (err) {
++ Util.spawn(['gnome-session-save', '--logout']);
++ }
+ },
+
+ _onSuspendOrPowerOffActivate: function() {
+@@ -209,7 +213,11 @@
+ this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) {
+ this._upClient.suspend_sync(null);
+ } else {
+- Util.spawn(['gnome-session-quit', '--power-off']);
++ try {
++ Util.spawn(['gnome-session-quit', '--power-off']);
++ } catch (err) {
++ Util.spawn(['gnome-session-save', '--power-off']);
++ }
+ }
+ },
+
Modified: packages/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/gnome-shell/debian/patches/series?rev=26842&op=diff
==============================================================================
--- packages/experimental/gnome-shell/debian/patches/series [utf-8] (original)
+++ packages/experimental/gnome-shell/debian/patches/series [utf-8] Sat Mar 12 18:44:15 2011
@@ -1,2 +1,2 @@
01_favorite_apps.patch
-03_fix_dconf_service_location.patch
+04_gnome_session_quit.patch
More information about the pkg-gnome-commits
mailing list