r39705 - in /desktop/experimental/gnome-shell/debian: changelog patches/10-make-NetworkManager-optional.patch

[pochu at users.alioth.debian.org]

Author: pochu
Date: Tue Oct  8 15:53:08 2013
New Revision: 39705

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39705
Log:
* debian/patches/10-make-NetworkManager-optional.patch:
  + Drop gnome-keyring-1 check, leftover from the 3.4 patch.

Modified:
    desktop/experimental/gnome-shell/debian/changelog
    desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch

Modified: desktop/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/changelog?rev=39705&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/changelog	[utf-8] Tue Oct  8 15:53:08 2013
@@ -2,6 +2,8 @@
 
   * debian/rules:
     + Explicitly enable NetworkManager support on linux. Closes: #725760.
+  * debian/patches/10-make-NetworkManager-optional.patch:
+    + Drop gnome-keyring-1 check, leftover from the 3.4 patch.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 08 Oct 2013 17:42:06 +0200
 

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=39705&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] Tue Oct  8 15:53:08 2013
@@ -136,7 +136,7 @@
                                 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,38 @@
+@@ -154,6 +152,37 @@
              [Define if _NL_TIME_FIRST_WEEKDAY is available])
  fi
  
@@ -149,8 +149,7 @@
 +   PKG_CHECK_MODULES(NETWORKMANAGER,
 +                     [libnm-glib 
 +                     libnm-util >= $NETWORKMANAGER_MIN_VERSION
-+                     libnm-gtk >= $NETWORKMANAGER_MIN_VERSION 
-+                     gnome-keyring-1],
++                     libnm-gtk >= $NETWORKMANAGER_MIN_VERSION],
 +                     [have_networkmanager=yes],
 +                     [have_networkmanager=no])
 +
@@ -175,7 +174,7 @@
  # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
  AM_PATH_GLIB_2_0()
  
-@@ -199,3 +229,15 @@
+@@ -199,3 +228,15 @@
    man/Makefile
  ])
  AC_OUTPUT