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

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sun Apr 29 09:33:57 UTC 2012 

Author: sjoerd
Date: Sun Apr 29 09:33:56 2012
New Revision: 34648

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34648
Log:
* New upstream release
* debian/patches/02_bluetooth_optional.patch
  + Updated

Modified:
    desktop/unstable/gnome-user-share/debian/changelog
    desktop/unstable/gnome-user-share/debian/control
    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=34648&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/changelog [utf-8] Sun Apr 29 09:33:56 2012
@@ -1,8 +1,14 @@
-gnome-user-share (3.0.1-2) UNRELEASED; urgency=low
-
+gnome-user-share (3.0.2-1) UNRELEASED; urgency=low
+
+  [ Sebastien Bacher ]
   * debian/control.in, debian/rules: don't use scrollkeeper
 
- -- Sebastien Bacher <seb128 at debian.org>  Tue, 22 Nov 2011 16:43:09 +0100
+  [ Sjoerd Simons ]
+  * New upstream release
+  * debian/patches/02_bluetooth_optional.patch
+    + Updated
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 29 Apr 2012 11:20:24 +0200
 
 gnome-user-share (3.0.1-1) unstable; urgency=low
 

Modified: desktop/unstable/gnome-user-share/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-user-share/debian/control?rev=34648&op=diff
==============================================================================
--- desktop/unstable/gnome-user-share/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-user-share/debian/control [utf-8] Sun Apr 29 09:33:56 2012
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andrea Veri <and at debian.org>, Josselin Mouette <joss at debian.org>, Luca Falavigna <dktrkranz at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andrea Veri <and at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 8),
                dh-autoreconf,

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=34648&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] Sun Apr 29 09:33:56 2012
@@ -1,13 +1,32 @@
-Index: gnome-user-share-3.0.0/configure.in
-===================================================================
---- gnome-user-share-3.0.0.orig/configure.in	2011-04-04 15:14:32.000000000 +0200
-+++ gnome-user-share-3.0.0/configure.in	2011-05-31 23:14:22.776318967 +0200
-@@ -56,10 +56,21 @@ if $have_dbus_1_1 ; then
+From 393871d5d3a4817f88385d1a17888f53fad35190 Mon Sep 17 00:00:00 2001
+From: Josselin Mouette <joss at malsain.org>
+Date: Sun, 29 Apr 2012 11:16:04 +0200
+Subject: [PATCH] Make bluetooth support optional
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+As gnome-bluetooth doesn’t build on non-Linux architectures, bluetooth
+support in gnome-user-share needs to be optional to allow it to build on
+non-linux.
+---
+ configure.in                  |   15 +++++++++++++-
+ data/file-share-properties.ui |   10 +++++-----
+ src/Makefile.am               |   14 +++++++++----
+ src/file-share-properties.c   |   44 ++++++++++++++++++++++++++++++++++++-----
+ src/user_share.c              |   34 +++++++++++++++++++++++++++++--
+ 5 files changed, 100 insertions(+), 17 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 17f7f11..c7e9621 100644
+--- a/configure.in
++++ b/configure.in
+@@ -59,10 +59,23 @@ if $have_dbus_1_1 ; then
     AC_DEFINE(HAVE_DBUS_1_1, 1, [Set to true if we have D-BUS 1.1])
  fi
  
--PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 gtk+-3.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk3 $DBUS_MODULES gnome-bluetooth-1.0 >= 2.91.5)
-+PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.15.2 gio-2.0 gtk+-3.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk3 $DBUS_MODULES)
+-PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.28 gio-2.0 gtk+-3.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk3 $DBUS_MODULES gnome-bluetooth-1.0 >= 2.91.5)
++PKG_CHECK_MODULES(USER_SHARE, glib-2.0 >= 2.28 gio-2.0 gtk+-3.0 gconf-2.0 dbus-glib-1 libnotify libcanberra-gtk3 $DBUS_MODULES)
  AC_SUBST(USER_SHARE_CFLAGS)
  AC_SUBST(USER_SHARE_LIBS)
  
@@ -22,13 +41,15 @@
 +fi
 +AM_CONDITIONAL(USE_BLUETOOTH, [test "$have_bluetooth" = "true"])
 +
