--- gnome-shell-3.8.4/debian/changelog 2014-01-15 10:34:59.000000000 +1100 +++ gnome-shell-3.10.3/debian/changelog 2014-01-17 07:08:12.000000000 +1100 @@ -1,3 +1,122 @@ +gnome-shell (3.10.3-0ubuntu1) trusty; urgency=medium + + * New upstream release (LP: #1269916) + * Merge from Debian, remaining changes: + - debian/control.in: + + Recommend gdm instead of gdm3 + + Add Recommends on network-manager since this + is required for network panel to work. (LP: #1225787) + - debian/patches/revert-notification-settings-link.patch: + + Don't link to Notification Settings since that's only available + with gnome-control-center >= 3.8. + - debian/patches/40_change-pam-name-to-match-gdm.patch: + + Disabled not needed on Ubuntu + - debian/patches/revert-disable-periodic-gc.patch: + + This is safe to re-enable with mozjs17 + - debian/patches/ubuntu-lightdm-user-switching.patch: + + Allow user switching when using LightDM. + Rebased for 3.10 Usermenu changes (thanks Parin) + - debian/patches/ubuntu_lock_on_suspend.patch + + Respect Ubuntu's lock-on-suspend setting. + Rebased for 3.10 Usermenu changes (thanks Parin) + - source_gnome_shell.py: Now we have upstart user sessions most + logging goes into the gnome-session.log, so add this to the + apport hook. + * debian/patches: + - revert_new_bluetooth.patch: revert changes requiring Bluez5 + - revert_new_brightness_widget.patch: In its current + form this requires gnome-settings-daemon 3.10. If trusty ends up + on g-s-d 3.8, then this should be backported to the old API + - revert-shelldbus-export-timestamps.patch: Revert + api change to fix keyboard shortcuts, this can be dropped when + g-s-d gets updated to 3.10 + + -- Tim Lunn Fri, 17 Jan 2014 06:52:05 +1100 + +gnome-shell (3.10.1-1) experimental; urgency=low + + [ Sjoerd Simons ] + * New upstream release + * debian/patches/11-no-gettext.patch + + Removed, fixed upstream + * debian/patches/git_relock_screen_after_crash.patch + + Removed, fixed upstream + * debian/patches/revert-suspend-break.patch + + Removed, our systemd-logind is new enough these days + * debian/patches/10-make-NetworkManager-optional.patch + debian/patches/27-nm-libexec-path.patch + debian/patches/40_change-pam-name-to-match-gdm.patch + + Refreshed + * debian/control.in: Sync b-depends and debians from Ubuntus gnome3-teams + packaging + * debian/patches/10-make-NetworkManager-optional.patch + + Temporarily disabled as it breaks gnome-shell currently + + [ Laurent Bigonville ] + * debian/control.in: + - Demote gdm3 Depends to Recommends, if gdm is not installed gnome-shell + will not be able to lock the screen (Closes: #727558) + - Add Depends against gir1.2-gdm3 + + [ Sjoerd Simons ] + * debian/gnome-shell-common.dirs: Create an empty + /usr/share/gnome-shell/modes to work around bgo#709313 + + -- Sjoerd Simons Fri, 01 Nov 2013 23:03:15 +0100 + +gnome-shell (3.8.4-4) unstable; urgency=low + + [ Petr Salinger ] + * Restrict dependency on gir1.2-nmgtk-1.0 to linux-any (Closes: #726099) + + [ Emilio Pozuelo Monfort ] + * Upload to unstable. + + -- Emilio Pozuelo Monfort Sun, 13 Oct 2013 17:47:35 +0200 + +gnome-shell (3.8.4-3) experimental; urgency=low + + * debian/rules: + + Explicitly enable NetworkManager support on linux. Closes: #725760. + * debian/patches/10-make-NetworkManager-optional.patch: + + Drop gnome-keyring-1 check, leftover from the 3.4 patch. + + -- Emilio Pozuelo Monfort Tue, 08 Oct 2013 17:53:24 +0200 + +gnome-shell (3.8.4-2) experimental; urgency=low + + * debian/patches/10-make-NetworkManager-optional.patch: + + Updated from gentoo package for the new version, apply the patch + again to fix the build on !linux. Closes: #692049. + + -- Emilio Pozuelo Monfort Sun, 06 Oct 2013 11:38:30 +0200 + +gnome-shell (3.8.4-1) experimental; urgency=low + + [ Emilio Pozuelo Monfort ] + * debian/control.in: + + Add gkbd-capplet back to gnome-shell's recommends. It was dropped + in 3.7.92-1 but the shell's keyboard layout switcher uses it to + display the layout in a window. + + [ Jeremy Bicha ] + * debian/patches/git_relock_screen_after_crash.patch: + + Backport fix to ensure session is locked after crash + * debian/control.in: + - Update homepage + - Drop obsolete gconf dependency + + [ Emilio Pozuelo Monfort ] + * New upstream release. + + [ Laurent Bigonville ] + * debian/control.in: Bump gir1.2-ibus-1.0 dependency to 1.5.2, this is + needed for the new ibus_bus_new_async() API. + * debian/control.in: Bump Standards-Version to 3.9.4 (no further changes) + * debian/gnome-shell.lintian-overrides: Adjust override + + -- Laurent Bigonville Sat, 24 Aug 2013 14:52:18 +0200 + gnome-shell (3.8.4-0ubuntu8) trusty; urgency=medium * No-change rebuild for new cogl @@ -86,6 +205,16 @@ Nautilus is ran with not other apps running (LP: #1164086) * debian/control.in: drop obsolete gconf dependency + +gnome-shell (3.8.3-1ubuntu3) saucy; urgency=low + + * debian/patches/git-dont-crash-for-unstaged-widgets.patch: + - Git patch to fix GNOME Shell crashing when, for instance, * debian/patches/revert-notification-settings-link.patch: + - Don't link to Notification Settings since that's only available + with gnome-control-center >= 3.8. + Nautilus is ran with not other apps running (LP: #1164086) + * debian/control.in: drop obsolete gconf dependency + -- Jeremy Bicha Sun, 14 Jul 2013 12:31:49 -0400 gnome-shell (3.8.3-1ubuntu2) saucy; urgency=low --- gnome-shell-3.8.4/debian/control 2014-01-15 10:35:03.000000000 +1100 +++ gnome-shell-3.10.3/debian/control 2014-01-17 07:08:26.000000000 +1100 @@ -7,7 +7,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers , Jeremy Bicha +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Laurent Bigonville , Sjoerd Simons Build-Depends: autotools-dev, cdbs, debhelper (>= 8.1.3~), @@ -16,7 +16,7 @@ gnome-control-center-dev (>= 3.4), gnome-pkg-tools (>= 0.11), gobject-introspection (>= 1.29.15), - gsettings-desktop-schemas-dev (>= 3.7.4), + gsettings-desktop-schemas-dev (>= 3.9.0), gtk-doc-tools, intltool (>= 0.26), libatk-bridge2.0-dev, @@ -28,23 +28,24 @@ libdbus-glib-1-dev, libecal1.2-dev (>= 3.7.90), libedataserver1.2-dev (>= 3.7.90), + libgcr-3-dev (>= 3.7.5), libgirepository1.0-dev (>= 1.29.15), - libgjs-dev (>= 1.37.4), - libglib2.0-dev (>= 2.31.6), + libgjs-dev (>= 1.37.0), + libglib2.0-dev (>= 2.37.0), libgnome-bluetooth-dev (>= 3.5.5) [linux-any], libgnome-desktop-3-dev (>= 3.7.90), - libsecret-1-dev, libgnome-menu-3-dev (>= 3.5.3), libgstreamer1.0-dev (>= 0.11.92), libgtk-3-dev (>= 3.7.9), libibus-1.0-dev, - libmutter-dev (>= 3.8.3), + libmutter-dev (>= 3.10.1), libnm-glib-dev (>= 0.9.8) [linux-any], libnm-glib-vpn-dev (>= 0.9.8) [linux-any], - libnm-gtk-dev (>= 0.9.6) [linux-any], - libnm-util-dev (>= 0.9) [linux-any], + libnm-gtk-dev (>= 0.9.8) [linux-any], + libnm-util-dev (>= 0.9.8) [linux-any], libpolkit-agent-1-dev (>= 0.100), - libpulse-dev (>= 2.0), + libpulse-dev (>= 1:2.0), + libsecret-1-dev, libstartup-notification0-dev (>= 0.11), libsystemd-login-dev, libsystemd-daemon-dev, @@ -52,11 +53,10 @@ libx11-dev, libxfixes-dev, libxml2-dev, - python (>= 2.6), - libgcr-3-dev (>= 3.7.5) -Standards-Version: 3.9.3 + python (>= 2.6) +Standards-Version: 3.9.4 Homepage: http://live.gnome.org/GnomeShell -Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-shell +Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-shell Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-shell/ Package: gnome-shell @@ -65,22 +65,23 @@ ${icon-theme:Depends}, ${misc:Depends}, ${shlibs:Depends}, - libgdm (>= 3.5.90), - gnome-shell-common (= ${source:Version}), + evolution-data-server (>= 3.7.90), + gir1.2-gdm-1.0, gir1.2-accountsservice-1.0, + gir1.2-atspi-2.0 (>= 2.9.91), gir1.2-caribou-1.0 (>= 0.4.8), gir1.2-clutter-1.0 (>= 1.11.11), gir1.2-freedesktop, gir1.2-gcr-3 (>= 3.7.5), gir1.2-gkbd-3.0, - gir1.2-glib-2.0 (>= 1.31), + gir1.2-glib-2.0 (>= 1.37), gir1.2-gnomebluetooth-1.0 (>= 3.6.0) [linux-any], gir1.2-gnomedesktop-3.0 (>= 3.7.90), gir1.2-gtk-3.0 (>= 3.8), - gir1.2-ibus-1.0 (>= 1.4), - gir1.2-mutter-3.0 (>= 3.8.3), + gir1.2-ibus-1.0 (>= 1.5.2), + gir1.2-mutter-3.0 (>= 3.10.0), gir1.2-networkmanager-1.0 [linux-any], - gir1.2-nmgtk-1.0, + gir1.2-nmgtk-1.0 (>= 0.9.8) [linux-any], gir1.2-pango-1.0, gir1.2-polkit-1.0, gir1.2-soup-2.4 (>= 2.40.1), @@ -89,23 +90,24 @@ gir1.2-upowerglib-1.0, gjs (>= 1.37.4), gnome-icon-theme-symbolic (>= 2.91), - gnome-settings-daemon (>= 3.8.4), + gnome-settings-daemon (>= 3.4.0), + gnome-shell-common (= ${source:Version}), gnome-themes-standard, - gsettings-desktop-schemas (>= 3.7.4), + gsettings-desktop-schemas (>= 3.9.0), python (>= 2.6), telepathy-mission-control-5, - evolution-data-server (>= 3.7.90) -Recommends: gnome-contacts, +Recommends: gkbd-capplet, + gnome-contacts, gnome-control-center, gnome-user-guide, network-manager, - unzip -Suggests: gdm + unzip, + gdm (>= 3.5.90) Breaks: fglrx-driver (<< 1:11-10), + gdm (<< 3.5.90), gnome-control-center (<< 1:3.0), gnome-session (<< 3.0), - gnome-tweak-tool (<< 3.5), - gdm3 (<< 3.5.90) + gnome-tweak-tool (<< 3.5) Conflicts: gnome-screensaver (<< 3.6) Description: graphical shell for the GNOME desktop The GNOME Shell redefines user interactions with the GNOME desktop. @@ -131,8 +133,8 @@ Architecture: any Section: debug Priority: extra -Depends: gnome-shell (= ${binary:Version}), - ${misc:Depends} +Depends: ${misc:Depends}, + gnome-shell (= ${binary:Version}) Recommends: mutter-dbg Description: Debugging symbols for GNOME Shell The GNOME Shell redefines user interactions with the GNOME desktop. --- gnome-shell-3.8.4/debian/control.in 2013-09-17 21:10:48.000000000 +1000 +++ gnome-shell-3.10.3/debian/control.in 2013-12-29 12:17:04.000000000 +1100 @@ -12,7 +12,7 @@ gnome-control-center-dev (>= 3.4), gnome-pkg-tools (>= 0.11), gobject-introspection (>= 1.29.15), - gsettings-desktop-schemas-dev (>= 3.7.4), + gsettings-desktop-schemas-dev (>= 3.9.0), gtk-doc-tools, intltool (>= 0.26), libatk-bridge2.0-dev, @@ -24,23 +24,24 @@ libdbus-glib-1-dev, libecal1.2-dev (>= 3.7.90), libedataserver1.2-dev (>= 3.7.90), + libgcr-3-dev (>= 3.7.5), libgirepository1.0-dev (>= 1.29.15), - libgjs-dev (>= 1.37.4), - libglib2.0-dev (>= 2.31.6), + libgjs-dev (>= 1.37.0), + libglib2.0-dev (>= 2.37.0), libgnome-bluetooth-dev (>= 3.5.5) [linux-any], libgnome-desktop-3-dev (>= 3.7.90), - libsecret-1-dev, libgnome-menu-3-dev (>= 3.5.3), libgstreamer1.0-dev (>= 0.11.92), libgtk-3-dev (>= 3.7.9), libibus-1.0-dev, - libmutter-dev (>= 3.8.3), + libmutter-dev (>= 3.10.1), libnm-glib-dev (>= 0.9.8) [linux-any], libnm-glib-vpn-dev (>= 0.9.8) [linux-any], - libnm-gtk-dev (>= 0.9.6) [linux-any], - libnm-util-dev (>= 0.9) [linux-any], + libnm-gtk-dev (>= 0.9.8) [linux-any], + libnm-util-dev (>= 0.9.8) [linux-any], libpolkit-agent-1-dev (>= 0.100), - libpulse-dev (>= 2.0), + libpulse-dev (>= 1:2.0), + libsecret-1-dev, libstartup-notification0-dev (>= 0.11), libsystemd-login-dev, libsystemd-daemon-dev, @@ -48,11 +49,10 @@ libx11-dev, libxfixes-dev, libxml2-dev, - python (>= 2.6), - libgcr-3-dev (>= 3.7.5) -Standards-Version: 3.9.3 + python (>= 2.6) +Standards-Version: 3.9.4 Homepage: http://live.gnome.org/GnomeShell -Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-shell +Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-shell Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-shell/ Package: gnome-shell @@ -61,22 +61,23 @@ ${icon-theme:Depends}, ${misc:Depends}, ${shlibs:Depends}, - libgdm (>= 3.5.90), - gnome-shell-common (= ${source:Version}), + evolution-data-server (>= 3.7.90), + gir1.2-gdm-1.0, gir1.2-accountsservice-1.0, + gir1.2-atspi-2.0 (>= 2.9.91), gir1.2-caribou-1.0 (>= 0.4.8), gir1.2-clutter-1.0 (>= 1.11.11), gir1.2-freedesktop, gir1.2-gcr-3 (>= 3.7.5), gir1.2-gkbd-3.0, - gir1.2-glib-2.0 (>= 1.31), + gir1.2-glib-2.0 (>= 1.37), gir1.2-gnomebluetooth-1.0 (>= 3.6.0) [linux-any], gir1.2-gnomedesktop-3.0 (>= 3.7.90), gir1.2-gtk-3.0 (>= 3.8), - gir1.2-ibus-1.0 (>= 1.4), - gir1.2-mutter-3.0 (>= 3.8.3), + gir1.2-ibus-1.0 (>= 1.5.2), + gir1.2-mutter-3.0 (>= 3.10.0), gir1.2-networkmanager-1.0 [linux-any], - gir1.2-nmgtk-1.0, + gir1.2-nmgtk-1.0 (>= 0.9.8) [linux-any], gir1.2-pango-1.0, gir1.2-polkit-1.0, gir1.2-soup-2.4 (>= 2.40.1), @@ -85,23 +86,24 @@ gir1.2-upowerglib-1.0, gjs (>= 1.37.4), gnome-icon-theme-symbolic (>= 2.91), - gnome-settings-daemon (>= 3.8.4), + gnome-settings-daemon (>= 3.4.0), + gnome-shell-common (= ${source:Version}), gnome-themes-standard, - gsettings-desktop-schemas (>= 3.7.4), + gsettings-desktop-schemas (>= 3.9.0), python (>= 2.6), telepathy-mission-control-5, - evolution-data-server (>= 3.7.90) -Recommends: gnome-contacts, +Recommends: gkbd-capplet, + gnome-contacts, gnome-control-center, gnome-user-guide, network-manager, - unzip -Suggests: gdm + unzip, + gdm (>= 3.5.90) Breaks: fglrx-driver (<< 1:11-10), + gdm (<< 3.5.90), gnome-control-center (<< 1:3.0), gnome-session (<< 3.0), - gnome-tweak-tool (<< 3.5), - gdm3 (<< 3.5.90) + gnome-tweak-tool (<< 3.5) Conflicts: gnome-screensaver (<< 3.6) Description: graphical shell for the GNOME desktop The GNOME Shell redefines user interactions with the GNOME desktop. @@ -127,8 +129,8 @@ Architecture: any Section: debug Priority: extra -Depends: gnome-shell (= ${binary:Version}), - ${misc:Depends} +Depends: ${misc:Depends}, + gnome-shell (= ${binary:Version}) Recommends: mutter-dbg Description: Debugging symbols for GNOME Shell The GNOME Shell redefines user interactions with the GNOME desktop. --- gnome-shell-3.8.4/debian/gnome-shell-common.dirs 1970-01-01 10:00:00.000000000 +1000 +++ gnome-shell-3.10.3/debian/gnome-shell-common.dirs 2013-12-29 11:44:16.000000000 +1100 @@ -0,0 +1 @@ +usr/share/gnome-shell/modes --- gnome-shell-3.8.4/debian/gnome-shell-common.install 2013-09-12 08:32:39.000000000 +1000 +++ gnome-shell-3.10.3/debian/gnome-shell-common.install 2013-12-29 11:44:32.000000000 +1100 @@ -1,7 +1,7 @@ -usr/share/glib-2.0 +debian/source_gnome-shell.py /usr/share/apport/package-hooks usr/share/GConf +usr/share/glib-2.0 usr/share/gnome-control-center usr/share/gnome-shell usr/share/gtk-doc usr/share/locale -debian/source_gnome-shell.py /usr/share/apport/package-hooks --- gnome-shell-3.8.4/debian/gnome-shell.lintian-overrides 2013-09-12 08:32:39.000000000 +1000 +++ gnome-shell-3.10.3/debian/gnome-shell.lintian-overrides 2013-12-29 11:44:55.000000000 +1100 @@ -1,4 +1,4 @@ # It's the only way we have to let gnome-shell find the private library it # links against through libgnome-shell.so -gnome-shell: binary-or-shlib-defines-rpath usr/bin/gnome-shell /usr/lib/gnome-bluetooth +gnome-shell: binary-or-shlib-defines-rpath usr/bin/gnome-shell /usr/lib/gnome-bluetooth:/usr/lib/gnome-shell gnome-shell: binary-or-shlib-defines-rpath usr/lib/gnome-shell/libgnome-shell.so /usr/lib/gnome-bluetooth --- gnome-shell-3.8.4/debian/patches/10-make-NetworkManager-optional.patch 2013-09-12 08:32:39.000000000 +1000 +++ gnome-shell-3.10.3/debian/patches/10-make-NetworkManager-optional.patch 2013-12-29 11:46:52.000000000 +1100 @@ -1,9 +1,5 @@ -From 411d751935c9bdc485b113678284edf0cc9e545e Mon Sep 17 00:00:00 2001 -From: Michael Biebl -Date: Thu, 22 Dec 2011 22:04:12 +0100 -Subject: [PATCH] Make NM optional +From: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/files/ -[ Alexandre Rostovtsev : * use config.js (and AC_SUBST HAVE_NETWORKMANAGER appropriately); * take care to not import ui.status.network if nm is disabled; * do not try to reassign to const variables; @@ -11,40 +7,130 @@ * don't build shell-mobile-providers if nm is disabled; * use "networkmanager" instead of "network_manager" because THE BIKESHED SHOULD BE BLUE, also because the upstream package name is - NetworkManager, not Network_Manager. ] ---- - configure.ac | 47 ++++++++++++++++++++++++++++++++++++++++++++++- - js/Makefile.am | 1 + - js/misc/config.js.in | 2 ++ - js/ui/main.js | 8 ++++++-- - js/ui/panel.js | 3 ++- - src/Makefile.am | 17 ++++++++++++----- - 6 files changed, 69 insertions(+), 9 deletions(-) - -Index: gnome-shell-3.4.1/configure.ac -=================================================================== ---- gnome-shell-3.4.1.orig/configure.ac 2012-05-19 09:44:06.875666393 +0200 -+++ gnome-shell-3.4.1/configure.ac 2012-05-19 09:44:18.047666283 +0200 -@@ -94,9 +94,42 @@ - telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION - telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION - polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes -- libnm-glib libnm-util gnome-keyring-1 -+ gnome-keyring-1 - gcr-3 >= $GCR_MIN_VERSION) - -+########################## -+# Check for NetworkManager -+########################## -+NM_MIN_VERSION=0.9 + NetworkManager, not Network_Manager. +--- a/js/Makefile.am ++++ b/js/Makefile.am +@@ -8,6 +8,7 @@ + sed -e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \ + -e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \ + -e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \ ++ -e "s|[@]HAVE_NETWORKMANAGER@|$(HAVE_NETWORKMANAGER)|g" \ + -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \ + -e "s|[@]datadir@|$(datadir)|g" \ + -e "s|[@]libexecdir@|$(libexecdir)|g" \ +--- a/js/misc/config.js.in ++++ b/js/misc/config.js.in +@@ -6,6 +6,8 @@ + const PACKAGE_VERSION = '@PACKAGE_VERSION@'; + /* 1 if gnome-bluetooth is available, 0 otherwise */ + const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@; ++/* 1 if networkmanager is available, 0 otherwise */ ++const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@; + /* gettext package */ + const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@'; + /* locale dir */ +--- a/js/ui/panel.js ++++ b/js/ui/panel.js +@@ -811,7 +811,9 @@ + this._indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' }); + this.actor.add_child(this._indicators); + +- this._network = new imports.ui.status.network.NMApplet(); ++ if (Config.HAVE_NETWORKMANAGER) { ++ this._network = new imports.ui.status.network.NMApplet(); ++ } + if (Config.HAVE_BLUETOOTH) { + this._bluetooth = new imports.ui.status.bluetooth.Indicator(); + } else { +--- a/js/ui/sessionMode.js ++++ b/js/ui/sessionMode.js +@@ -10,6 +10,8 @@ + const Main = imports.ui.main; + const Params = imports.misc.params; + ++const Config = imports.misc.config; ++ + const DEFAULT_MODE = 'restrictive'; + + const _modes = { +@@ -92,7 +94,10 @@ + isLocked: false, + isPrimary: true, + unlockDialog: imports.ui.unlockDialog.UnlockDialog, +- components: ['networkAgent', 'polkitAgent', 'telepathyClient', ++ components: Config.HAVE_NETWORKMANAGER ? ++ ['networkAgent', 'polkitAgent', 'telepathyClient', ++ 'keyring', 'autorunManager', 'automountManager'] : ++ ['polkitAgent', 'telepathyClient', + 'keyring', 'autorunManager', 'automountManager'], + panel: { + left: ['activities', 'appMenu'], +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -103,7 +103,6 @@ + shell-invert-lightness-effect.h \ + shell-keybinding-modes.h \ + shell-mount-operation.h \ +- shell-network-agent.h \ + shell-perf-log.h \ + shell-screenshot.h \ + shell-slicer.h \ +@@ -140,7 +139,6 @@ + shell-menu-tracker.c \ + shell-menu-tracker.h \ + shell-mount-operation.c \ +- shell-network-agent.c \ + shell-perf-log.c \ + shell-polkit-authentication-agent.h \ + shell-polkit-authentication-agent.c \ +@@ -175,6 +173,10 @@ + + libgnome_shell_la_SOURCES = $(libgnome_shell_sources) + ++if HAVE_NETWORKMANAGER ++libgnome_shell_la_SOURCES += shell-network-agent.c ++endif ++ + libgnome_shell_la_gir_sources = \ + $(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_base_la_SOURCES) $(libgnome_shell_sources)) + +@@ -331,7 +333,10 @@ + CLEANFILES += ShellMenu-0.1.gir + + Shell-0.1.gir: gnome-shell St-1.0.gir ShellMenu-0.1.gir +-Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 ++Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 Soup-2.4 GMenu-3.0 ++if HAVE_NETWORKMANAGER ++Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0 ++endif + Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir) + # Hack! we use PROGRAM instead of LIBS so that the soname is not included + # in the typelib. This way the symbols will be resolved with the libgnome-shell +--- a/configure.ac ++++ b/configure.ac +@@ -91,8 +91,6 @@ + libcanberra libcanberra-gtk3 + telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION + polkit-agent-1 >= $POLKIT_MIN_VERSION +- libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION +- libnm-gtk >= $NETWORKMANAGER_MIN_VERSION + libsecret-unstable gcr-base-3 >= $GCR_MIN_VERSION" + + PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS) +@@ -162,6 +160,37 @@ + [Define if _NL_TIME_FIRST_WEEKDAY is available]) + fi + +AC_ARG_ENABLE(networkmanager, -+ AS_HELP_STRING([--disable-networkmanager], -+ [disable NetworkManager support @<:@default=auto@:>@]),, ++ AS_HELP_STRING([--disable-networkmanager], ++ [disable NetworkManager support @<:@default=auto@:>@]),, + [enable_networkmanager=auto]) + +if test "x$enable_networkmanager" != "xno"; then + PKG_CHECK_MODULES(NETWORKMANAGER, -+ [libnm-glib libnm-util gnome-keyring-1], ++ [libnm-glib ++ libnm-util >= $NETWORKMANAGER_MIN_VERSION ++ libnm-gtk >= $NETWORKMANAGER_MIN_VERSION], + [have_networkmanager=yes], + [have_networkmanager=no]) + @@ -66,10 +152,10 @@ + +AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes") + - PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0) + # Sets GLIB_GENMARSHAL and GLIB_MKENUMS + AM_PATH_GLIB_2_0() - PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0) -@@ -284,3 +317,15 @@ +@@ -203,3 +232,15 @@ man/Makefile ]) AC_OUTPUT @@ -77,141 +163,11 @@ +echo " +Build configuration: + -+ Prefix: ${prefix} -+ Source code location: ${srcdir} -+ Compiler: ${CC} -+ Compiler Warnings: $enable_compile_warnings ++ Prefix: ${prefix} ++ Source code location: ${srcdir} ++ Compiler: ${CC} ++ Compiler Warnings: $enable_compile_warnings + -+ Support for NetworkManager: $have_networkmanager -+ Support for GStreamer recording: $build_recorder ++ Support for NetworkManager: $have_networkmanager ++ Support for GStreamer recording: $build_recorder +" -Index: gnome-shell-3.4.1/js/Makefile.am -=================================================================== ---- gnome-shell-3.4.1.orig/js/Makefile.am 2012-03-01 17:19:56.000000000 +0100 -+++ gnome-shell-3.4.1/js/Makefile.am 2012-05-19 09:44:18.047666283 +0200 -@@ -8,6 +8,7 @@ - -e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \ - -e "s|[@]GJS_VERSION@|$(GJS_VERSION)|g" \ - -e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \ -+ -e "s|[@]HAVE_NETWORKMANAGER@|$(HAVE_NETWORKMANAGER)|g" \ - -e "s|[@]SHELL_SYSTEM_CA_FILE@|$(SHELL_SYSTEM_CA_FILE)|g" \ - -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \ - -e "s|[@]datadir@|$(datadir)|g" \ -Index: gnome-shell-3.4.1/js/misc/config.js.in -=================================================================== ---- gnome-shell-3.4.1.orig/js/misc/config.js.in 2012-05-19 04:09:20.958337829 +0200 -+++ gnome-shell-3.4.1/js/misc/config.js.in 2012-05-19 09:44:18.047666283 +0200 -@@ -8,6 +8,8 @@ - const GJS_VERSION = '@GJS_VERSION@'; - /* 1 if gnome-bluetooth is available, 0 otherwise */ - const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@; -+/* 1 if networkmanager is available, 0 otherwise */ -+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@; - /* The system TLS CA list */ - const SHELL_SYSTEM_CA_FILE = '@SHELL_SYSTEM_CA_FILE@'; - /* gettext package */ -Index: gnome-shell-3.4.1/js/ui/main.js -=================================================================== ---- gnome-shell-3.4.1.orig/js/ui/main.js 2012-05-19 04:09:20.958337829 +0200 -+++ gnome-shell-3.4.1/js/ui/main.js 2012-05-19 09:44:18.047666283 +0200 -@@ -12,6 +12,7 @@ - - const AutomountManager = imports.ui.automountManager; - const AutorunManager = imports.ui.autorunManager; -+const Config = imports.misc.config; - const CtrlAltTab = imports.ui.ctrlAltTab; - const EndSessionDialog = imports.ui.endSessionDialog; - const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent; -@@ -26,7 +27,7 @@ - const RunDialog = imports.ui.runDialog; - const Layout = imports.ui.layout; - const LookingGlass = imports.ui.lookingGlass; --const NetworkAgent = imports.ui.networkAgent; -+const NetworkAgent = Config.HAVE_NETWORKMANAGER ? imports.ui.networkAgent : null; - const NotificationDaemon = imports.ui.notificationDaemon; - const WindowAttentionHandler = imports.ui.windowAttentionHandler; - const Scripting = imports.ui.scripting; -@@ -85,7 +86,10 @@ - telepathyClient = new TelepathyClient.Client(); - automountManager = new AutomountManager.AutomountManager(); - autorunManager = new AutorunManager.AutorunManager(); -- networkAgent = new NetworkAgent.NetworkAgent(); -+ if (Config.HAVE_NETWORKMANAGER) { -+ networkAgent = new NetworkAgent.NetworkAgent(); -+ } -+ - } - - function _createGDMSession() { -Index: gnome-shell-3.4.1/js/ui/panel.js -=================================================================== ---- gnome-shell-3.4.1.orig/js/ui/panel.js 2012-05-19 04:09:20.958337829 +0200 -+++ gnome-shell-3.4.1/js/ui/panel.js 2012-05-19 09:44:18.047666283 +0200 -@@ -45,7 +45,8 @@ - STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator; - - try { -- STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet; -+ if (Config.HAVE_NETWORKMANAGER) -+ STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet; - } catch(e) { - log('NMApplet is not supported. It is possible that your NetworkManager version is too old'); - } -Index: gnome-shell-3.4.1/src/Makefile.am -=================================================================== ---- gnome-shell-3.4.1.orig/src/Makefile.am 2012-05-19 04:09:20.958337829 +0200 -+++ gnome-shell-3.4.1/src/Makefile.am 2012-05-19 09:44:18.051666283 +0200 -@@ -110,9 +110,7 @@ - shell-gtk-embed.h \ - shell-global.h \ - shell-idle-monitor.h \ -- shell-mobile-providers.h \ - shell-mount-operation.h \ -- shell-network-agent.h \ - shell-perf-log.h \ - shell-screenshot.h \ - shell-screen-grabber.h \ -@@ -134,6 +132,10 @@ - gactionobserver.h \ - gactionobserver.c - -+if HAVE_NETWORKMANAGER -+shell_public_headers_h += shell-mobile-providers.h shell-network-agent.h -+endif -+ - libgnome_shell_la_SOURCES = \ - $(shell_built_sources) \ - $(shell_public_headers_h) \ -@@ -159,9 +161,7 @@ - shell-idle-monitor.c \ - shell-keyring-prompt.h \ - shell-keyring-prompt.c \ -- shell-mobile-providers.c \ - shell-mount-operation.c \ -- shell-network-agent.c \ - shell-perf-log.c \ - shell-polkit-authentication-agent.h \ - shell-polkit-authentication-agent.c \ -@@ -181,6 +181,10 @@ - $(NULL) - - -+if HAVE_NETWORKMANAGER -+libgnome_shell_la_SOURCES += shell-mobile-providers.c shell-network-agent.c -+endif -+ - libgnome_shell_la_gir_sources = \ - $(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES)) - -@@ -296,7 +300,10 @@ - libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags) - - Shell-0.1.gir: libgnome-shell.la St-1.0.gir --Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 Folks-0.6 -+Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 Folks-0.6 -+if HAVE_NETWORKMANAGER -+Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0 -+endif - Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir) - Shell_0_1_gir_LIBS = libgnome-shell.la - Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources) --- gnome-shell-3.8.4/debian/patches/11-no-gettext.patch 2013-09-12 08:32:39.000000000 +1000 +++ gnome-shell-3.10.3/debian/patches/11-no-gettext.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,18 +0,0 @@ -From: Michael Biebl -Description: Don't mix intltool and gettext macros. -Forwarded: no - -diff --git a/configure.ac b/configure.ac -index 13cd42b..cd579e2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -26,9 +26,6 @@ LT_INIT([disable-static]) - # i18n - IT_PROG_INTLTOOL([0.40]) - --AM_GNU_GETTEXT([external]) --AM_GNU_GETTEXT_VERSION([0.17]) -- - GETTEXT_PACKAGE=gnome-shell - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", --- gnome-shell-3.8.4/debian/patches/27-nm-libexec-path.patch 2013-09-12 08:32:39.000000000 +1000 +++ gnome-shell-3.10.3/debian/patches/27-nm-libexec-path.patch 2013-12-29 11:48:09.000000000 +1100 @@ -4,7 +4,7 @@ --- a/js/ui/components/networkAgent.js +++ b/js/ui/components/networkAgent.js -@@ -673,7 +673,7 @@ +@@ -687,7 +687,7 @@ } catch(e) { } // ignore errors if key does not exist let path = binary; if (!GLib.path_is_absolute(path)) { --- gnome-shell-3.8.4/debian/patches/40_change-pam-name-to-match-gdm.patch 2013-09-12 08:32:39.000000000 +1000 +++ gnome-shell-3.10.3/debian/patches/40_change-pam-name-to-match-gdm.patch 2013-12-29 11:48:54.000000000 +1100 @@ -1,13 +1,11 @@ -diff --git a/js/gdm/util.js b/js/gdm/util.js -index 6b69f33..3c1bcac 100644 --- a/js/gdm/util.js +++ b/js/gdm/util.js -@@ -13,7 +13,7 @@ const Main = imports.ui.main; - const Params = imports.misc.params; +@@ -17,7 +17,7 @@ + const SmartcardManager = imports.misc.smartcardManager; const Tweener = imports.ui.tweener; -const PASSWORD_SERVICE_NAME = 'gdm-password'; +const PASSWORD_SERVICE_NAME = 'gdm3'; const FINGERPRINT_SERVICE_NAME = 'gdm-fingerprint'; - const FADE_ANIMATION_TIME = 0.16; - const CLONE_FADE_ANIMATION_TIME = 0.25; + const SMARTCARD_SERVICE_NAME = 'gdm-smartcard'; + const OVIRT_SERVICE_NAME = 'gdm-ovirtcred'; --- gnome-shell-3.8.4/debian/patches/git_background_schema.patch 2013-09-12 08:32:39.000000000 +1000 +++ gnome-shell-3.10.3/debian/patches/git_background_schema.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,57 +0,0 @@ -From 4413f816e6016e3759e7e0b2d8188ee62aa1ab6a Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -Date: Mon, 19 Aug 2013 22:48:56 +0000 -Subject: Background: allow passing the settings schema from outside - -This way it is possible to use different settings for different -backgrounds. - -https://bugzilla.gnome.org/show_bug.cgi?id=688210 ---- -diff --git a/js/ui/background.js b/js/ui/background.js -index 1d9ab7c..246060a 100644 ---- a/js/ui/background.js -+++ b/js/ui/background.js -@@ -295,14 +295,15 @@ const Background = new Lang.Class({ - _init: function(params) { - params = Params.parse(params, { monitorIndex: 0, - layoutManager: Main.layoutManager, -- effects: Meta.BackgroundEffects.NONE }); -+ effects: Meta.BackgroundEffects.NONE, -+ settings: null }); - this.actor = new Meta.BackgroundGroup(); - this.actor._delegate = this; - - this._destroySignalId = this.actor.connect('destroy', - Lang.bind(this, this._destroy)); - -- this._settings = new Gio.Settings({ schema: BACKGROUND_SCHEMA }); -+ this._settings = params.settings; - this._monitorIndex = params.monitorIndex; - this._layoutManager = params.layoutManager; - this._effects = params.effects; -@@ -716,8 +717,10 @@ const BackgroundManager = new Lang.Class({ - layoutManager: Main.layoutManager, - monitorIndex: null, - effects: Meta.BackgroundEffects.NONE, -- controlPosition: true }); -+ controlPosition: true, -+ settingsSchema: BACKGROUND_SCHEMA }); - -+ this._settings = new Gio.Settings({ schema: params.settingsSchema }); - this._container = params.container; - this._layoutManager = params.layoutManager; - this._effects = params.effects; -@@ -776,7 +779,8 @@ const BackgroundManager = new Lang.Class({ - _createBackground: function() { - let background = new Background({ monitorIndex: this._monitorIndex, - layoutManager: this._layoutManager, -- effects: this._effects }); -+ effects: this._effects, -+ settings: this._settings }); - this._container.add_child(background.actor); - - let monitor = this._layoutManager.monitors[this._monitorIndex]; --- -cgit v0.9.2 - --- gnome-shell-3.8.4/debian/patches/git_fix_calendar_wrapping.patch 2013-09-12 08:32:39.000000000 +1000 +++ gnome-shell-3.10.3/debian/patches/git_fix_calendar_wrapping.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,24 +0,0 @@ -From cb45a38838eb441d4d3184560263ace5cc79057b Mon Sep 17 00:00:00 2001 -From: Florian Müllner -Date: Tue, 09 Jul 2013 17:59:06 +0000 -Subject: calendar: Fix line-wrapping of calendar events - -Commit 929636ebd0b8f428 broke line-wrapping of longish calendar events, -add back the required CSS width. - -https://bugzilla.gnome.org/show_bug.cgi?id=703893 ---- ---- a/data/theme/gnome-shell.css -+++ b/data/theme/gnome-shell.css -@@ -1153,6 +1153,11 @@ - min-width: 320px; - } - -+#calendarArea { -+ /* this is the total width of the popup */ -+ max-width: 720px; -+} -+ - .calendar-vertical-separator { - -stipple-width: 1px; - -stipple-color: #505050; --- gnome-shell-3.8.4/debian/patches/git_fix_introspection.patch 2014-01-04 03:30:57.000000000 +1100 +++ gnome-shell-3.10.3/debian/patches/git_fix_introspection.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,34 +0,0 @@ -From 37512115901266ebc34288e437c25684e5298d2e Mon Sep 17 00:00:00 2001 -From: "Jasper St. Pierre" -Date: Wed, 9 Oct 2013 13:30:29 -0400 -Subject: [PATCH] shell-global: Fix introspection issues - -Remove stray bullet points, and don't actually mark for introspection -since it's private anyway (it starts with a _) ---- - src/shell-global.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/shell-global.c b/src/shell-global.c -index 8a753b1..4d91a2b 100644 ---- a/src/shell-global.c -+++ b/src/shell-global.c -@@ -496,12 +496,12 @@ shell_global_class_init (ShellGlobalClass *klass) - G_PARAM_READABLE)); - } - --/**• -- * _shell_global_init: (skip)• -+/* -+ * _shell_global_init: (skip) - * @first_property_name: the name of the first property - * @...: the value of the first property, followed optionally by more - * name/value pairs, followed by %NULL -- *• -+ * - * Initializes the shell global singleton with the construction-time - * properties. - * --- -1.8.5.2 - --- gnome-shell-3.8.4/debian/patches/git_gjs_api_change.patch 2013-09-12 08:32:39.000000000 +1000 +++ gnome-shell-3.10.3/debian/patches/git_gjs_api_change.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,30 +0,0 @@ -From 11d997c42bb265d29aec84b88ea9ecdd51a2dfe9 Mon Sep 17 00:00:00 2001 -From: Jasper St. Pierre -Date: Tue, 07 May 2013 18:35:27 +0000 -Subject: shell-js: Adapt to new gjs interface - ---- -diff --git a/src/shell-js.c b/src/shell-js.c -index 8267fdc..149dcd0 100644 ---- a/src/shell-js.c -+++ b/src/shell-js.c -@@ -54,14 +54,11 @@ shell_js_add_extension_importer (const char *target_object_script, - 0, - &target_object)) - { -- char *message; -- gjs_log_exception(context, -- &message); -+ gjs_log_exception(context); - g_set_error(error, - G_IO_ERROR, - G_IO_ERROR_FAILED, -- "%s", message ? message : "(unknown)"); -- g_free(message); -+ "Unable to import %s", target_object_script); - goto out; - } - --- -cgit v0.9.2 - --- gnome-shell-3.8.4/debian/patches/git_relock_screen_after_crash.patch 2013-09-12 08:32:39.000000000 +1000 +++ gnome-shell-3.10.3/debian/patches/git_relock_screen_after_crash.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,234 +0,0 @@ -From 90e0e3410b94c9b3221c881ea1af1e579249913e Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Thu, 17 Jan 2013 14:39:54 -0500 -Subject: [PATCH] Re-lock the screen if we're restarted from a previously crashed shell - -This way we "fail closed", which is better for security. - -See https://bugs.launchpad.net/ubuntu/+source/gdm/+bug/1064584 - -https://bugzilla.gnome.org/show_bug.cgi?id=691987 ---- - js/ui/main.js | 3 + - js/ui/screenShield.js | 13 ++++++ - src/shell-global.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++ - src/shell-global.h | 8 ++++ - 4 files changed, 124 insertions(+), 0 deletions(-) - -diff --git a/js/ui/main.js b/js/ui/main.js -index b4e4687..ea28848 100644 ---- a/js/ui/main.js -+++ b/js/ui/main.js -@@ -212,6 +212,9 @@ function _initializeUI() { - if (keybindingMode == Shell.KeyBindingMode.NONE) { - keybindingMode = Shell.KeyBindingMode.NORMAL; - } -+ if (screenShield) { -+ screenShield.lockIfWasLocked(); -+ } - }); - } - -diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js -index cfd55b9..0416670 100644 ---- a/js/ui/screenShield.js -+++ b/js/ui/screenShield.js -@@ -30,6 +30,7 @@ const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver'; - const LOCK_ENABLED_KEY = 'lock-enabled'; - const LOCK_DELAY_KEY = 'lock-delay'; - -+const LOCKED_STATE_STR = 'screenShield.locked'; - // fraction of screen height the arrow must reach before completing - // the slide up automatically - const ARROW_DRAG_THRESHOLD = 0.1; -@@ -1173,6 +1174,7 @@ const ScreenShield = new Lang.Class({ - this._isLocked = false; - this.emit('active-changed'); - this.emit('locked-changed'); -+ global.set_runtime_state(LOCKED_STATE_STR, null); - }, - - activate: function(animate) { -@@ -1189,6 +1191,7 @@ const ScreenShield = new Lang.Class({ - } - - this._resetLockScreen(animate, animate); -+ global.set_runtime_state(LOCKED_STATE_STR, GLib.Variant.new('b', true)); - - // We used to set isActive and emit active-changed here, - // but now we do that from lockScreenShown, which means -@@ -1215,5 +1218,15 @@ const ScreenShield = new Lang.Class({ - - this.emit('locked-changed'); - }, -+ -+ // If the previous shell crashed, and gnome-session restarted us, then re-lock -+ lockIfWasLocked: function() { -+ let wasLocked = global.get_runtime_state('b', LOCKED_STATE_STR); -+ if (wasLocked === null) -+ return; -+ Meta.later_add(Meta.LaterType.BEFORE_REDRAW, Lang.bind(this, function() { -+ this.lock(false); -+ })); -+ } - }); - Signals.addSignalMethods(ScreenShield.prototype); -diff --git a/src/shell-global.c b/src/shell-global.c -index 889e146..b8a3b42 100644 ---- a/src/shell-global.c -+++ b/src/shell-global.c -@@ -82,6 +82,8 @@ struct _ShellGlobal { - const char *userdatadir; - StFocusManager *focus_manager; - -+ GFile *runtime_state_path; -+ - guint work_count; - GSList *leisure_closures; - guint leisure_function_id; -@@ -236,6 +238,8 @@ shell_global_init (ShellGlobal *global) - const char *datadir = g_getenv ("GNOME_SHELL_DATADIR"); - const char *shell_js = g_getenv("GNOME_SHELL_JS"); - char *imagedir, **search_path; -+ char *path; -+ const char *byteorder_string; - - if (!datadir) - datadir = GNOME_SHELL_DATADIR; -@@ -258,6 +262,20 @@ shell_global_init (ShellGlobal *global) - global->userdatadir = g_build_filename (g_get_user_data_dir (), "gnome-shell", NULL); - g_mkdir_with_parents (global->userdatadir, 0700); - -+#if G_BYTE_ORDER == G_LITTLE_ENDIAN -+ byteorder_string = "LE"; -+#else -+ byteorder_string = "BE"; -+#endif -+ -+ /* And the runtime state */ -+ path = g_strdup_printf ("%s/gnome-shell/runtime-state-%s.%s", -+ g_get_user_runtime_dir (), -+ byteorder_string, -+ XDisplayName (NULL)); -+ (void) g_mkdir_with_parents (path, 0700); -+ global->runtime_state_path = g_file_new_for_path (path); -+ - global->settings = g_settings_new ("org.gnome.shell"); - - global->grab_notifier = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL)); -@@ -299,6 +317,8 @@ shell_global_finalize (GObject *object) - - the_object = NULL; - -+ g_clear_object (&global->runtime_state_path); -+ - G_OBJECT_CLASS(shell_global_parent_class)->finalize (object); - } - -@@ -1779,3 +1799,83 @@ shell_global_get_session_mode (ShellGlobal *global) - - return global->session_mode; - } -+ -+static GFile * -+get_runtime_state_path (ShellGlobal *global, -+ const char *property_name) -+{ -+ return g_file_get_child (global->runtime_state_path, property_name); -+} -+ -+/** -+ * shell_global_set_runtime_state: -+ * @global: a #ShellGlobal -+ * @property_name: Name of the property -+ * @variant: (allow-none): A #GVariant, or %NULL to unset -+ * -+ * Change the value of serialized runtime state. -+ */ -+void -+shell_global_set_runtime_state (ShellGlobal *global, -+ const char *property_name, -+ GVariant *variant) -+{ -+ GFile *path; -+ -+ path = get_runtime_state_path (global, property_name); -+ -+ if (variant == NULL) -+ (void) g_file_delete (path, NULL, NULL); -+ else -+ { -+ gsize size = g_variant_get_size (variant); -+ g_file_replace_contents (path, g_variant_get_data (variant), size, -+ NULL, FALSE, G_FILE_CREATE_REPLACE_DESTINATION, -+ NULL, NULL, NULL); -+ } -+} -+ -+/** -+ * shell_global_get_runtime_state: -+ * @global: a #ShellGlobal -+ * @property_type: Expected data type -+ * @property_name: Name of the property -+ * -+ * The shell maintains "runtime" state which does not persist across -+ * logout or reboot. -+ * -+ * Returns: The value of a serialized property, or %NULL if none stored -+ */ -+GVariant * -+shell_global_get_runtime_state (ShellGlobal *global, -+ const char *property_type, -+ const char *property_name) -+{ -+ GVariant *res = NULL; -+ GMappedFile *mfile; -+ GFile *path; -+ char *pathstr; -+ GError *local_error = NULL; -+ -+ path = get_runtime_state_path (global, property_name); -+ pathstr = g_file_get_path (path); -+ mfile = g_mapped_file_new (pathstr, FALSE, &local_error); -+ if (!mfile) -+ { -+ if (!g_error_matches (local_error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) -+ { -+ g_warning ("Failed to open runtime state: %s", local_error->message); -+ } -+ g_clear_error (&local_error); -+ } -+ else -+ { -+ GBytes *bytes = g_mapped_file_get_bytes (mfile); -+ res = g_variant_new_from_bytes ((GVariantType*)property_type, bytes, TRUE); -+ g_bytes_unref (bytes); -+ g_mapped_file_unref (mfile); -+ } -+ -+ out: -+ return res; -+} -diff --git a/src/shell-global.h b/src/shell-global.h -index a8df0f5..1be447c 100644 ---- a/src/shell-global.h -+++ b/src/shell-global.h -@@ -150,6 +150,14 @@ void shell_global_reexec_self (ShellGlobal *global); - - const char * shell_global_get_session_mode (ShellGlobal *global); - -+void shell_global_set_runtime_state (ShellGlobal *global, -+ const char *property_name, -+ GVariant *variant); -+GVariant * shell_global_get_runtime_state (ShellGlobal *global, -+ const char *property_type, -+ const char *property_name); -+ -+ - G_END_DECLS - - #endif /* __SHELL_GLOBAL_H__ */ --- -1.7.1 - - --- gnome-shell-3.8.4/debian/patches/git_use_screensaver_bg.patch 2013-09-12 08:32:39.000000000 +1000 +++ gnome-shell-3.10.3/debian/patches/git_use_screensaver_bg.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,27 +0,0 @@ -From fdc08325065d464ea05e669d6f2a4889fe0b1d58 Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -Date: Mon, 19 Aug 2013 22:51:34 +0000 -Subject: ScreenShield: use the screensaver background - -Now that that's configurable in the control center, we should -use the appropriate background here. - -https://bugzilla.gnome.org/show_bug.cgi?id=688210 ---- -diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js -index f375735..942f3eb 100644 ---- a/js/ui/screenShield.js -+++ b/js/ui/screenShield.js -@@ -599,7 +599,8 @@ const ScreenShield = new Lang.Class({ - - let bgManager = new Background.BackgroundManager({ container: widget, - monitorIndex: monitorIndex, -- controlPosition: false }); -+ controlPosition: false, -+ settingsSchema: SCREENSAVER_SCHEMA }); - - this._bgManagers.push(bgManager); - --- -cgit v0.9.2 - --- gnome-shell-3.8.4/debian/patches/revert_new_bluetooth.patch 1970-01-01 10:00:00.000000000 +1000 +++ gnome-shell-3.10.3/debian/patches/revert_new_bluetooth.patch 2013-07-17 09:02:44.000000000 +1000 @@ -0,0 +1,114 @@ +From cc8424314ab4822db15cd269e8ec2291bb9eedb5 Mon Sep 17 00:00:00 2001 +From: Tim Lunn +Date: Wed, 17 Jul 2013 09:01:08 +1000 +Subject: [PATCH] Revert "bluetooth: Port to BlueZ 5" + +This reverts commit dd74ea99a70fb0c4615b448670a4a1d0b843eab4. + +Revert "configure: Bump gnome-bluetooth requirement" + +This reverts commit c7fb65c78e48ed6f687008684a25cceefafb3992. +--- + configure.ac | 2 +- + js/ui/status/bluetooth.js | 44 +++++--------------------------------------- + 2 files changed, 6 insertions(+), 40 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3d4915d..2ba51d7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -109,7 +109,7 @@ PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 3.7.4) + PKG_CHECK_MODULES(CARIBOU, caribou-1.0 >= 0.4.8) + + AC_MSG_CHECKING([for bluetooth support]) +-PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.9.0], ++PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], + [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0` + BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0` + AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"]) +diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js +index bcc853b..f4610c7 100644 +--- a/js/ui/status/bluetooth.js ++++ b/js/ui/status/bluetooth.js +@@ -86,7 +86,6 @@ const Indicator = new Lang.Class({ + this._applet.connect('pincode-request', Lang.bind(this, this._pinRequest)); + this._applet.connect('confirm-request', Lang.bind(this, this._confirmRequest)); + this._applet.connect('auth-request', Lang.bind(this, this._authRequest)); +- this._applet.connect('auth-service-request', Lang.bind(this, this._authServiceRequest)); + this._applet.connect('cancel-request', Lang.bind(this, this._cancelRequest)); + }, + +@@ -293,14 +292,9 @@ const Indicator = new Lang.Class({ + } + }, + +- _authRequest: function(applet, device_path, name, long_name) { ++ _authRequest: function(applet, device_path, name, long_name, uuid) { + this._ensureSource(); +- this._source.notify(new AuthNotification(this._source, this._applet, device_path, name, long_name)); +- }, +- +- _authServiceRequest: function(applet, device_path, name, long_name, uuid) { +- this._ensureSource(); +- this._source.notify(new AuthServiceNotification(this._source, this._applet, device_path, name, long_name, uuid)); ++ this._source.notify(new AuthNotification(this._source, this._applet, device_path, name, long_name, uuid)); + }, + + _confirmRequest: function(applet, device_path, name, long_name, pin) { +@@ -322,34 +316,6 @@ const AuthNotification = new Lang.Class({ + Name: 'AuthNotification', + Extends: MessageTray.Notification, + +- _init: function(source, applet, device_path, name, long_name) { +- this.parent(source, +- _("Bluetooth"), +- _("Authorization request from %s").format(name), +- { customContent: true }); +- this.setResident(true); +- +- this._applet = applet; +- this._devicePath = device_path; +- this.addBody(_("Device %s wants to pair with this computer").format(long_name)); +- +- this.addButton('allow', _("Allow")); +- this.addButton('deny', _("Deny")); +- +- this.connect('action-invoked', Lang.bind(this, function(self, action) { +- if (action == 'allow') +- this._applet.agent_reply_confirm(this._devicePath, true); +- else +- this._applet.agent_reply_confirm(this._devicePath, false); +- this.destroy(); +- })); +- } +-}); +- +-const AuthServiceNotification = new Lang.Class({ +- Name: 'AuthServiceNotification', +- Extends: MessageTray.Notification, +- + _init: function(source, applet, device_path, name, long_name, uuid) { + this.parent(source, + _("Bluetooth"), +@@ -368,14 +334,14 @@ const AuthServiceNotification = new Lang.Class({ + this.connect('action-invoked', Lang.bind(this, function(self, action) { + switch (action) { + case 'always-grant': +- this._applet.agent_reply_auth_service(this._devicePath, true, true); ++ this._applet.agent_reply_auth(this._devicePath, true, true); + break; + case 'grant': +- this._applet.agent_reply_auth_service(this._devicePath, true, false); ++ this._applet.agent_reply_auth(this._devicePath, true, false); + break; + case 'reject': + default: +- this._applet.agent_reply_auth_service(this._devicePath, false, false); ++ this._applet.agent_reply_auth(this._devicePath, false, false); + } + this.destroy(); + })); +-- +1.8.3.2 + + --- gnome-shell-3.8.4/debian/patches/revert_new_brightness_widget.patch 1970-01-01 10:00:00.000000000 +1000 +++ gnome-shell-3.10.3/debian/patches/revert_new_brightness_widget.patch 2013-12-29 12:01:55.000000000 +1100 @@ -0,0 +1,123 @@ +From b02d5270f0e8d6e7ab22666fade5f5818e1b10f1 Mon Sep 17 00:00:00 2001 +From: Tim Lunn +Date: Sat, 21 Dec 2013 09:11:24 +1100 +Subject: [PATCH] Revert "status: Add new brightness slider widget" + +This reverts commit cb09ae5cc0fc377550d8e9d123db60ea6a2aee14. +--- + js/Makefile.am | 1 - + js/ui/panel.js | 2 -- + js/ui/status/brightness.js | 68 ---------------------------------------------- + 3 files changed, 71 deletions(-) + delete mode 100644 js/ui/status/brightness.js + +diff --git a/js/Makefile.am b/js/Makefile.am +index d614f4f..5441bd2 100644 +--- a/js/Makefile.am ++++ b/js/Makefile.am +@@ -93,7 +93,6 @@ nobase_dist_js_DATA = \ + ui/searchDisplay.js \ + ui/shellDBus.js \ + ui/status/accessibility.js \ +- ui/status/brightness.js \ + ui/status/keyboard.js \ + ui/status/network.js \ + ui/status/power.js \ +diff --git a/js/ui/panel.js b/js/ui/panel.js +index 2337a63..bec17f5 100644 +--- a/js/ui/panel.js ++++ b/js/ui/panel.js +@@ -819,7 +819,6 @@ const AggregateMenu = new Lang.Class({ + this._power = new imports.ui.status.power.Indicator(); + this._rfkill = new imports.ui.status.rfkill.Indicator(); + this._volume = new imports.ui.status.volume.Indicator(); +- this._brightness = new imports.ui.status.brightness.Indicator(); + this._system = new imports.ui.status.system.Indicator(); + this._screencast = new imports.ui.status.screencast.Indicator(); + +@@ -834,7 +833,6 @@ const AggregateMenu = new Lang.Class({ + this._indicators.add_child(PopupMenu.unicodeArrow(St.Side.BOTTOM)); + + this.menu.addMenuItem(this._volume.menu); +- this.menu.addMenuItem(this._brightness.menu); + this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); + this.menu.addMenuItem(this._network.menu); + if (this._bluetooth) { +diff --git a/js/ui/status/brightness.js b/js/ui/status/brightness.js +deleted file mode 100644 +index bd76972..0000000 +--- a/js/ui/status/brightness.js ++++ /dev/null +@@ -1,68 +0,0 @@ +-// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- +- +-const Lang = imports.lang; +-const Gio = imports.gi.Gio; +-const St = imports.gi.St; +- +-const PanelMenu = imports.ui.panelMenu; +-const PopupMenu = imports.ui.popupMenu; +-const Slider = imports.ui.slider; +- +-const BUS_NAME = 'org.gnome.SettingsDaemon.Power'; +-const OBJECT_PATH = '/org/gnome/SettingsDaemon/Power'; +- +-const BrightnessInterface = +- +-; +- +-const BrightnessProxy = Gio.DBusProxy.makeProxyWrapper(BrightnessInterface); +- +-const Indicator = new Lang.Class({ +- Name: 'BrightnessIndicator', +- Extends: PanelMenu.SystemIndicator, +- +- _init: function() { +- this.parent('display-brightness-symbolic'); +- this._proxy = new BrightnessProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH, +- Lang.bind(this, function(proxy, error) { +- if (error) { +- log(error.message); +- return; +- } +- +- this._proxy.connect('g-properties-changed', Lang.bind(this, this._sync)); +- this._sync(); +- })); +- +- this._item = new PopupMenu.PopupBaseMenuItem({ activate: false }); +- this.menu.addMenuItem(this._item); +- +- this._slider = new Slider.Slider(0); +- this._slider.connect('value-changed', Lang.bind(this, this._sliderChanged)); +- this._slider.actor.accessible_name = _("Brightness"); +- +- let icon = new St.Icon({ icon_name: 'display-brightness-symbolic', +- style_class: 'popup-menu-icon' }); +- this._item.actor.add(icon); +- this._item.actor.add(this._slider.actor, { expand: true }); +- this._item.actor.connect('button-press-event', Lang.bind(this, function(actor, event) { +- this._slider.startDragging(event); +- })); +- this._item.actor.connect('key-press-event', Lang.bind(this, function(actor, event) { +- return this._slider.onKeyPressEvent(actor, event); +- })); +- +- }, +- +- _sliderChanged: function(slider, value) { +- let percent = value * 100; +- this._proxy.Brightness = percent; +- }, +- +- _sync: function() { +- let visible = this._proxy.Brightness >= 0; +- this._item.actor.visible = visible; +- if (visible) +- this._slider.setValue(this._proxy.Brightness / 100.0); +- }, +-}); +-- +1.8.5.2 + + --- gnome-shell-3.8.4/debian/patches/revert-notification-settings-link.patch 2013-09-12 08:32:39.000000000 +1000 +++ gnome-shell-3.10.3/debian/patches/revert-notification-settings-link.patch 2013-10-22 16:48:52.000000000 +1100 @@ -1,8 +1,6 @@ -Index: gnome-shell-3.8.3/js/ui/messageTray.js -=================================================================== ---- gnome-shell-3.8.3.orig/js/ui/messageTray.js 2013-06-07 15:45:07.000000000 -0400 -+++ gnome-shell-3.8.3/js/ui/messageTray.js 2013-06-16 13:06:51.641459242 -0400 -@@ -1521,12 +1521,6 @@ +--- a/js/ui/messageTray.js ++++ b/js/ui/messageTray.js +@@ -1676,12 +1676,6 @@ tray.connect('source-added', Lang.bind(this, this._updateClearSensitivity)); tray.connect('source-removed', Lang.bind(this, this._updateClearSensitivity)); this._updateClearSensitivity(); @@ -14,4 +12,4 @@ - settingsItem.connect('activate', function() { tray.close(); }); }, - _updateClearSensitivity: function() { + _onStatusChanged: function(status) { --- gnome-shell-3.8.4/debian/patches/revert-shelldbus-export-timestamps.patch 1970-01-01 10:00:00.000000000 +1000 +++ gnome-shell-3.10.3/debian/patches/revert-shelldbus-export-timestamps.patch 2014-01-06 07:44:36.000000000 +1100 @@ -0,0 +1,56 @@ +From 7cff99c5ada332a1504992114c5e4d760aed44ef Mon Sep 17 00:00:00 2001 +From: Tim Lunn +Date: Mon, 6 Jan 2014 07:40:13 +1100 +Subject: [PATCH] Revert "shellDBus: Export the timestamp of shortcuts through + D-Bus" + +This reverts commit db497a2ecfccc8ad9284353826f32fc75ca78ecd. +--- + js/ui/shellDBus.js | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js +index c56692f..ef09639 100644 +--- a/js/ui/shellDBus.js ++++ b/js/ui/shellDBus.js +@@ -45,7 +45,6 @@ const GnomeShellIface = + + + +- + + + +@@ -83,8 +82,8 @@ const GnomeShell = new Lang.Class({ + this._grabbers = new Hash.Map(); + + global.display.connect('accelerator-activated', Lang.bind(this, +- function(display, action, deviceid, timestamp) { +- this._emitAcceleratorActivated(action, deviceid, timestamp); ++ function(display, action, deviceid) { ++ this._emitAcceleratorActivated(action, deviceid); + })); + }, + +@@ -179,7 +178,7 @@ const GnomeShell = new Lang.Class({ + return invocation.return_value(GLib.Variant.new('(b)', [ungrabSucceeded])); + }, + +- _emitAcceleratorActivated: function(action, deviceid, timestamp) { ++ _emitAcceleratorActivated: function(action, deviceid) { + let destination = this._grabbedAccelerators.get(action); + if (!destination) + return; +@@ -190,7 +189,7 @@ const GnomeShell = new Lang.Class({ + this._dbusImpl.get_object_path(), + info ? info.name : null, + 'AcceleratorActivated', +- GLib.Variant.new('(uuu)', [action, deviceid, timestamp])); ++ GLib.Variant.new('(uu)', [action, deviceid])); + }, + + _grabAcceleratorForSender: function(accelerator, flags, sender) { +-- +1.8.5.2 + + --- gnome-shell-3.8.4/debian/patches/revert-suspend-break.patch 2013-09-12 08:32:39.000000000 +1000 +++ gnome-shell-3.10.3/debian/patches/revert-suspend-break.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,106 +0,0 @@ -From 23a65607b011582e11be1ed4be5c309da14bf4d6 Mon Sep 17 00:00:00 2001 -From: Simon McVittie -Date: Sun, 21 Apr 2013 12:42:31 +0100 -Subject: [PATCH] Reinstate support for suspending via UPower - -Debian's logind is currently too old to know how to suspend -(Debian #704272). - -Also delay suspend by 1 second, in the hope that this will avoid showing -the old screen contents after resume (Debian #645716). With a newer -logind, inhibiting suspend will fix this properly. - -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704272 ---- - js/misc/loginManager.js | 33 +++++++++++++++++++++++++-------- - 1 file changed, 25 insertions(+), 8 deletions(-) - -diff --git a/js/misc/loginManager.js b/js/misc/loginManager.js -index ce4af41..280e478 100644 ---- a/js/misc/loginManager.js -+++ b/js/misc/loginManager.js -@@ -5,6 +5,7 @@ const Gio = imports.gi.Gio; - const Lang = imports.lang; - const Mainloop = imports.mainloop; - const Shell = imports.gi.Shell; -+const UPowerGlib = imports.gi.UPowerGlib; - const Signals = imports.signals; - - const SystemdLoginManagerIface = -@@ -135,6 +136,7 @@ const LoginManagerSystemd = new Lang.Class({ - '/org/freedesktop/login1'); - this._proxy.connectSignal('PrepareForSleep', - Lang.bind(this, this._prepareForSleep)); -+ this._upClient = new UPowerGlib.Client(); - }, - - // Having this function is a bit of a hack since the Systemd and ConsoleKit -@@ -178,12 +180,10 @@ const LoginManagerSystemd = new Lang.Class({ - }, - - canSuspend: function(asyncCallback) { -- this._proxy.CanSuspendRemote(function(result, error) { -- if (error) -- asyncCallback(false); -- else -- asyncCallback(result[0] != 'no'); -- }); -+ Mainloop.idle_add(Lang.bind(this, function() { -+ asyncCallback(this._upClient.get_can_suspend()); -+ return false; -+ })); - }, - - listSessions: function(asyncCallback) { -@@ -204,7 +204,14 @@ const LoginManagerSystemd = new Lang.Class({ - }, - - suspend: function() { -- this._proxy.SuspendRemote(true); -+ this.emit('prepare-for-sleep', true); -+ this.emit('prepare-for-sleep', false); -+ // hack: wait 1 second, by which time the screen will hopefully -+ // have finished locking -+ Mainloop.timeout_add(1000, Lang.bind(this, function() { -+ this._upClient.suspend_sync(null); -+ return false; -+ })); - }, - - inhibit: function(reason, callback) { -@@ -240,6 +247,7 @@ const LoginManagerConsoleKit = new Lang.Class({ - this._proxy = new ConsoleKitManager(Gio.DBus.system, - 'org.freedesktop.ConsoleKit', - '/org/freedesktop/ConsoleKit/Manager'); -+ this._upClient = new UPowerGlib.Client(); - }, - - // Having this function is a bit of a hack since the Systemd and ConsoleKit -@@ -283,7 +291,10 @@ const LoginManagerConsoleKit = new Lang.Class({ - }, - - canSuspend: function(asyncCallback) { -- asyncCallback(false); -+ Mainloop.idle_add(Lang.bind(this, function() { -+ asyncCallback(this._upClient.get_can_suspend()); -+ return false; -+ })); - }, - - listSessions: function(asyncCallback) { -@@ -301,6 +312,12 @@ const LoginManagerConsoleKit = new Lang.Class({ - suspend: function() { - this.emit('prepare-for-sleep', true); - this.emit('prepare-for-sleep', false); -+ // hack: wait 1 second, by which time the screen will hopefully -+ // have finished locking -+ Mainloop.timeout_add(1000, Lang.bind(this, function() { -+ this._upClient.suspend_sync(null); -+ return false; -+ })); - }, - - inhibit: function(reason, callback) { --- -1.7.10.4 - --- gnome-shell-3.8.4/debian/patches/series 2014-01-04 03:31:05.000000000 +1100 +++ gnome-shell-3.10.3/debian/patches/series 2014-01-17 06:53:30.000000000 +1100 @@ -1,14 +1,9 @@ -11-no-gettext.patch 27-nm-libexec-path.patch #40_change-pam-name-to-match-gdm.patch -#revert-suspend-break.patch ubuntu-lightdm-user-switching.patch -#ubuntu_lock_on_suspend.patch -git_relock_screen_after_crash.patch +ubuntu_lock_on_suspend.patch revert-notification-settings-link.patch +revert_new_bluetooth.patch revert-disable-periodic-gc.patch -git_gjs_api_change.patch -git_fix_calendar_wrapping.patch -git_background_schema.patch -git_use_screensaver_bg.patch -git_fix_introspection.patch +revert_new_brightness_widget.patch +revert-shelldbus-export-timestamps.patch --- gnome-shell-3.8.4/debian/patches/ubuntu-lightdm-user-switching.patch 2013-09-12 08:32:39.000000000 +1000 +++ gnome-shell-3.10.3/debian/patches/ubuntu-lightdm-user-switching.patch 2014-01-17 06:12:24.000000000 +1100 @@ -9,43 +9,50 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685794 --- - js/ui/userMenu.js | 19 ++++++++++++++++++- - 1 file changed, 18 insertions(+), 1 deletion(-) + js/ui/status/system.js | 29 +++++++++++++++++++++++------ + 1 file changed, 23 insertions(+), 6 deletions(-) ---- a/js/ui/userMenu.js -+++ b/js/ui/userMenu.js -@@ -865,9 +865,11 @@ +--- a/js/ui/status/system.js ++++ b/js/ui/status/system.js +@@ -379,13 +379,15 @@ _onLoginScreenActivate: function() { - this.menu.close(BoxPointer.PopupAnimation.NONE); + this.menu.itemActivated(BoxPointer.PopupAnimation.NONE); Main.overview.hide(); - if (Main.screenShield) + if (Main.screenShield) { Main.screenShield.lock(false); -- Gdm.goto_login_session_sync(null); -+ Gdm.goto_login_session_sync(null); -+ } else +- +- Clutter.threads_add_repaint_func_full(Clutter.RepaintFlags.POST_PAINT, function() { +- Gdm.goto_login_session_sync(null); +- return false; +- }); ++ Clutter.threads_add_repaint_func_full(Clutter.RepaintFlags.POST_PAINT, function() { ++ Gdm.goto_login_session_sync(null); ++ return false; ++ }); ++ } ++ else + this._lightdmLoginSession(); }, _onQuitSessionActivate: function() { -@@ -994,5 +996,20 @@ - this.menu.close(BoxPointer.PopupAnimation.NONE); - this._loginManager.suspend(); - } -+ }, +@@ -403,4 +405,19 @@ + this.menu.itemActivated(); + this._loginManager.suspend(); + }, + + _lightdmLoginSession: function() { + try { + let seat = GLib.getenv("XDG_SEAT_PATH"); + let result = Gio.DBus.system.call_sync('org.freedesktop.DisplayManager', -+ seat, -+ 'org.freedesktop.DisplayManager.Seat', -+ 'SwitchToGreeter', null, null, -+ Gio.DBusCallFlags.NONE, -+ -1, null); ++ seat, ++ 'org.freedesktop.DisplayManager.Seat', ++ 'SwitchToGreeter', null, null, ++ Gio.DBusCallFlags.NONE, ++ -1, null); + return result; + } catch(e) { + return false; + } - } ++ } }); --- gnome-shell-3.8.4/debian/patches/ubuntu_lock_on_suspend.patch 2013-09-12 08:32:39.000000000 +1000 +++ gnome-shell-3.10.3/debian/patches/ubuntu_lock_on_suspend.patch 2014-01-17 06:12:24.000000000 +1100 @@ -3,24 +3,26 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/1063110 --- -Index: gnome-shell-3.6.2/js/ui/userMenu.js -=================================================================== ---- gnome-shell-3.6.2.orig/js/ui/userMenu.js 2012-11-12 23:04:02.000000000 -0500 -+++ gnome-shell-3.6.2/js/ui/userMenu.js 2012-11-12 23:04:51.124430737 -0500 -@@ -28,6 +28,7 @@ - const DISABLE_LOG_OUT_KEY = 'disable-log-out'; +--- + js/ui/screenShield.js | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/js/ui/screenShield.js ++++ b/js/ui/screenShield.js +@@ -33,6 +33,7 @@ + const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver'; const LOCK_ENABLED_KEY = 'lock-enabled'; - const ALWAYS_SHOW_LOG_OUT_KEY = 'always-show-log-out'; + const LOCK_DELAY_KEY = 'lock-delay'; +const SUSPEND_LOCK_ENABLED_KEY = 'ubuntu-lock-on-suspend'; - const DIALOG_ICON_SIZE = 64; - -@@ -855,7 +856,7 @@ - this._suspendOrPowerOffItem.state == PopupMenu.PopupAlternatingMenuItemState.DEFAULT) { - this._session.ShutdownRemote(); - } else { -- if (this._screenSaverSettings.get_boolean(LOCK_ENABLED_KEY)) { -+ if (this._screenSaverSettings.get_boolean(SUSPEND_LOCK_ENABLED_KEY)) { - let tmpId = Main.screenShield.connect('lock-screen-shown', Lang.bind(this, function() { - Main.screenShield.disconnect(tmpId); + const LOCKED_STATE_STR = 'screenShield.locked'; + // fraction of screen height the arrow must reach before completing +@@ -725,7 +726,7 @@ + this._aboutToSuspend = aboutToSuspend; + if (aboutToSuspend) { +- if (!this._settings.get_boolean(LOCK_ENABLED_KEY)) { ++ if (!this._settings.get_boolean(SUSPEND_LOCK_ENABLED_KEY)) { + this._uninhibitSuspend(); + return; + } --- gnome-shell-3.8.4/debian/rules 2013-09-12 08:32:39.000000000 +1000 +++ gnome-shell-3.10.3/debian/rules 2013-12-29 11:50:31.000000000 +1100 @@ -6,21 +6,25 @@ include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/gnome.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 ifeq ($(shell dpkg-vendor --query vendor),Ubuntu) DEB_DH_GENCONTROL_ARGS += -- -Vicon-theme:Depends=gnome-icon-theme-full endif -$(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) :: - dh_girepository -p$(cdbs_curpkg) -l src:src/gvc -p /usr/lib/mutter \ - /usr/lib/gnome-shell - find debian/$(cdbs_curpkg) -name '*.la' -exec rm -f '{}' ';' - DEB_CONFIGURE_EXTRA_FLAGS += --enable-compile-warnings=yes +ifeq ($(DEB_HOST_ARCH_OS),linux) + DEB_CONFIGURE_EXTRA_FLAGS += --enable-networkmanager +endif + DEB_DH_MAKESHLIBS_ARGS_gnome-shell = -Xlibgnome-shell DEB_SHLIBDEPS_INCLUDE = /usr/lib/gnome-bluetooth +$(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) :: + dh_girepository -p$(cdbs_curpkg) -l src:src/gvc -p /usr/lib/mutter \ + /usr/lib/gnome-shell + find debian/$(cdbs_curpkg) -name '*.la' -exec rm -f '{}' ';' + # List any files which are not installed common-binary-post-install-arch:: list-missing