Merge lp:~ubuntu-branches/ubuntu/oneiric/gnome-shell/oneiric-proposed-201202171003 into lp:ubuntu/oneiric-proposed/gnome-shell

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric-proposed/gnome-shell reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/gnome-shell/oneiric-proposed-201202171003. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

=== added file 'debian/gnome-shell-common.install'
--- debian/gnome-shell-common.install	1970-01-01 00:00:00 +0000
+++ debian/gnome-shell-common.install	2012-02-17 10:12:18 +0000
@@ -0,0 +1,4 @@
+debian/tmp/etc/gconf
+debian/tmp/usr/share/glib-2.0
+debian/tmp/usr/share/gnome-shell
+debian/tmp/usr/share/locale

=== renamed file 'debian/gnome-shell-common.install' => 'debian/gnome-shell-common.install.moved'
=== added file 'debian/gnome-shell.install'
--- debian/gnome-shell.install	1970-01-01 00:00:00 +0000
+++ debian/gnome-shell.install	2012-02-17 10:12:18 +0000
@@ -0,0 +1,6 @@
+debian/tmp/usr/bin
+debian/tmp/usr/lib/gnome-shell
+debian/tmp/usr/lib/mozilla
+debian/tmp/usr/share/applications
+debian/tmp/usr/share/dbus-1
+debian/tmp/usr/share/man

=== renamed file 'debian/gnome-shell.install' => 'debian/gnome-shell.install.moved'
=== added file 'debian/patches/02_rpath-bluetooth-applet.patch'
--- debian/patches/02_rpath-bluetooth-applet.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02_rpath-bluetooth-applet.patch	2012-02-17 10:12:18 +0000
@@ -0,0 +1,32 @@
+Description: Define rpath for linking against gnome-bluetooth
+ Modified by Raphael Hertzog to actually make it work.
+Author: Rico Tzschichholz <[e-mail]>
+Forwarded: no
+Last-Update: 2011-04-11
+
+Index: gnome-shell-3.2.1/src/Makefile.am
+===================================================================
+--- gnome-shell-3.2.1.orig/src/Makefile.am	2011-09-20 23:06:39.000000000 +0200
++++ gnome-shell-3.2.1/src/Makefile.am	2011-12-03 06:31:28.812401727 +0100
+@@ -259,7 +259,7 @@
+ 	rm -f $(@F).tmp
+ EXTRA_DIST += shell-enum-types.c.in
+ 
+-libgnome_shell_la_LDFLAGS = -avoid-version
++libgnome_shell_la_LDFLAGS = -avoid-version -rpath $(pkglibdir):/usr/lib/gnome-bluetooth -R $(pkglibdir)
+ libgnome_shell_la_LIBADD =		\
+ 	-lm			\
+ 	$(GNOME_SHELL_LIBS)	\
+Index: gnome-shell-3.2.1/src/Makefile.in
+===================================================================
+--- gnome-shell-3.2.1.orig/src/Makefile.in	2011-10-18 06:24:10.000000000 +0200
++++ gnome-shell-3.2.1/src/Makefile.in	2011-12-03 06:31:28.816401727 +0100
+@@ -888,7 +888,7 @@
+ run_js_test_SOURCES = \
+ 	run-js-test.c
+ 
+-libgnome_shell_la_LDFLAGS = -avoid-version
++libgnome_shell_la_LDFLAGS = -avoid-version -rpath $(pkglibdir):/usr/lib/gnome-bluetooth -R $(pkglibdir)
+ libgnome_shell_la_LIBADD = \
+ 	-lm			\
+ 	$(GNOME_SHELL_LIBS)	\