- PKG_CHECK_MODULES(USER_SHARE_CONFIG, glib-2.0 >= 2.15.2 gtk+-3.0 >= 2.12.0 gconf-2.0 unique-3.0)
++
++
+ PKG_CHECK_MODULES(USER_SHARE_CONFIG, glib-2.0 >= 2.28 gtk+-3.0 >= 2.12.0 gconf-2.0)
  AC_SUBST(USER_SHARE_CONFIG_CFLAGS)
  AC_SUBST(USER_SHARE_CONFIG_LIBS)
-Index: gnome-user-share-3.0.0/data/file-share-properties.ui
-===================================================================
---- gnome-user-share-3.0.0.orig/data/file-share-properties.ui	2011-04-04 15:13:53.000000000 +0200
-+++ gnome-user-share-3.0.0/data/file-share-properties.ui	2011-05-31 23:12:46.171846466 +0200
+diff --git a/data/file-share-properties.ui b/data/file-share-properties.ui
+index 6c4f053..088e2ed 100644
+--- a/data/file-share-properties.ui
++++ b/data/file-share-properties.ui
 @@ -18,7 +18,7 @@
              <property name="border_width">5</property>
              <property name="spacing">18</property>
@@ -60,10 +81,10 @@
                  <property name="spacing">6</property>
                  <child>
                    <object class="GtkLabel" id="label8">
-Index: gnome-user-share-3.0.0/src/Makefile.am
-===================================================================
---- gnome-user-share-3.0.0.orig/src/Makefile.am	2010-03-02 15:36:45.000000000 +0100
-+++ gnome-user-share-3.0.0/src/Makefile.am	2011-05-31 23:12:46.171846466 +0200
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 09e82e3..fb28157 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -31,6 +31,7 @@ INCLUDES=	\
  	-I$(top_builddir) 				\
  	$(EXTENSION_CFLAGS)				\
@@ -99,11 +120,11 @@
  gnome_file_share_properties_SOURCES =	\
  	file-share-properties.c		\
  	user_share-private.h		\
-Index: gnome-user-share-3.0.0/src/file-share-properties.c
-===================================================================
---- gnome-user-share-3.0.0.orig/src/file-share-properties.c	2010-03-02 15:36:45.000000000 +0100
-+++ gnome-user-share-3.0.0/src/file-share-properties.c	2011-05-31 23:12:46.175846481 +0200
-@@ -86,26 +86,39 @@ static void
+diff --git a/src/file-share-properties.c b/src/file-share-properties.c
+index 4d8473d..52108f8 100644
+--- a/src/file-share-properties.c
++++ b/src/file-share-properties.c
+@@ -85,26 +85,39 @@ static void
  update_ui (void)
  {
      GConfClient *client;
@@ -144,7 +165,7 @@
      bluetooth_enabled = gconf_client_get_bool (client,
      					       FILE_SHARING_BLUETOOTH_ENABLED,
      					       NULL);
-@@ -122,23 +135,24 @@ update_ui (void)
+@@ -121,23 +134,24 @@ update_ui (void)
      						       FILE_SHARING_BLUETOOTH_OBEXPUSH_NOTIFY,
      						       NULL);
  
@@ -173,7 +194,7 @@
  
      /* Network */
      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), enabled);
-@@ -148,7 +162,9 @@ update_ui (void)
+@@ -147,7 +161,9 @@ update_ui (void)
      gtk_combo_box_set_active (GTK_COMBO_BOX (password_combo),
  			      password_setting);
  
@@ -183,7 +204,7 @@
      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bluetooth_check), bluetooth_enabled);
      gtk_widget_set_sensitive (allow_write_bluetooth_check, bluetooth_enabled);
      gtk_widget_set_sensitive (require_pairing_check, bluetooth_enabled);
-@@ -159,6 +175,7 @@ update_ui (void)
+@@ -158,6 +174,7 @@ update_ui (void)
      				  require_pairing_enabled);
  
      /* Bluetooth ObexPush */
@@ -191,7 +212,7 @@
      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (enable_obexpush_check), bluetooth_obexpush_enabled);
      gtk_widget_set_sensitive (accept_obexpush_combo, bluetooth_obexpush_enabled);
      gtk_widget_set_sensitive (notify_received_obexpush_check, bluetooth_obexpush_enabled);
