r39264 - in /desktop/unstable/gnome-user-share/debian: changelog patches/02_bluetooth_optional.patch

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Fri Aug 23 21:34:01 UTC 2013 

Author: biebl
Date: Fri Aug 23 21:34:01 2013
New Revision: 39264

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39264
Log:
Refresh 02_bluetooth_optional.patch.

Modified:
    desktop/unstable/gnome-user-share/debian/changelog
    desktop/unstable/gnome-user-share/debian/patches/02_bluetooth_optional.patch

Modified: desktop/unstable/gnome-user-share/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/changelog?rev=39264&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/changelog	[utf-8] Fri Aug 23 21:34:01 2013
@@ -1,6 +1,7 @@
 gnome-user-share (3.8.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refresh 02_bluetooth_optional.patch.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 23 Aug 2013 23:26:41 +0200
 

Modified: desktop/unstable/gnome-user-share/debian/patches/02_bluetooth_optional.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/patches/02_bluetooth_optional.patch?rev=39264&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/patches/02_bluetooth_optional.patch	[utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/patches/02_bluetooth_optional.patch	[utf-8] Fri Aug 23 21:34:01 2013
@@ -20,11 +20,11 @@
  src/user_share.c      |   31 ++++++++++++++++++++++++++++++-
  4 files changed, 69 insertions(+), 8 deletions(-)
 
-diff --git a/configure.ac b/configure.ac
-index 4208716..6d3a4e7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -54,10 +54,19 @@ fi
+Index: gnome-user-share-3.8.3/configure.ac
+===================================================================
+--- gnome-user-share-3.8.3.orig/configure.ac	2013-08-23 23:28:14.302349546 +0200
++++ gnome-user-share-3.8.3/configure.ac	2013-08-23 23:28:14.290349391 +0200
+@@ -54,10 +54,19 @@
  
  AC_SUBST(HTTPD)
  
@@ -45,7 +45,7 @@
  AC_CHECK_LIB(socket, socket)
  
  have_socket=no
-@@ -124,7 +133,7 @@ AC_ARG_WITH(nautilusdir,
+@@ -124,7 +133,7 @@
  	    [ac_with_nautilusdir=""])
  
  PKG_CHECK_MODULES(EXTENSION,
@@ -54,11 +54,11 @@
  if test "${ac_with_nautilusdir}" = ""; then
  	ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
  fi
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d49a70c..9787073 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -27,6 +27,7 @@ INCLUDES=	\
+Index: gnome-user-share-3.8.3/src/Makefile.am
+===================================================================
+--- gnome-user-share-3.8.3.orig/src/Makefile.am	2013-08-23 23:28:14.302349546 +0200
++++ gnome-user-share-3.8.3/src/Makefile.am	2013-08-23 23:28:14.294349441 +0200
+@@ -27,6 +27,7 @@
  	-I$(top_builddir) 				\
  	$(EXTENSION_CFLAGS)				\
  	$(USER_SHARE_CFLAGS)				\
@@ -66,7 +66,7 @@
  	$(X_CFLAGS)
  
  gnome_user_share_SOURCES =	\
-@@ -36,10 +37,6 @@ gnome_user_share_SOURCES =	\
+@@ -36,10 +37,6 @@
  	user_share-private.c	\
  	http.c			\
  	http.h			\
@@ -77,7 +77,7 @@
  	$(MARSHALFILES)
  
  gnome_user_share_LDADD =	\
-@@ -48,6 +45,15 @@ gnome_user_share_LDADD =	\
+@@ -48,6 +45,15 @@
  	$(SELINUX_LIBS)	\
  	$(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
  
@@ -93,7 +93,7 @@
  nautilus_extensiondir = $(NAUTILUSDIR)
  nautilus_extension_LTLIBRARIES = libnautilus-share-extension.la
  
-@@ -60,6 +66,10 @@ libnautilus_share_extension_la_SOURCES =	\
+@@ -60,6 +66,10 @@
  libnautilus_share_extension_la_LIBADD = libuser-share-common.la $(EXTENSION_LIBS)
  libnautilus_share_extension_la_LDFLAGS = -avoid-version -module -no-undefined
  
@@ -104,10 +104,10 @@
  EXTRA_DIST = marshal.list
  
  CLEANFILES = $(BUILT_SOURCES)
-diff --git a/src/share-extension.c b/src/share-extension.c
-index 7e81b5a..b9e0df4 100644
---- a/src/share-extension.c
-+++ b/src/share-extension.c
+Index: gnome-user-share-3.8.3/src/share-extension.c
+===================================================================
+--- gnome-user-share-3.8.3.orig/src/share-extension.c	2013-08-23 23:28:14.302349546 +0200
++++ gnome-user-share-3.8.3/src/share-extension.c	2013-08-23 23:28:14.294349441 +0200
 @@ -28,10 +28,13 @@
  #include <glib/gi18n-lib.h>
  #include <gio/gdesktopappinfo.h>
@@ -123,7 +123,7 @@
  #include "nautilus-share-bar.h"
  #include "user_share-common.h"
  
-@@ -89,6 +92,7 @@ bar_response_cb (NautilusShareBar *bar,
+@@ -89,6 +92,7 @@
                  launch_prefs_on_window ();
  }
  
@@ -131,7 +131,7 @@
  static void
  downloads_bar_set_from_bluetooth_status (GtkWidget *bar)
  {
-@@ -109,6 +113,7 @@ default_adapter_powered_cb (GObject    *gobject,
+@@ -109,6 +113,7 @@
  {
  	downloads_bar_set_from_bluetooth_status (bar);
  }
@@ -139,7 +139,7 @@
  
  static GtkWidget *
  nautilus_user_share_get_location_widget (NautilusLocationWidgetProvider *iface,
-@@ -151,8 +156,13 @@ nautilus_user_share_get_location_widget (NautilusLocationWidgetProvider *iface,
+@@ -151,8 +156,13 @@
  	if (is_dir[0] != FALSE && is_dir[1] != FALSE) {
  		bar = nautilus_share_bar_new (_("May be used to share or receive files"));
  	} else if (is_dir[0] != FALSE) {
@@ -153,7 +153,7 @@
  		BluetoothClient *client;
  
  		bar = nautilus_share_bar_new (_("May be used to receive files over Bluetooth"));
-@@ -162,6 +172,9 @@ nautilus_user_share_get_location_widget (NautilusLocationWidgetProvider *iface,
+@@ -162,6 +172,9 @@
  		g_signal_connect (G_OBJECT (client), "notify::default-adapter-powered",
  				  G_CALLBACK (default_adapter_powered_cb), bar);
  		downloads_bar_set_from_bluetooth_status (bar);
@@ -163,10 +163,10 @@
  	}
  
  	g_signal_connect (bar, "response",
-diff --git a/src/user_share.c b/src/user_share.c
-index 3bcec7f..139bacd 100644
---- a/src/user_share.c
-+++ b/src/user_share.c
+Index: gnome-user-share-3.8.3/src/user_share.c
+===================================================================
+--- gnome-user-share-3.8.3.orig/src/user_share.c	2013-08-23 23:28:14.302349546 +0200
++++ gnome-user-share-3.8.3/src/user_share.c	2013-08-23 23:29:50.479583807 +0200
 @@ -27,7 +27,6 @@
  #include <gtk/gtk.h>
  #include <glib/gi18n.h>
@@ -175,7 +175,7 @@
  #include <gio/gio.h>
  #include <X11/Xlib.h>
  
-@@ -35,11 +34,16 @@
+@@ -35,8 +34,13 @@
  #include "user_share-private.h"
  #include "user_share-common.h"
  #include "http.h"
@@ -185,14 +185,11 @@
 +
  #include "obexftp.h"
  #include "obexpush.h"
- 
- #include <dbus/dbus.h>
- #include <dbus/dbus-glib.h>
 +#endif /* HAVE_BLUETOOTH */
  
  #include <stdarg.h>
  #include <string.h>
-@@ -56,6 +60,8 @@
+@@ -53,6 +57,8 @@
  static GSettings *settings = NULL;
  
  static guint disabled_timeout_tag = 0;
@@ -201,7 +198,7 @@
  static GDBusProxy *session_proxy = NULL;
  static gboolean has_console = TRUE;
  
-@@ -185,6 +191,7 @@ bluez_init (void)
+@@ -182,6 +188,7 @@
  	g_signal_connect (G_OBJECT (client), "notify::default-adapter-powered",
  			  G_CALLBACK (default_adapter_changed), NULL);
  }
@@ -209,7 +206,7 @@
  
  static void
  migrate_old_configuration (void)
-@@ -216,9 +223,13 @@ disabled_timeout_callback (void)
+@@ -213,9 +220,13 @@
  {
  	http_down ();
  
@@ -223,7 +220,7 @@
  	return FALSE;
  }
  
-@@ -246,6 +257,7 @@ file_sharing_enabled_changed (void)
+@@ -243,6 +254,7 @@
  	}
  }
  
@@ -231,7 +228,7 @@
  static void
  file_sharing_bluetooth_allow_write_changed (void)
  {
-@@ -312,6 +324,7 @@ file_sharing_bluetooth_obexpush_notify_changed (void)
+@@ -309,6 +321,7 @@
  {
  	obexpush_set_notify (g_settings_get_boolean (settings, FILE_SHARING_BLUETOOTH_OBEXPUSH_NOTIFY));
  }
@@ -239,7 +236,7 @@
  
  static void
  setttings_changed (GSettings *settings,
-@@ -324,6 +337,7 @@ setttings_changed (GSettings *settings,
+@@ -321,6 +334,7 @@
  	else if (g_strcmp0 (FILE_SHARING_REQUIRE_PASSWORD, path) == 0)
  		require_password_changed ();
  
@@ -247,7 +244,7 @@
  	else if (g_strcmp0 (FILE_SHARING_BLUETOOTH_ENABLED, path) == 0)
  		file_sharing_bluetooth_enabled_changed ();
  
-@@ -341,14 +355,17 @@ setttings_changed (GSettings *settings,
+@@ -338,14 +352,17 @@
  
  	else if (g_strcmp0 (FILE_SHARING_BLUETOOTH_OBEXPUSH_NOTIFY, path) == 0)
  		file_sharing_bluetooth_obexpush_notify_changed ();
@@ -265,7 +262,7 @@
  	_exit (2);
  }
  
-@@ -356,7 +373,9 @@ static int
+@@ -353,7 +370,9 @@
  x_io_error_handler (Display *xdisplay)
  {
  	http_down ();
@@ -275,7 +272,7 @@
  	_exit (2);
  }
  
-@@ -411,10 +430,14 @@ main (int argc, char **argv)
+@@ -408,10 +427,14 @@
  
  	migrate_old_configuration ();
  
@@ -290,7 +287,7 @@
  		return 1;
  
  	x_fd = ConnectionNumber (xdisplay);
-@@ -422,22 +445,28 @@ main (int argc, char **argv)
+@@ -419,22 +442,28 @@
  
  	if (http_init () == FALSE)
  		return 1;
@@ -319,6 +316,3 @@
  
  	gtk_main ();
  	g_object_unref (settings);
--- 
-1.7.10.4
-

More information about the pkg-gnome-commits mailing list