r39820 - in /desktop/experimental/gnome-shell/debian: ./ patches/
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sun Oct 13 20:30:18 UTC 2013
Author: sjoerd
Date: Sun Oct 13 20:30:17 2013
New Revision: 39820
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39820
Log:
* 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
Removed:
desktop/experimental/gnome-shell/debian/patches/11-no-gettext.patch
desktop/experimental/gnome-shell/debian/patches/git_relock_screen_after_crash.patch
desktop/experimental/gnome-shell/debian/patches/revert-suspend-break.patch
Modified:
desktop/experimental/gnome-shell/debian/changelog
desktop/experimental/gnome-shell/debian/control
desktop/experimental/gnome-shell/debian/control.in
desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch
desktop/experimental/gnome-shell/debian/patches/27-nm-libexec-path.patch
desktop/experimental/gnome-shell/debian/patches/40_change-pam-name-to-match-gdm.patch
desktop/experimental/gnome-shell/debian/patches/series
Modified: desktop/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/changelog?rev=39820&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/changelog [utf-8] Sun Oct 13 20:30:17 2013
@@ -1,3 +1,21 @@
+gnome-shell (3.10.0.1-1) UNRELEASED; urgency=low
+
+ * 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
+
+ -- Sjoerd Simons <sjoerd at debian.org> Sun, 13 Oct 2013 22:29:20 +0200
+
gnome-shell (3.8.4-4) unstable; urgency=low
[ Petr Salinger ]
Modified: desktop/experimental/gnome-shell/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/control?rev=39820&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/control [utf-8] Sun Oct 13 20:30:17 2013
@@ -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,
@@ -30,30 +30,32 @@
libedataserver1.2-dev (>= 3.7.90),
libgcr-3-dev (>= 3.7.5),
libgirepository1.0-dev (>= 1.29.15),
- libgjs-dev (>= 1.35.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),
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.0),
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),
libsecret-1-dev,
libstartup-notification0-dev (>= 0.11),
+ libsystemd-login-dev,
+ libsystemd-daemon-dev,
libtelepathy-glib-dev (>= 0.17.5),
libx11-dev,
libxfixes-dev,
libxml2-dev,
python (>= 2.6)
Standards-Version: 3.9.4
-Homepage: https://wiki.gnome.org/GnomeShell
+Homepage: http://live.gnome.org/GnomeShell
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/
@@ -66,31 +68,32 @@
evolution-data-server (>= 3.7.90),
gdm3 (>= 3.5.90),
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.5.2),
- gir1.2-mutter-3.0 (>= 3.8.3),
+ gir1.2-mutter-3.0 (>= 3.10.0),
gir1.2-networkmanager-1.0 [linux-any],
- gir1.2-nmgtk-1.0 [linux-any],
+ 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),
gir1.2-telepathyglib-0.12,
gir1.2-telepathylogger-0.2 (>= 0.8.0),
gir1.2-upowerglib-1.0,
- gjs (>= 1.35.4),
+ gjs (>= 1.37.4),
gnome-icon-theme-symbolic (>= 2.91),
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,
Recommends: gkbd-capplet,
Modified: desktop/experimental/gnome-shell/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/control.in?rev=39820&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/control.in [utf-8] Sun Oct 13 20:30:17 2013
@@ -11,7 +11,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,
@@ -25,30 +25,32 @@
libedataserver1.2-dev (>= 3.7.90),
libgcr-3-dev (>= 3.7.5),
libgirepository1.0-dev (>= 1.29.15),
- libgjs-dev (>= 1.35.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),
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.0),
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),
libsecret-1-dev,
libstartup-notification0-dev (>= 0.11),
+ libsystemd-login-dev,
+ libsystemd-daemon-dev,
libtelepathy-glib-dev (>= 0.17.5),
libx11-dev,
libxfixes-dev,
libxml2-dev,
python (>= 2.6)
Standards-Version: 3.9.4
-Homepage: https://wiki.gnome.org/GnomeShell
+Homepage: http://live.gnome.org/GnomeShell
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/
@@ -61,31 +63,32 @@
evolution-data-server (>= 3.7.90),
gdm3 (>= 3.5.90),
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.5.2),
- gir1.2-mutter-3.0 (>= 3.8.3),
+ gir1.2-mutter-3.0 (>= 3.10.0),
gir1.2-networkmanager-1.0 [linux-any],
- gir1.2-nmgtk-1.0 [linux-any],
+ 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),
gir1.2-telepathyglib-0.12,
gir1.2-telepathylogger-0.2 (>= 0.8.0),
gir1.2-upowerglib-1.0,
- gjs (>= 1.35.4),
+ gjs (>= 1.37.4),
gnome-icon-theme-symbolic (>= 2.91),
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,
Recommends: gkbd-capplet,
Modified: desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch?rev=39820&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch [utf-8] Sun Oct 13 20:30:17 2013
@@ -31,25 +31,17 @@
/* locale dir */
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
-@@ -933,11 +933,13 @@
- PANEL_ITEM_IMPLEMENTATIONS['bluetooth'] =
- imports.ui.status.bluetooth.Indicator;
+@@ -811,7 +811,9 @@
+ this._indicators = new St.BoxLayout({ style_class: 'panel-status-indicators-box' });
+ this.actor.add_child(this._indicators);
--try {
-- PANEL_ITEM_IMPLEMENTATIONS['network'] =
-- imports.ui.status.network.NMApplet;
--} catch(e) {
-- log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
-+if (Config.HAVE_NETWORKMANAGER) {
-+ try {
-+ PANEL_ITEM_IMPLEMENTATIONS['network'] =
-+ imports.ui.status.network.NMApplet;
-+ } catch(e) {
-+ log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
-+ }
- }
-
- const Panel = new Lang.Class({
+- this._network = new imports.ui.status.network.NMApplet();
++ if (Congi.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 @@
@@ -61,21 +53,21 @@
const DEFAULT_MODE = 'restrictive';
const _modes = {
-@@ -102,7 +104,10 @@
+@@ -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', 'recorder', 'autorunManager', 'automountManager'] :
-+ ['polkitAgent', 'telepathyClient',
- 'keyring', 'recorder', 'autorunManager', 'automountManager'],
++ ['networkAgent', 'polkitAgent', 'telepathyClient',
++ 'keyring', 'autorunManager', 'automountManager'] :
++ ['polkitAgent', 'telepathyClient',
+ 'keyring', 'autorunManager', 'automountManager'],
panel: {
left: ['activities', 'appMenu'],
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -116,7 +116,6 @@
+@@ -103,7 +103,6 @@
shell-invert-lightness-effect.h \
shell-keybinding-modes.h \
shell-mount-operation.h \
@@ -83,60 +75,49 @@
shell-perf-log.h \
shell-screenshot.h \
shell-slicer.h \
-@@ -129,6 +128,10 @@
- shell-wm.h \
- shell-xfixes-cursor.h
-
-+if HAVE_NETWORKMANAGER
-+shell_public_headers_h += shell-network-agent.h
-+endif
-+
- shell_private_sources = \
- gactionmuxer.h \
- gactionmuxer.c \
-@@ -159,7 +162,6 @@
- shell-keyring-prompt.h \
- shell-keyring-prompt.c \
+@@ -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 \
-@@ -177,6 +179,10 @@
- shell-xfixes-cursor.c \
- $(NULL)
+@@ -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_la_SOURCES))
+ $(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_base_la_SOURCES) $(libgnome_shell_sources))
-@@ -287,7 +293,10 @@
- libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
+@@ -331,7 +333,10 @@
+ CLEANFILES += ShellMenu-0.1.gir
- Shell-0.1.gir: libgnome-shell.la St-1.0.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)
- Shell_0_1_gir_LIBS = libgnome-shell.la
- Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
+ # 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
-@@ -94,8 +94,6 @@
- libcanberra libcanberra-gtk3
- telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
- polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
-- libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
-- libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
- libsecret-unstable gcr-base-3 >= $GCR_MIN_VERSION)
+@@ -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_JS, gio-2.0 gjs-internals-1.0 >= $GJS_MIN_VERSION)
-@@ -154,6 +152,37 @@
+ PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS)
+@@ -162,6 +160,37 @@
[Define if _NL_TIME_FIRST_WEEKDAY is available])
fi
@@ -174,7 +155,7 @@
# Sets GLIB_GENMARSHAL and GLIB_MKENUMS
AM_PATH_GLIB_2_0()
-@@ -199,3 +228,15 @@
+@@ -203,3 +232,15 @@
man/Makefile
])
AC_OUTPUT
Modified: desktop/experimental/gnome-shell/debian/patches/27-nm-libexec-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/27-nm-libexec-path.patch?rev=39820&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/27-nm-libexec-path.patch [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/27-nm-libexec-path.patch [utf-8] Sun Oct 13 20:30:17 2013
@@ -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)) {
Modified: desktop/experimental/gnome-shell/debian/patches/40_change-pam-name-to-match-gdm.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/40_change-pam-name-to-match-gdm.patch?rev=39820&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/40_change-pam-name-to-match-gdm.patch [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/40_change-pam-name-to-match-gdm.patch [utf-8] Sun Oct 13 20:30:17 2013
@@ -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;
+@@ -16,7 +16,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 SMARTCARD_SERVICE_NAME = 'gdm-smartcard';
const FADE_ANIMATION_TIME = 0.16;
- const CLONE_FADE_ANIMATION_TIME = 0.25;
Modified: desktop/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/series?rev=39820&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/series [utf-8] Sun Oct 13 20:30:17 2013
@@ -1,7 +1,4 @@
10-make-NetworkManager-optional.patch
-11-no-gettext.patch
27-nm-libexec-path.patch
#30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
40_change-pam-name-to-match-gdm.patch
-revert-suspend-break.patch
-git_relock_screen_after_crash.patch
More information about the pkg-gnome-commits
mailing list