r35964 - in /desktop/experimental/gnome-shell/debian: ./ patches/
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Mon Oct 15 07:34:22 UTC 2012
Author: sjoerd
Date: Mon Oct 15 07:34:21 2012
New Revision: 35964
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35964
Log:
* New upstream release
* d/p/28-ShellUserVerifier-fix-typo-in-function-name-caught-o.patch:
- Added. Fix typo in function name called from auth error (From upstream
git)
* d/p/29-Cope-with-clutter-being-built-with-both-new-and-old-.patch:
- Added. The ClutterColor g-i API changes depending on which version of
gobject-introspection clutter is built with. Deal with both variants
* d/p/01_slist_cleanup.patch
d/p/02_filter_nodisplay_parents.patch
d/p/03_don-t-show-apps-in-NoDisplay-categories.patch
d/p/04_fix_nodisplay.patch
d/p/25-close-the-recorder-instead-of-pausing-it.patch
d/p/26-networkAgent-use-absolute-path-if-configured.patch
d/p/32-enable-the-screen-reader-menu-item.patch
d/p/33-screen-reader-l10n.patch
- Dropped, all fixed upstream
* d/p/14_make-GLX-optional.patch: Refreshed
* d/p/27-nm-libexec-path.patch: Refreshed
* d/p/10-make-NetworkManager-optional.patch: Temporarily disabled
* debian/gnome-shell.gsettings-override: Use epiphany instead of iceweasel
again
* debian/control.in: Conflict with gnome-screensaver (<< 3.6) as
both try to provide the screensaver in the full gnome session
* Sync with Ubuntu:
+ debian/control.in: Update build-depends
+ debian/source_gnome-shell.py: Add apport hook
Added:
desktop/experimental/gnome-shell/debian/patches/28-ShellUserVerifier-fix-typo-in-function-name-caught-o.patch
desktop/experimental/gnome-shell/debian/patches/29-Cope-with-clutter-being-built-with-both-new-and-old-.patch
desktop/experimental/gnome-shell/debian/source_gnome-shell.py
Removed:
desktop/experimental/gnome-shell/debian/patches/01_slist_cleanup.patch
desktop/experimental/gnome-shell/debian/patches/02_filter_nodisplay_parents.patch
desktop/experimental/gnome-shell/debian/patches/03_don-t-show-apps-in-NoDisplay-categories.patch
desktop/experimental/gnome-shell/debian/patches/04_fix_nodisplay.patch
desktop/experimental/gnome-shell/debian/patches/22-remove-online-accounts-from-user-menu.patch
desktop/experimental/gnome-shell/debian/patches/25-close-the-recorder-instead-of-pausing-it.patch
desktop/experimental/gnome-shell/debian/patches/26-networkAgent-use-absolute-path-if-configured.patch
desktop/experimental/gnome-shell/debian/patches/32-enable-the-screen-reader-menu-item.patch
desktop/experimental/gnome-shell/debian/patches/33-screen-reader-l10n.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/gnome-shell-common.install
desktop/experimental/gnome-shell/debian/gnome-shell.gsettings-override
desktop/experimental/gnome-shell/debian/patches/14_make-GLX-optional.patch
desktop/experimental/gnome-shell/debian/patches/27-nm-libexec-path.patch
desktop/experimental/gnome-shell/debian/patches/series
desktop/experimental/gnome-shell/debian/rules
Modified: desktop/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/changelog?rev=35964&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/changelog [utf-8] Mon Oct 15 07:34:21 2012
@@ -1,3 +1,34 @@
+gnome-shell (3.6.0-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * d/p/28-ShellUserVerifier-fix-typo-in-function-name-caught-o.patch:
+ - Added. Fix typo in function name called from auth error (From upstream
+ git)
+ * d/p/29-Cope-with-clutter-being-built-with-both-new-and-old-.patch:
+ - Added. The ClutterColor g-i API changes depending on which version of
+ gobject-introspection clutter is built with. Deal with both variants
+ * d/p/01_slist_cleanup.patch
+ d/p/02_filter_nodisplay_parents.patch
+ d/p/03_don-t-show-apps-in-NoDisplay-categories.patch
+ d/p/04_fix_nodisplay.patch
+ d/p/25-close-the-recorder-instead-of-pausing-it.patch
+ d/p/26-networkAgent-use-absolute-path-if-configured.patch
+ d/p/32-enable-the-screen-reader-menu-item.patch
+ d/p/33-screen-reader-l10n.patch
+ - Dropped, all fixed upstream
+ * d/p/14_make-GLX-optional.patch: Refreshed
+ * d/p/27-nm-libexec-path.patch: Refreshed
+ * d/p/10-make-NetworkManager-optional.patch: Temporarily disabled
+ * debian/gnome-shell.gsettings-override: Use epiphany instead of iceweasel
+ again
+ * debian/control.in: Conflict with gnome-screensaver (<< 3.6) as
+ both try to provide the screensaver in the full gnome session
+ * Sync with Ubuntu:
+ + debian/control.in: Update build-depends
+ + debian/source_gnome-shell.py: Add apport hook
+
+ -- Sjoerd Simons <sjoerd at debian.org> Mon, 15 Oct 2012 09:18:23 +0200
+
gnome-shell (3.4.2-2) unstable; urgency=low
* Replace epiphany by iceweasel. Closes: #682481.
Modified: desktop/experimental/gnome-shell/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/control?rev=35964&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/control [utf-8] Mon Oct 15 07:34:21 2012
@@ -2,41 +2,44 @@
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
-
Source: gnome-shell
Section: gnome
Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Jeremy Bicha <jbicha at ubuntu.com>
Build-Depends: autotools-dev,
cdbs,
debhelper (>= 8.1.3~),
dh-autoreconf,
gnome-bluetooth (>= 2.90.0) [linux-any],
+ gnome-control-center-dev (>= 3.4),
gnome-pkg-tools (>= 0.11),
gobject-introspection (>= 1.29.15),
- gsettings-desktop-schemas-dev (>= 3.3.2),
+ gsettings-desktop-schemas-dev (>= 3.5.4),
intltool (>= 0.26),
+ libatk-bridge2.0-dev,
libcanberra-dev,
- libclutter-1.0-dev (>= 1.9.16),
+ libclutter-1.0-dev (>= 1.11.11),
libcroco3-dev (>= 0.6),
libdbus-glib-1-dev,
- libecal1.2-dev (>= 2.32.0),
- libedataserver1.2-dev (>= 3.2.0),
- libedataserverui-3.0-dev (>= 3.2.0),
- libfolks-dev (>= 0.5.2),
+ libecal1.2-dev (>= 3.5.3),
+ libedataserver1.2-dev (>= 3.5.3),
+ libedataserverui-3.0-dev (>= 3.5.3),
libgconf2-dev,
libgirepository1.0-dev (>= 1.29.15),
- libgjs-dev (>= 1.30),
+ libgjs-dev (>= 1.33.2),
libglib2.0-dev (>= 2.31.6),
- libgnome-bluetooth-dev (>= 2.90.0) [linux-any],
- libgnome-desktop-3-dev (>= 2.90.0),
+ libgnome-bluetooth-dev (>= 3.5.5) [linux-any],
+ libgnome-desktop-3-dev (>= 3.5.5),
libgnome-keyring-dev,
- libgnome-menu-3-dev (>= 3.4.2-3~),
- libgstreamer0.10-dev (>= 0.10.16),
+ libgnome-menu-3-dev (>= 3.5.3),
+ libgstreamer1.0-dev (>= 0.11.92),
libgtk-3-dev (>= 3.3.9),
- libmutter-dev (>= 3.4.1),
+ libibus-1.0-dev,
+ libmutter-dev (>= 3.5.92),
libnm-glib-dev (>= 0.9) [linux-any],
+ libnm-glib-vpn-dev (>= 0.9) [linux-any],
libnm-util-dev (>= 0.9) [linux-any],
libpolkit-agent-1-dev (>= 0.100),
libpulse-dev,
@@ -59,18 +62,21 @@
${icon-theme:Depends},
${misc:Depends},
${shlibs:Depends},
+ gdm (>= 3.5.90),
gnome-shell-common (= ${source:Version}),
gir1.2-accountsservice-1.0,
gir1.2-caribou-1.0,
- gir1.2-clutter-1.0 (>= 1.9.16),
+ gir1.2-clutter-1.0 (>= 1.11.11),
gir1.2-freedesktop,
gir1.2-gcr-3,
gir1.2-gconf-2.0,
gir1.2-gkbd-3.0,
gir1.2-glib-2.0 (>= 1.31),
gir1.2-gnomebluetooth-1.0 [linux-any],
+ gir1.2-gnomedesktop-3.0,
gir1.2-gtk-3.0,
- gir1.2-mutter-3.0 (>= 3.4.1),
+ gir1.2-ibus-1.0,
+ gir1.2-mutter-3.0 (>= 3.5.92),
gir1.2-networkmanager-1.0 [linux-any],
gir1.2-pango-1.0,
gir1.2-polkit-1.0,
@@ -78,11 +84,11 @@
gir1.2-telepathyglib-0.12,
gir1.2-telepathylogger-0.2,
gir1.2-upowerglib-1.0,
- gjs (>= 1.30),
+ gjs (>= 1.33.2),
gnome-icon-theme-symbolic (>= 2.91),
gnome-settings-daemon (>= 3.4.0),
gnome-themes-standard,
- gsettings-desktop-schemas (>= 3.3.2),
+ gsettings-desktop-schemas (>= 3.5.4),
python (>= 2.6),
telepathy-mission-control-5
Recommends: gnome-contacts,
@@ -92,7 +98,7 @@
Breaks: fglrx-driver (<< 1:11-10),
gnome-control-center (<< 1:3.0),
gnome-session (<< 3.0),
- gnome-tweak-tool (<< 3.3)
+ gnome-tweak-tool (<< 3.5)
Description: graphical shell for the GNOME desktop
The GNOME Shell redefines user interactions with the GNOME desktop.
In particular, it offers new paradigms for launching applications,
Modified: desktop/experimental/gnome-shell/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/control.in?rev=35964&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/control.in [utf-8] Mon Oct 15 07:34:21 2012
@@ -8,30 +8,33 @@
debhelper (>= 8.1.3~),
dh-autoreconf,
gnome-bluetooth (>= 2.90.0) [linux-any],
+ gnome-control-center-dev (>= 3.4),
gnome-pkg-tools (>= 0.11),
gobject-introspection (>= 1.29.15),
- gsettings-desktop-schemas-dev (>= 3.3.2),
+ gsettings-desktop-schemas-dev (>= 3.5.4),
intltool (>= 0.26),
+ libatk-bridge2.0-dev,
libcanberra-dev,
- libclutter-1.0-dev (>= 1.9.16),
+ libclutter-1.0-dev (>= 1.11.11),
libcroco3-dev (>= 0.6),
libdbus-glib-1-dev,
- libecal1.2-dev (>= 2.32.0),
- libedataserver1.2-dev (>= 3.2.0),
- libedataserverui-3.0-dev (>= 3.2.0),
- libfolks-dev (>= 0.5.2),
+ libecal1.2-dev (>= 3.5.3),
+ libedataserver1.2-dev (>= 3.5.3),
+ libedataserverui-3.0-dev (>= 3.5.3),
libgconf2-dev,
libgirepository1.0-dev (>= 1.29.15),
- libgjs-dev (>= 1.30),
+ libgjs-dev (>= 1.33.2),
libglib2.0-dev (>= 2.31.6),
- libgnome-bluetooth-dev (>= 2.90.0) [linux-any],
- libgnome-desktop-3-dev (>= 2.90.0),
+ libgnome-bluetooth-dev (>= 3.5.5) [linux-any],
+ libgnome-desktop-3-dev (>= 3.5.5),
libgnome-keyring-dev,
- libgnome-menu-3-dev (>= 3.4.2-3~),
- libgstreamer0.10-dev (>= 0.10.16),
+ libgnome-menu-3-dev (>= 3.5.3),
+ libgstreamer1.0-dev (>= 0.11.92),
libgtk-3-dev (>= 3.3.9),
- libmutter-dev (>= 3.4.1),
+ libibus-1.0-dev,
+ libmutter-dev (>= 3.5.92),
libnm-glib-dev (>= 0.9) [linux-any],
+ libnm-glib-vpn-dev (>= 0.9) [linux-any],
libnm-util-dev (>= 0.9) [linux-any],
libpolkit-agent-1-dev (>= 0.100),
libpulse-dev,
@@ -54,18 +57,21 @@
${icon-theme:Depends},
${misc:Depends},
${shlibs:Depends},
+ gdm3 (>= 3.5.90),
gnome-shell-common (= ${source:Version}),
gir1.2-accountsservice-1.0,
gir1.2-caribou-1.0,
- gir1.2-clutter-1.0 (>= 1.9.16),
+ gir1.2-clutter-1.0 (>= 1.11.11),
gir1.2-freedesktop,
gir1.2-gcr-3,
gir1.2-gconf-2.0,
gir1.2-gkbd-3.0,
gir1.2-glib-2.0 (>= 1.31),
gir1.2-gnomebluetooth-1.0 [linux-any],
+ gir1.2-gnomedesktop-3.0,
gir1.2-gtk-3.0,
- gir1.2-mutter-3.0 (>= 3.4.1),
+ gir1.2-ibus-1.0,
+ gir1.2-mutter-3.0 (>= 3.5.92),
gir1.2-networkmanager-1.0 [linux-any],
gir1.2-pango-1.0,
gir1.2-polkit-1.0,
@@ -73,11 +79,11 @@
gir1.2-telepathyglib-0.12,
gir1.2-telepathylogger-0.2,
gir1.2-upowerglib-1.0,
- gjs (>= 1.30),
+ gjs (>= 1.33.2),
gnome-icon-theme-symbolic (>= 2.91),
gnome-settings-daemon (>= 3.4.0),
gnome-themes-standard,
- gsettings-desktop-schemas (>= 3.3.2),
+ gsettings-desktop-schemas (>= 3.5.4),
python (>= 2.6),
telepathy-mission-control-5
Recommends: gnome-contacts,
@@ -87,7 +93,8 @@
Breaks: fglrx-driver (<< 1:11-10),
gnome-control-center (<< 1:3.0),
gnome-session (<< 3.0),
- gnome-tweak-tool (<< 3.3)
+ 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.
In particular, it offers new paradigms for launching applications,
Modified: desktop/experimental/gnome-shell/debian/gnome-shell-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/gnome-shell-common.install?rev=35964&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/gnome-shell-common.install [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/gnome-shell-common.install [utf-8] Mon Oct 15 07:34:21 2012
@@ -1,5 +1,7 @@
usr/share/glib-2.0
usr/share/GConf
+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
Modified: desktop/experimental/gnome-shell/debian/gnome-shell.gsettings-override
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/gnome-shell.gsettings-override?rev=35964&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/gnome-shell.gsettings-override [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/gnome-shell.gsettings-override [utf-8] Mon Oct 15 07:34:21 2012
@@ -1,2 +1,2 @@
[org.gnome.shell]
-favorite-apps=[ 'iceweasel.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'yelp.desktop' ]
+favorite-apps=[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'libreoffice-writer.desktop', 'nautilus.desktop', 'yelp.desktop' ]
Modified: desktop/experimental/gnome-shell/debian/patches/14_make-GLX-optional.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/14_make-GLX-optional.patch?rev=35964&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/14_make-GLX-optional.patch [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/14_make-GLX-optional.patch [utf-8] Mon Oct 15 07:34:21 2012
@@ -2,30 +2,30 @@
This avoids a build failure on arm{el,hf} where cogl uses GLES
Author: Michael Biebl <biebl at debian.org>
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670850
-Index: gnome-shell-3.4.1/configure.ac
+Index: gnome-shell-3.5.92/configure.ac
===================================================================
---- gnome-shell-3.4.1.orig/configure.ac 2012-05-30 20:30:08.173590415 +0200
-+++ gnome-shell-3.4.1/configure.ac 2012-05-30 20:30:08.741590395 +0200
+--- gnome-shell-3.5.92.orig/configure.ac 2012-09-19 08:37:54.468936604 -0400
++++ gnome-shell-3.5.92/configure.ac 2012-09-19 08:37:58.052936454 -0400
@@ -50,7 +50,7 @@
AC_MSG_RESULT(yes)
build_recorder=true
- recorder_modules="gstreamer-0.10 gstreamer-base-0.10 x11"
+ recorder_modules="gstreamer-1.0 gstreamer-base-1.0 x11"
- PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes gl)
+ PKG_CHECK_MODULES(TEST_SHELL_RECORDER, $recorder_modules clutter-1.0 xfixes)
else
AC_MSG_RESULT(no)
fi
-@@ -82,7 +82,6 @@
- gjs-internals-1.0 >= $GJS_MIN_VERSION
- libgnome-menu-3.0 $recorder_modules
+@@ -84,7 +84,6 @@
+ libgnome-menu-3.0 >= $GNOME_MENUS_REQUIRED_VERSION
+ $recorder_modules
gdk-x11-3.0 libsoup-2.4
- gl
clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
clutter-glx-1.0 >= $CLUTTER_MIN_VERSION
libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
-@@ -133,6 +132,16 @@
-
- PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
+@@ -106,6 +105,16 @@
+ GNOME_KEYBINDINGS_KEYSDIR=`$PKG_CONFIG --variable keysdir gnome-keybindings`
+ AC_SUBST([GNOME_KEYBINDINGS_KEYSDIR])
+PKG_CHECK_MODULES(GLX, [gl], [have_glx=yes], [have_glx=no])
+if test "x$have_glx" = "xyes"; then
@@ -37,13 +37,13 @@
+ AC_SUBST([HAVE_GLX], [1])
+fi
+
- GJS_VERSION=`$PKG_CONFIG --modversion gjs-internals-1.0`
- AC_DEFINE_UNQUOTED([GJS_VERSION], ["$GJS_VERSION"], [The version of GJS we're linking to])
- AC_SUBST([GJS_VERSION], ["$GJS_VERSION"])
-Index: gnome-shell-3.4.1/src/gnome-shell-plugin.c
+ GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_MIN_VERSION])
+
+ saved_CFLAGS=$CFLAGS
+Index: gnome-shell-3.5.92/src/gnome-shell-plugin.c
===================================================================
---- gnome-shell-3.4.1.orig/src/gnome-shell-plugin.c 2012-03-09 22:42:49.000000000 +0100
-+++ gnome-shell-3.4.1/src/gnome-shell-plugin.c 2012-05-30 20:30:08.741590395 +0200
+--- gnome-shell-3.5.92.orig/src/gnome-shell-plugin.c 2012-09-19 08:37:54.468936604 -0400
++++ gnome-shell-3.5.92/src/gnome-shell-plugin.c 2012-09-19 08:37:58.052936454 -0400
@@ -30,8 +30,10 @@
#include <clutter/clutter.h>
@@ -55,7 +55,7 @@
#include <gjs/gjs.h>
#include <meta/display.h>
#include <meta/meta-plugin.h>
-@@ -146,14 +148,17 @@
+@@ -139,14 +141,17 @@
gnome_shell_plugin_start (MetaPlugin *plugin)
{
GnomeShellPlugin *shell_plugin = GNOME_SHELL_PLUGIN (plugin);
@@ -74,7 +74,7 @@
screen = meta_plugin_get_screen (plugin);
display = meta_screen_get_display (screen);
-@@ -166,6 +171,9 @@
+@@ -159,6 +164,9 @@
glx_extensions = glXQueryExtensionsString (xdisplay,
meta_screen_get_screen_number (screen));
shell_plugin->have_swap_event = strstr (glx_extensions, "GLX_INTEL_swap_event") != NULL;
@@ -84,10 +84,10 @@
shell_perf_log_define_event (shell_perf_log_get_default (),
"glx.swapComplete",
-Index: gnome-shell-3.4.1/src/shell-screen-grabber.c
+Index: gnome-shell-3.5.92/src/shell-screen-grabber.c
===================================================================
---- gnome-shell-3.4.1.orig/src/shell-screen-grabber.c 2012-03-02 13:28:41.000000000 +0100
-+++ gnome-shell-3.4.1/src/shell-screen-grabber.c 2012-05-30 20:30:55.781588732 +0200
+--- gnome-shell-3.5.92.orig/src/shell-screen-grabber.c 2012-09-19 08:37:54.468936604 -0400
++++ gnome-shell-3.5.92/src/shell-screen-grabber.c 2012-09-19 08:37:58.052936454 -0400
@@ -1,21 +1,27 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
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=35964&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] Mon Oct 15 07:34:21 2012
@@ -2,9 +2,9 @@
Author: Laurent Bigonville <bigon at debian.org>
Forwarded: not-needed
---- a/js/ui/networkAgent.js
-+++ b/js/ui/networkAgent.js
-@@ -685,7 +685,7 @@ const NetworkAgent = new Lang.Class({
+--- a/js/ui/components/networkAgent.js
++++ b/js/ui/components/networkAgent.js
+@@ -673,7 +673,7 @@
} catch(e) { } // ignore errors if key does not exist
let path = binary;
if (!GLib.path_is_absolute(path)) {
Added: desktop/experimental/gnome-shell/debian/patches/28-ShellUserVerifier-fix-typo-in-function-name-caught-o.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/28-ShellUserVerifier-fix-typo-in-function-name-caught-o.patch?rev=35964&op=file
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/28-ShellUserVerifier-fix-typo-in-function-name-caught-o.patch (added)
+++ desktop/experimental/gnome-shell/debian/patches/28-ShellUserVerifier-fix-typo-in-function-name-caught-o.patch [utf-8] Mon Oct 15 07:34:21 2012
@@ -1,0 +1,27 @@
+From a1bf19dbdfeb73adc2c43d879728980627356623 Mon Sep 17 00:00:00 2001
+From: Olivier Blin <dev at blino.org>
+Date: Wed, 3 Oct 2012 21:25:49 +0200
+Subject: [PATCH] ShellUserVerifier: fix typo in function name, caught on auth
+ error
+
+https://bugzilla.gnome.org/show_bug.cgi?id=685434
+---
+ js/gdm/util.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/gdm/util.js b/js/gdm/util.js
+index 4d4754d..3615cf2 100644
+--- a/js/gdm/util.js
++++ b/js/gdm/util.js
+@@ -143,7 +143,7 @@ const ShellUserVerifier = new Lang.Class({
+
+ _reportInitError: function(where, error) {
+ logError(error, where);
+- this._hold.relase();
++ this._hold.release();
+
+ this.emit('show-message', _("Authentication error"), 'login-dialog-message-warning');
+ this._verificationFailed(false);
+--
+1.7.10.4
+
Added: desktop/experimental/gnome-shell/debian/patches/29-Cope-with-clutter-being-built-with-both-new-and-old-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/29-Cope-with-clutter-being-built-with-both-new-and-old-.patch?rev=35964&op=file
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/29-Cope-with-clutter-being-built-with-both-new-and-old-.patch (added)
+++ desktop/experimental/gnome-shell/debian/patches/29-Cope-with-clutter-being-built-with-both-new-and-old-.patch [utf-8] Mon Oct 15 07:34:21 2012
@@ -1,0 +1,70 @@
+From 154a0d15ec0d0d276c10b6f68fd737dd48b1e0ed Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Mon, 15 Oct 2012 09:12:50 +0200
+Subject: [PATCH] Cope with clutter being built with both new and old g-i
+
+---
+ js/ui/magnifier.js | 18 +++++++++++++++---
+ js/ui/main.js | 10 +++++++++-
+ 2 files changed, 24 insertions(+), 4 deletions(-)
+
+diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
+index f4c46e7..7f2cfaa 100644
+--- a/js/ui/magnifier.js
++++ b/js/ui/magnifier.js
+@@ -300,8 +300,14 @@ const Magnifier = new Lang.Class({
+ */
+ setCrosshairsColor: function(color) {
+ if (this._crossHairs) {
+- let [res, clutterColor] = Clutter.Color.from_string(color);
+- this._crossHairs.setColor(clutterColor);
++ try {
++ let [res, clutterColor] = Clutter.Color.from_string(color);
++ this._crossHairs.setColor(clutterColor);
++ } catch (e) {
++ let clutterColor = new Clutter.Color()
++ clutterColor.from_string(color)
++ this._crossHairs.setColor(clutterColor);
++ }
+ }
+ },
+
+@@ -1467,7 +1473,13 @@ const Crosshairs = new Lang.Class({
+ * @color: The color as a Clutter.Color.
+ */
+ getColor: function() {
+- return this._horizLeftHair.get_color();
++ try {
++ return this._horizLeftHair.get_color();
++ } catch (e) {
++ let clutterColor = new Clutter.Color()
++ this._horizLeftHair.get_color(clutterColor);
++ return clutterColor;
++ }
+ },
+
+ /**
+diff --git a/js/ui/main.js b/js/ui/main.js
+index fcffbf7..41faa57 100644
+--- a/js/ui/main.js
++++ b/js/ui/main.js
+@@ -37,7 +37,15 @@ const XdndHandler = imports.ui.xdndHandler;
+ const Util = imports.misc.util;
+
+ const OVERRIDES_SCHEMA = 'org.gnome.shell.overrides';
+-const DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
++
++/* Cope with the clutter API changing depending on the g-i it hwas been built with */
++let DEFAULT_BACKGROUND_COLOR = null;
++try {
++ DEFAULT_BACKGROUND_COLOR = Clutter.Color.from_pixel(0x2e3436ff);
++} catch (e) {
++ DEFAULT_BACKGROUND_COLOR = new Clutter.Color();
++ DEFAULT_BACKGROUND_COLOR.from_pixel(0x2e3436ff);
++}
+
+ let componentManager = null;
+ let panel = null;
+--
+1.7.10.4
+
Modified: desktop/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/series?rev=35964&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/series [utf-8] Mon Oct 15 07:34:21 2012
@@ -1,13 +1,6 @@
-01_slist_cleanup.patch
-02_filter_nodisplay_parents.patch
-03_don-t-show-apps-in-NoDisplay-categories.patch
-04_fix_nodisplay.patch
-10-make-NetworkManager-optional.patch
+#10-make-NetworkManager-optional.patch
11-no-gettext.patch
14_make-GLX-optional.patch
-22-remove-online-accounts-from-user-menu.patch
-25-close-the-recorder-instead-of-pausing-it.patch
-26-networkAgent-use-absolute-path-if-configured.patch
27-nm-libexec-path.patch
-32-enable-the-screen-reader-menu-item.patch
-33-screen-reader-l10n.patch
+28-ShellUserVerifier-fix-typo-in-function-name-caught-o.patch
+29-Cope-with-clutter-being-built-with-both-new-and-old-.patch
Modified: desktop/experimental/gnome-shell/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/rules?rev=35964&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/rules [utf-8] Mon Oct 15 07:34:21 2012
@@ -21,3 +21,6 @@
DEB_DH_MAKESHLIBS_ARGS_gnome-shell = -Xlibgnome-shell
DEB_SHLIBDEPS_INCLUDE = /usr/lib/gnome-bluetooth
+
+# List any files which are not installed
+common-binary-post-install-arch:: list-missing
Added: desktop/experimental/gnome-shell/debian/source_gnome-shell.py
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/source_gnome-shell.py?rev=35964&op=file
==============================================================================
--- desktop/experimental/gnome-shell/debian/source_gnome-shell.py (added)
+++ desktop/experimental/gnome-shell/debian/source_gnome-shell.py [utf-8] Mon Oct 15 07:34:21 2012
@@ -1,0 +1,5 @@
+from apport.hookutils import *
+
+def add_info(report):
+ attach_gsettings_package(report, 'gnome-shell-common')
+ attach_gsettings_schema(report, 'org.gnome.desktop.interface')
More information about the pkg-gnome-commits
mailing list