-@@ -168,6 +185,7 @@ update_ui (void)
+@@ -167,6 +184,7 @@ update_ui (void)
  
      gtk_combo_box_set_active (GTK_COMBO_BOX (accept_obexpush_combo),
      			      accept_setting);
@@ -199,7 +220,7 @@
  
      g_object_unref (client);
  }
-@@ -190,6 +208,7 @@ password_required_changed (GConfClient*
+@@ -189,6 +207,7 @@ password_required_changed (GConfClient* client,
      update_ui ();
  }
  
@@ -207,7 +228,7 @@
  static void
  file_sharing_bluetooth_enabled_changed (GConfClient* client,
  					guint cnxn_id,
-@@ -243,6 +262,7 @@ file_sharing_bluetooth_obexpush_notify_c
+@@ -242,6 +261,7 @@ file_sharing_bluetooth_obexpush_notify_changed (GConfClient* client,
  {
  	update_ui ();
  }
@@ -215,7 +236,7 @@
  
  static void
  password_combo_changed (GtkComboBox *combo_box)
-@@ -283,6 +303,7 @@ launch_share (void)
+@@ -282,6 +302,7 @@ launch_share (void)
  	}
  }
  
@@ -223,7 +244,7 @@
  static void
  enable_bluetooth_check_toggled (GtkWidget *check)
  {
-@@ -303,6 +324,7 @@ enable_bluetooth_check_toggled (GtkWidge
+@@ -302,6 +323,7 @@ enable_bluetooth_check_toggled (GtkWidget *check)
  	if (enabled != FALSE)
  		launch_share ();
  }
@@ -231,7 +252,7 @@
  
  static void
  enable_check_toggled (GtkWidget *check)
-@@ -333,6 +355,7 @@ password_entry_changed (GtkEditable *edi
+@@ -332,6 +354,7 @@ password_entry_changed (GtkEditable *editable)
  	flush_password ();
  }
  
@@ -239,7 +260,7 @@
  static void
  bluetooth_allow_write_check_toggled (GtkWidget *check)
  {
-@@ -424,6 +447,7 @@ notify_received_obexpush_check_toggled (
+@@ -423,6 +446,7 @@ notify_received_obexpush_check_toggled (GtkWidget *check)
  
  	g_object_unref (client);
  }
@@ -247,7 +268,7 @@
  
  static GtkWidget *
  error_dialog (const char *title,
-@@ -490,12 +514,14 @@ main (int argc, char *argv[])
+@@ -477,12 +501,14 @@ create_window (void)
      GtkWidget *check;
      GtkWidget *password_combo;
      GtkWidget *password_entry;
@@ -262,7 +283,7 @@
      GtkWidget *window;
      GtkListStore *store;
      GtkCellRenderer *cell;
-@@ -544,12 +570,14 @@ main (int argc, char *argv[])
+@@ -513,12 +539,14 @@ create_window (void)
      check = GTK_WIDGET (gtk_builder_get_object (builder, "enable_check"));
      password_combo = GTK_WIDGET (gtk_builder_get_object (builder, "password_combo"));
      password_entry = GTK_WIDGET (gtk_builder_get_object (builder, "password_entry"));
@@ -277,7 +298,7 @@
  
      store = gtk_list_store_new (1, G_TYPE_STRING);
      gtk_combo_box_set_model (GTK_COMBO_BOX (password_combo),
-@@ -579,6 +607,7 @@ main (int argc, char *argv[])
+@@ -548,6 +576,7 @@ create_window (void)
      g_signal_connect (password_entry,
  		      "changed", G_CALLBACK (password_entry_changed), NULL);
  
@@ -285,7 +306,7 @@
      /* Accept files combo */
      store = gtk_list_store_new (1, G_TYPE_STRING);
      gtk_combo_box_set_model (GTK_COMBO_BOX (accept_obexpush_combo),
-@@ -603,6 +632,7 @@ main (int argc, char *argv[])
+@@ -572,6 +601,7 @@ create_window (void)
      			_("Ask"), -1);
  #endif
      g_object_unref (store);
@@ -293,7 +314,7 @@
  
      update_ui ();
  
-@@ -610,6 +640,7 @@ main (int argc, char *argv[])
+@@ -579,6 +609,7 @@ create_window (void)
  		      "toggled", G_CALLBACK (enable_check_toggled), NULL);
      g_signal_connect (password_combo,
  		      "changed", G_CALLBACK (password_combo_changed), NULL);
@@ -301,15 +322,15 @@
      g_signal_connect (bluetooth_check,
      		      "toggled", G_CALLBACK (enable_bluetooth_check_toggled), NULL);
      g_signal_connect (bluetooth_allow_write_check,
-@@ -622,6 +653,7 @@ main (int argc, char *argv[])
+@@ -591,6 +622,7 @@ create_window (void)
      		      "changed", G_CALLBACK (accept_obexpush_combo_changed), NULL);
      g_signal_connect (notify_received_obexpush_check,
      		      "toggled", G_CALLBACK (notify_received_obexpush_check_toggled), NULL);
 +#endif /* HAVE_BLUETOOTH */
  
-     g_signal_connect (GTK_WIDGET (gtk_builder_get_object (builder, "close_button")),
- 		      "clicked", G_CALLBACK (gtk_main_quit), NULL);
-@@ -641,6 +673,7 @@ main (int argc, char *argv[])
+     g_signal_connect_swapped (GTK_WIDGET (gtk_builder_get_object (builder, "close_button")),
+                               "clicked", G_CALLBACK (gtk_widget_destroy), window);
+@@ -610,6 +642,7 @@ create_window (void)
  			     NULL,
  			     NULL,
  			     NULL);
@@ -317,7 +338,7 @@
      gconf_client_notify_add (client,
  			     FILE_SHARING_BLUETOOTH_ENABLED,
  			     file_sharing_bluetooth_enabled_changed,
-@@ -677,6 +710,7 @@ main (int argc, char *argv[])
+@@ -646,6 +679,7 @@ create_window (void)
  			     NULL,
  			     NULL,
  			     NULL);
@@ -325,10 +346,10 @@
  
      g_object_unref (client);
  
-Index: gnome-user-share-3.0.0/src/user_share.c
-===================================================================
---- gnome-user-share-3.0.0.orig/src/user_share.c	2010-03-02 15:36:45.000000000 +0100
-+++ gnome-user-share-3.0.0/src/user_share.c	2011-05-31 23:12:46.175846481 +0200
+diff --git a/src/user_share.c b/src/user_share.c
+index e54c5ed..ed87ca1 100644
+--- a/src/user_share.c
++++ b/src/user_share.c
 @@ -26,18 +26,22 @@
  #include <gdk/gdkx.h>
  #include <gtk/gtk.h>
@@ -379,7 +400,7 @@
  
  static void
  migrate_old_configuration (void)
-@@ -297,9 +304,13 @@ disabled_timeout_callback (gpointer user
+@@ -297,9 +304,13 @@ disabled_timeout_callback (gpointer user_data)
  	GConfClient* client = (GConfClient *) user_data;
  	http_down ();
  
@@ -393,7 +414,7 @@
  	return FALSE;
  }
  
-@@ -330,6 +341,7 @@ file_sharing_enabled_changed (GConfClien
+@@ -330,6 +341,7 @@ file_sharing_enabled_changed (GConfClient* client,
  	}
  }
  
@@ -401,13 +422,13 @@
  static void
  file_sharing_bluetooth_allow_write_changed (GConfClient* client,
  					    guint cnxn_id,
-@@ -414,13 +426,16 @@ file_sharing_bluetooth_obexpush_notify_c
+@@ -414,13 +426,16 @@ file_sharing_bluetooth_obexpush_notify_changed (GConfClient* client,
  {
  	obexpush_set_notify (gconf_client_get_bool (client, FILE_SHARING_BLUETOOTH_OBEXPUSH_NOTIFY, NULL));
  }
 +#endif /* HAVE_BLUETOOTH */
  
- static RETSIGTYPE
+ static void
  cleanup_handler (int sig)
  {
  	http_down ();
@@ -488,3 +509,6 @@
  
  	gtk_main ();
  
+-- 
+1.7.10
+

More information about the pkg-gnome-commits mailing list