r45271 - in /desktop/unstable/gnome-shell/debian: changelog patches/10-make-NetworkManager-optional.patch patches/27-nm-libexec-path.patch patches/41-handle-logind-fail.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Jun 15 18:52:51 2015
New Revision: 45271

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45271
Log:
Drop debian/patches/10-make-NetworkManager-optional.patch, merged
upstream. Refresh remaining patches.

Removed:
    desktop/unstable/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/27-nm-libexec-path.patch
    desktop/unstable/gnome-shell/debian/patches/41-handle-logind-fail.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=45271&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog	[utf-8] Mon Jun 15 18:52:51 2015
@@ -1,3 +1,10 @@
+gnome-shell (3.16.2-4) UNRELEASED; urgency=medium
+
+  * Drop debian/patches/10-make-NetworkManager-optional.patch, merged
+    upstream. Refresh remaining patches.
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 15 Jun 2015 20:51:28 +0200
+
 gnome-shell (3.16.2-3) unstable; urgency=medium
 
   * Upload to unstable.

Modified: desktop/unstable/gnome-shell/debian/patches/27-nm-libexec-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/27-nm-libexec-path.patch?rev=45271&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/27-nm-libexec-path.patch	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/27-nm-libexec-path.patch	[utf-8] Mon Jun 15 18:52:51 2015
@@ -2,9 +2,11 @@
 Author: Laurent Bigonville <bigon at debian.org>
 Forwarded: not-needed
 
---- a/js/ui/components/networkAgent.js
-+++ b/js/ui/components/networkAgent.js
-@@ -718,7 +718,7 @@ const NetworkAgent = new Lang.Class({
+Index: gnome-shell-3.16.2/js/ui/components/networkAgent.js
+===================================================================
+--- gnome-shell-3.16.2.orig/js/ui/components/networkAgent.js	2015-06-15 20:46:20.285766160 +0200
++++ gnome-shell-3.16.2/js/ui/components/networkAgent.js	2015-06-15 20:46:20.281766245 +0200
+@@ -793,7 +793,7 @@
  
                      let path = binary;
                      if (!GLib.path_is_absolute(path)) {

Modified: desktop/unstable/gnome-shell/debian/patches/41-handle-logind-fail.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/41-handle-logind-fail.patch?rev=45271&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/41-handle-logind-fail.patch	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/41-handle-logind-fail.patch	[utf-8] Mon Jun 15 18:52:51 2015
@@ -9,9 +9,11 @@
 
 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=729877
 
---- a/js/misc/loginManager.js
-+++ b/js/misc/loginManager.js
-@@ -117,7 +117,7 @@
+Index: gnome-shell-3.16.2/js/misc/loginManager.js
+===================================================================
+--- gnome-shell-3.16.2.orig/js/misc/loginManager.js	2015-06-15 20:46:24.805673265 +0200
++++ gnome-shell-3.16.2/js/misc/loginManager.js	2015-06-15 20:46:24.801673346 +0200
+@@ -90,7 +90,7 @@
   */
  function getLoginManager() {
      if (_loginManager == null) {

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=45271&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series	[utf-8] Mon Jun 15 18:52:51 2015
@@ -1,4 +1,3 @@
-#10-make-NetworkManager-optional.patch
 #10_background_race.patch
 27-nm-libexec-path.patch
 #30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch