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

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Sat May 19 06:20:28 UTC 2012 

Author: biebl
Date: Sat May 19 06:20:27 2012
New Revision: 35033

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35033
Log:
Re-enable 10-make-NetworkManager-optional.patch after fixing it.

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

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=35033&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] Sat May 19 06:20:27 2012
@@ -1,4 +1,4 @@
-From df21e761fc02cf1269a7bbee073b8a129cba1dcd Mon Sep 17 00:00:00 2001
+From 411d751935c9bdc485b113678284edf0cc9e545e Mon Sep 17 00:00:00 2001
 From: Michael Biebl <biebl at debian.org>
 Date: Thu, 22 Dec 2011 22:04:12 +0100
 Subject: [PATCH] Make NM optional
@@ -13,18 +13,19 @@
     BIKESHED SHOULD BE BLUE, also because the upstream package name is
     NetworkManager, not Network_Manager. ]
 ---
- configure.ac         |   49 +++++++++++++++++++++++++++++++++++++++++++++++--
+ configure.ac         |   47 ++++++++++++++++++++++++++++++++++++++++++++++-
+ js/Makefile.am       |    1 +
  js/misc/config.js.in |    2 ++
  js/ui/main.js        |    8 ++++++--
  js/ui/panel.js       |    3 ++-
- src/Makefile.am      |   18 +++++++++++++-----
- 5 files changed, 70 insertions(+), 10 deletions(-)
+ src/Makefile.am      |   17 ++++++++++++-----
+ 6 files changed, 69 insertions(+), 9 deletions(-)
 
-Index: gnome-shell-3.4.1/configure.ac
-===================================================================
---- gnome-shell-3.4.1.orig/configure.ac	2012-04-17 18:28:28.000000000 -0400
-+++ gnome-shell-3.4.1/configure.ac	2012-04-17 18:40:07.624267027 -0400
-@@ -94,9 +94,42 @@
+diff --git a/configure.ac b/configure.ac
+index c6ad636..f228ebd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -94,9 +94,42 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
                                 telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
                                 telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
                                 polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
@@ -68,7 +69,7 @@
  PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
  
  PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
-@@ -284,3 +317,15 @@
+@@ -289,3 +322,15 @@ AC_CONFIG_FILES([
    man/Makefile
  ])
  AC_OUTPUT
@@ -84,11 +85,23 @@
 +	Support for NetworkManager:             $have_networkmanager
 +	Support for GStreamer recording:        $build_recorder
 +"
-Index: gnome-shell-3.4.1/js/misc/config.js.in
-===================================================================
---- gnome-shell-3.4.1.orig/js/misc/config.js.in	2012-02-16 12:17:56.000000000 -0500
-+++ gnome-shell-3.4.1/js/misc/config.js.in	2012-04-17 18:37:15.315412586 -0400
-@@ -8,6 +8,8 @@
+diff --git a/js/Makefile.am b/js/Makefile.am
+index e7751cc..5eb4c18 100644
+--- a/js/Makefile.am
++++ b/js/Makefile.am
+@@ -8,6 +8,7 @@ misc/config.js: misc/config.js.in Makefile
+ 	    -e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
+ 	    -e "s|[@]GJS_VERSION@|$(GJS_VERSION)|g" \
+ 	    -e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
++	    -e "s|[@]HAVE_NETWORKMANAGER@|$(HAVE_NETWORKMANAGER)|g" \
+ 	    -e "s|[@]SHELL_SYSTEM_CA_FILE@|$(SHELL_SYSTEM_CA_FILE)|g" \
+ 	    -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
+ 	    -e "s|[@]datadir@|$(datadir)|g" \
+diff --git a/js/misc/config.js.in b/js/misc/config.js.in
+index 4a0db16..3df3394 100644
+--- a/js/misc/config.js.in
++++ b/js/misc/config.js.in
+@@ -8,6 +8,8 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
  const GJS_VERSION = '@GJS_VERSION@';
  /* 1 if gnome-bluetooth is available, 0 otherwise */
  const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
@@ -97,11 +110,11 @@
  /* The system TLS CA list */
  const SHELL_SYSTEM_CA_FILE = '@SHELL_SYSTEM_CA_FILE@';
  /* gettext package */
-Index: gnome-shell-3.4.1/js/ui/main.js
-===================================================================
---- gnome-shell-3.4.1.orig/js/ui/main.js	2012-04-16 12:41:48.000000000 -0400
-+++ gnome-shell-3.4.1/js/ui/main.js	2012-04-17 18:37:15.315412586 -0400
-@@ -12,6 +12,7 @@
+diff --git a/js/ui/main.js b/js/ui/main.js
+index ac9330c..7ca91ee 100644
+--- a/js/ui/main.js
++++ b/js/ui/main.js
+@@ -12,6 +12,7 @@ const St = imports.gi.St;
  
  const AutomountManager = imports.ui.automountManager;
  const AutorunManager = imports.ui.autorunManager;
@@ -109,7 +122,7 @@
  const CtrlAltTab = imports.ui.ctrlAltTab;
  const EndSessionDialog = imports.ui.endSessionDialog;
  const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
-@@ -26,7 +27,7 @@
+@@ -26,7 +27,7 @@ const PlaceDisplay = imports.ui.placeDisplay;
  const RunDialog = imports.ui.runDialog;
  const Layout = imports.ui.layout;
  const LookingGlass = imports.ui.lookingGlass;
@@ -118,7 +131,7 @@
  const NotificationDaemon = imports.ui.notificationDaemon;
  const WindowAttentionHandler = imports.ui.windowAttentionHandler;
  const Scripting = imports.ui.scripting;
-@@ -85,7 +86,10 @@
+@@ -85,7 +86,10 @@ function _createUserSession() {
      telepathyClient = new TelepathyClient.Client();
      automountManager = new AutomountManager.AutomountManager();
      autorunManager = new AutorunManager.AutorunManager();
@@ -130,11 +143,11 @@
  }
  
  function _createGDMSession() {
-Index: gnome-shell-3.4.1/js/ui/panel.js
-===================================================================
---- gnome-shell-3.4.1.orig/js/ui/panel.js	2012-03-30 18:19:00.000000000 -0400
-+++ gnome-shell-3.4.1/js/ui/panel.js	2012-04-17 18:37:15.319412608 -0400
-@@ -45,7 +45,8 @@
+diff --git a/js/ui/panel.js b/js/ui/panel.js
+index 329f118..865ce05 100644
+--- a/js/ui/panel.js
++++ b/js/ui/panel.js
+@@ -45,7 +45,8 @@ if (Config.HAVE_BLUETOOTH)
      STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
  
  try {
@@ -144,11 +157,11 @@
  } catch(e) {
      log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
  }
-Index: gnome-shell-3.4.1/src/Makefile.am
-===================================================================
---- gnome-shell-3.4.1.orig/src/Makefile.am	2012-04-16 13:47:21.000000000 -0400
-+++ gnome-shell-3.4.1/src/Makefile.am	2012-04-17 18:43:48.345361524 -0400
-@@ -110,9 +110,7 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 95f1a41..637455e 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -110,9 +110,7 @@ shell_public_headers_h =		\
  	shell-gtk-embed.h		\
  	shell-global.h			\
  	shell-idle-monitor.h		\
@@ -158,7 +171,7 @@
  	shell-perf-log.h		\
  	shell-screenshot.h		\
  	shell-screen-grabber.h		\
-@@ -134,6 +132,10 @@
+@@ -134,6 +132,10 @@ shell_private_sources = \
  	gactionobserver.h		\
  	gactionobserver.c
  
@@ -169,7 +182,7 @@
  libgnome_shell_la_SOURCES =		\
  	$(shell_built_sources)		\
  	$(shell_public_headers_h)	\
-@@ -159,9 +161,7 @@
+@@ -159,9 +161,7 @@ libgnome_shell_la_SOURCES =		\
  	shell-idle-monitor.c		\
  	shell-keyring-prompt.h		\
  	shell-keyring-prompt.c		\
@@ -179,22 +192,22 @@
  	shell-perf-log.c		\
  	shell-polkit-authentication-agent.h	\
  	shell-polkit-authentication-agent.c	\
-@@ -180,6 +180,9 @@
- 	shell-xfixes-cursor.c		\
+@@ -181,6 +181,10 @@ libgnome_shell_la_SOURCES =		\
  	$(NULL)
+ 
  
 +if HAVE_NETWORKMANAGER
 +libgnome_shell_la_SOURCES += shell-mobile-providers.c shell-network-agent.c
 +endif
- 
++
  libgnome_shell_la_gir_sources = \
  	$(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
-@@ -296,7 +299,11 @@
+ 
+@@ -296,7 +300,10 @@ libgnome_shell_la_LIBADD =		\
  libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
  
  Shell-0.1.gir: libgnome-shell.la St-1.0.gir
 -Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 Folks-0.6
-+
 +Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 Folks-0.6
 +if HAVE_NETWORKMANAGER
 +Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
@@ -202,3 +215,6 @@
  Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
  Shell_0_1_gir_LIBS = libgnome-shell.la
  Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
+-- 
+1.7.8.5
+

Modified: desktop/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/series?rev=35033&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/series [utf-8] Sat May 19 06:20:27 2012
@@ -1,3 +1,3 @@
-#10-make-NetworkManager-optional.patch
+10-make-NetworkManager-optional.patch
 11-no-gettext.patch
 14_make-GLX-optional.patch

More information about the pkg-gnome-commits mailing list