=== renamed file 'debian/patches/02_rpath-bluetooth-applet.patch' => 'debian/patches/02_rpath-bluetooth-applet.patch.moved'
=== added file 'debian/patches/04_remove-glx-dependency-on-armel.patch'
--- debian/patches/04_remove-glx-dependency-on-armel.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/04_remove-glx-dependency-on-armel.patch	2012-02-17 10:12:18 +0000
@@ -0,0 +1,52 @@
+From: Robert Bragg <[e-mail]>
+Date: Wed, 13 Jul 2011 12:20:43 +0100
+Subject: [PATCH] Remove GLX dependency
+
+Index: oneiric/src/gnome-shell-plugin.c
+===================================================================
+--- oneiric.orig/src/gnome-shell-plugin.c	2011-09-04 04:01:43.713265027 -0400
++++ oneiric/src/gnome-shell-plugin.c	2011-09-06 11:20:47.243195279 -0400
+@@ -30,8 +30,11 @@
+ 
+ #include <clutter/clutter.h>
+ #include <clutter/x11/clutter-x11.h>
++#if defined (__arm__)
++#else
+ #include <GL/glx.h>
+ #include <GL/glxext.h>
++#endif
+ #include <gjs/gjs.h>
+ #include <meta/display.h>
+ #include <meta/meta-plugin.h>
+@@ -146,14 +149,23 @@
+ gnome_shell_plugin_start (MetaPlugin *plugin)
+ {
+   GnomeShellPlugin *shell_plugin = GNOME_SHELL_PLUGIN (plugin);
++#if defined (__arm__)
++#else
+   MetaScreen *screen;
+   MetaDisplay *display;
+   Display *xdisplay;
++#endif
+   GError *error = NULL;
+   int status;
++#if defined (__arm__)
++#else
+   const char *glx_extensions;
++#endif
+   GjsContext *gjs_context;
+ 
++#if defined (__arm__)
++  shell_plugin->have_swap_event = 0;
++#else
+   screen = meta_plugin_get_screen (plugin);
+   display = meta_screen_get_display (screen);
+ 
+@@ -166,6 +178,7 @@
+   glx_extensions = glXQueryExtensionsString (xdisplay,
+                                              meta_screen_get_screen_number (screen));
+   shell_plugin->have_swap_event = strstr (glx_extensions, "GLX_INTEL_swap_event") != NULL;
++#endif
+ 
+   shell_perf_log_define_event (shell_perf_log_get_default (),
+                                "glx.swapComplete",

=== renamed file 'debian/patches/04_remove-glx-dependency-on-armel.patch' => 'debian/patches/04_remove-glx-dependency-on-armel.patch.moved'
=== added file 'debian/patches/07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch'
--- debian/patches/07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch	2012-02-17 10:12:18 +0000
@@ -0,0 +1,49 @@
+From 9aae5cf478fe3c04cb956b23b166fd49261b8d61 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <[e-mail]>
+Date: Sat, 29 Oct 2011 14:35:09 +0200
+Subject: [PATCH 3/3] NetworkMenu: fix logic for updating wifi icon
+
+Previously, we connected to notify::strength only if there was
+already a signal connected, and the AP changed (thus, by induction,
+we never connected). As a result, the icon became stale and different
+from that shown inside the menu (which is correctly updated).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=650007
+---
+ js/ui/status/network.js |   12 +++++++-----
+ 1 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/js/ui/status/network.js b/js/ui/status/network.js
+index aa9b277..d40f7a6 100644
+--- a/js/ui/status/network.js
++++ b/js/ui/status/network.js
+@@ -2061,10 +2061,11 @@ NMApplet.prototype = {
+                         }
+                         this.setIcon('network-wireless-connected');
+                     } else {
+-                        if (this._accessPointUpdateId && this._activeAccessPoint != ap) {
+-                            this._activeAccessPoint.disconnect(this._accessPointUpdateId);
++                        if (this._activeAccessPoint != ap) {
++                            if (this._accessPointUpdateId)
++                                this._activeAccessPoint.disconnect(this._accessPointUpdateId);
+                             this._activeAccessPoint = ap;
+-                            this._activeAccessPointUpdateId = ap.connect('notify::strength', Lang.bind(function() {
++                            this._activeAccessPointUpdateId = ap.connect('notify::strength', Lang.bind(this, function() {
+                                 this.setIcon('network-wireless-signal-' + signalToIcon(ap.strength));
+                             }));
+                         }
+@@ -2091,8 +2092,9 @@ NMApplet.prototype = {
+                     break;
+                 }
+ 
+-                if (this._mobileUpdateId && this._mobileUpdateDevice != dev) {
+-                    this._mobileUpdateDevice.disconnect(this._mobileUpdateId);
++                if (dev.mobileDevice != this._mobileUpdateDevice) {
++                    if (this._mobileUpdateId)
++                        this._mobileUpdateDevice.disconnect(this._mobileUpdateId);
+                     this._mobileUpdateDevice = dev.mobileDevice;
+                     this._mobileUpdateId = dev.mobileDevice.connect('notify::signal-quality', Lang.bind(this, function() {
+                         this.setIcon('network-cellular-signal-' + signalToIcon(dev.mobileDevice.signal_quality));
+-- 
+1.7.7.3
+

=== renamed file 'debian/patches/07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch' => 'debian/patches/07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch.moved'
=== added file 'debian/patches/08-polkit-Find-the-best-user-to-authenticate-as.patch'
--- debian/patches/08-polkit-Find-the-best-user-to-authenticate-as.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/08-polkit-Find-the-best-user-to-authenticate-as.patch	2012-02-17 10:12:18 +0000
@@ -0,0 +1,49 @@
+From b98e1daac76ea0a5417ca1efd0ba668fb8ec4816 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <[e-mail]>
+Date: Thu, 17 Nov 2011 22:42:37 -0500
+Subject: [PATCH] polkit: Find the best user to authenticate as
+
+We prefer to ask the user for his own password. If PolicyKit
+is not configured to accept that, try the root password. If
+PolicyKit does not accept that either, ask for password of
+the first user that PolicyKit _will_ accept. The last case
+is a bit broken, but should rarely occur in real-life
+configurations.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=651547
+---
+ js/ui/polkitAuthenticationAgent.js |    9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/polkitAuthenticationAgent.js b/js/ui/polkitAuthenticationAgent.js
+index 2d7063a..6f01039 100644
+--- a/js/ui/polkitAuthenticationAgent.js
++++ b/js/ui/polkitAuthenticationAgent.js
+@@ -27,6 +27,7 @@ const AccountsService = imports.gi.AccountsService;
+ const Clutter = imports.gi.Clutter;
+ const St = imports.gi.St;
+ const Pango = imports.gi.Pango;
++const GLib = imports.gi.GLib;
+ const Gio = imports.gi.Gio;
+ const Mainloop = imports.mainloop;
+ const Polkit = imports.gi.Polkit;
+@@ -88,10 +89,14 @@ AuthenticationDialog.prototype = {
+         if (userNames.length > 1) {
+             log('polkitAuthenticationAgent: Received ' + userNames.length +
+                 ' identities that can be used for authentication. Only ' +
+-                'considering the first one.');
++                'considering one.');
+         }
+ 
+-        let userName = userNames[0];
++        let userName = GLib.get_user_name();
++        if (userNames.indexOf(userName) < 0)
++            userName = 'root';
++        if (userNames.indexOf(userName) < 0)
++            userName = userNames[0];
+ 
+         this._user = AccountsService.UserManager.get_default().get_user(userName);
+         let userRealName = this._user.get_real_name()
+-- 
+1.7.7.3
+

=== renamed file 'debian/patches/08-polkit-Find-the-best-user-to-authenticate-as.patch' => 'debian/patches/08-polkit-Find-the-best-user-to-authenticate-as.patch.moved'
=== added file 'debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch'
--- debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch	2012-02-17 10:12:18 +0000
@@ -0,0 +1,27 @@
+From 3013e942d862840e46eb07de9e84f9d80e7e13cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <[e-mail]>
+Date: Sun, 4 Sep 2011 15:29:38 +0200
+Subject: [PATCH] Also respect NoDisplay semantics for applications menu
+
+https://bugzilla.gnome.org/show_bug.cgi?id=658176
+---
+ src/shell-app-system.c |    6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+Index: gnome-shell-3.2.1/src/shell-app-system.c
+===================================================================
+--- gnome-shell-3.2.1.orig/src/shell-app-system.c	2011-10-17 17:24:49.000000000 +0200
++++ gnome-shell-3.2.1/src/shell-app-system.c	2011-12-03 06:31:39.572401347 +0100
+@@ -102,11 +102,7 @@
+                                                    NULL,
+                                                    (GDestroyNotify)g_object_unref);
+ 
+-  /* For now, we want to pick up Evince, Nautilus, etc.  We'll
+-   * handle NODISPLAY semantics at a higher level or investigate them
+-   * case by case.
+-   */
+-  priv->apps_tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY);
++  priv->apps_tree = gmenu_tree_new ("applications.menu", 0);
+   g_signal_connect (priv->apps_tree, "changed", G_CALLBACK (on_apps_tree_changed_cb), self);
+ 
+   priv->settings_tree = gmenu_tree_new ("gnomecc.menu", 0);

=== renamed file 'debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch' => 'debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch.moved'
=== added file 'debian/patches/10-bluetooth-fix-connection-from-gs-menu.patch'
--- debian/patches/10-bluetooth-fix-connection-from-gs-menu.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/10-bluetooth-fix-connection-from-gs-menu.patch	2012-02-17 10:12:18 +0000
@@ -0,0 +1,31 @@
+From 0ed0dc89b51f8e584dd21c87a7178ba138bed44b Mon Sep 17 00:00:00 2001
+From: Alessandro Crismani <[e-mail]>
+Date: Tue, 13 Dec 2011 10:01:34 +0100
+Subject: [PATCH] Bluetooth: fix connecting devices from GS's panel on 3.2.1
+
+Connecting devices from Gnome Shell's panel on Gnome 3.2.1 fails because
+of an undefined variable in
+js/ui/status/bluetooth.js:buildDeviceSubMenu. More explicitly, the
+menuitem variable is not declared and hence connecting and disconnecting
+fails. Fix it to make the bluetooth panel menu item work.
+---
+ js/ui/status/bluetooth.js |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js
+index f2d95f5..3aa7960 100644
+--- a/js/ui/status/bluetooth.js
++++ b/js/ui/status/bluetooth.js
+@@ -205,7 +205,8 @@ Indicator.prototype = {
+     _buildDeviceSubMenu: function(item, device) {
+         if (device.can_connect) {
+             item._connected = device.connected;
+-            item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
++            let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected);
++            item._connectedMenuitem = menuitem;
+             item._connectedMenuitem.connect('toggled', Lang.bind(this, function() {
+                 if (item._connected > ConnectionState.CONNECTED) {
+                     // operation already in progress, revert
+-- 
+1.7.8
+

=== renamed file 'debian/patches/10-bluetooth-fix-connection-from-gs-menu.patch' => 'debian/patches/10-bluetooth-fix-connection-from-gs-menu.patch.moved'
=== modified file 'js/ui/status/network.js'