r32436 - in /desktop/unstable/gnome-shell/debian: ./ patches/

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jan 25 09:56:00 2012
New Revision: 32436

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32436
Log:
* New upstream release:
  - Fix a crash in gnome-shell-extension-tool. Closes: #649583
  - Remove 05-NetworkMenu-don-t-query-DBus-properties-of-removed-o.patch.
  - Remove 06-NetworkMenu-fix-regression-in-access-point-removed.patch.
  - Refresh 07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch.

Removed:
    desktop/unstable/gnome-shell/debian/patches/05-NetworkMenu-don-t-query-DBus-properties-of-removed-o.patch
    desktop/unstable/gnome-shell/debian/patches/06-NetworkMenu-fix-regression-in-access-point-removed.patch
    desktop/unstable/gnome-shell/debian/patches/12-gnome-shell-extension-tool-Fix-error-after-creating-.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch
    desktop/unstable/gnome-shell/debian/patches/series

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=32436&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog [utf-8] Wed Jan 25 09:56:00 2012
@@ -1,4 +1,4 @@
-gnome-shell (3.2.1-9) UNRELEASED; urgency=low
+gnome-shell (3.2.2.1-1) UNRELEASED; urgency=low
 
   [ Michael Biebl ]
   * debian/patches/10-make-NetworkManager-optional.patch: make NM
@@ -14,9 +14,11 @@
   * Update repository URL.
 
   [ Michael Biebl ]
-  * d/p/12-gnome-shell-extension-tool-Fix-error-after-creating-.patch:
-    Cherry-pick patch from upstream Git to fix a crash in
-    gnome-shell-extension-tool. Closes: #649583
+  * New upstream release:
+    - Fix a crash in gnome-shell-extension-tool. Closes: #649583
+    - Remove 05-NetworkMenu-don-t-query-DBus-properties-of-removed-o.patch.
+    - Remove 06-NetworkMenu-fix-regression-in-access-point-removed.patch.
+    - Refresh 07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch.
   * debian/control.in: Bump dependency on python to (>= 2.6) since we require
     JSON support. Closes: #580869
 

Modified: desktop/unstable/gnome-shell/debian/patches/07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch?rev=32436&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch [utf-8] Wed Jan 25 09:56:00 2012
@@ -13,11 +13,11 @@
  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 = {
+Index: gnome-shell-3.2.2/js/ui/status/network.js
+===================================================================
+--- gnome-shell-3.2.2.orig/js/ui/status/network.js	2012-01-18 16:21:37.000000000 +0100
++++ gnome-shell-3.2.2/js/ui/status/network.js	2012-01-18 17:25:26.810778212 +0100
+@@ -2065,10 +2065,11 @@
                          }
                          this.setIcon('network-wireless-connected');
                      } else {
@@ -32,7 +32,7 @@
                                  this.setIcon('network-wireless-signal-' + signalToIcon(ap.strength));
                              }));
                          }
-@@ -2091,8 +2092,9 @@ NMApplet.prototype = {
+@@ -2095,8 +2096,9 @@
                      break;
                  }
  
@@ -44,6 +44,3 @@
                      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
-

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=32436&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series [utf-8] Wed Jan 25 09:56:00 2012
@@ -1,10 +1,10 @@
 02_rpath-bluetooth-applet.patch
 04_remove-glx-dependency-on-armel.patch
-05-NetworkMenu-don-t-query-DBus-properties-of-removed-o.patch
-06-NetworkMenu-fix-regression-in-access-point-removed.patch
+#05-NetworkMenu-don-t-query-DBus-properties-of-removed-o.patch
+#06-NetworkMenu-fix-regression-in-access-point-removed.patch
 07-NetworkMenu-fix-logic-for-updating-wifi-icon.patch
 08-polkit-Find-the-best-user-to-authenticate-as.patch
 09-respect-NoDisplay-semantics-for-app-menu.patch
 10-make-NetworkManager-optional.patch
 11-no-gettext.patch
-12-gnome-shell-extension-tool-Fix-error-after-creating-.patch
+#12-gnome-shell-extension-tool-Fix-error-after-creating-.patch