r39398 - in /desktop/experimental/gnome-bluetooth/debian: ./ patches/

ah at users.alioth.debian.org ah at users.alioth.debian.org
Thu Aug 29 10:35:30 UTC 2013


Author: ah
Date: Thu Aug 29 10:35:29 2013
New Revision: 39398

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39398
Log:
* New upstream development release (3.9.3)
* Bump glib build-dependency to >= 2.36
* Rename package for new SONAME (11 -> 12).
* Update debian/libgnome-bluetooth12.symbols
* Replace debian/patches/02_gettext_macros.patch with upstream commit.
* gnome-bluetooth was ported to the new BlueZ5 API in the 3.9 series.
  - bump dependency on bluez to >= 5.5

Added:
    desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth12.install
      - copied unchanged from r39387, desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth11.install
    desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth12.symbols
      - copied, changed from r39387, desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth11.symbols
Removed:
    desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth11.install
    desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth11.symbols
Modified:
    desktop/experimental/gnome-bluetooth/debian/changelog
    desktop/experimental/gnome-bluetooth/debian/control.in
    desktop/experimental/gnome-bluetooth/debian/patches/01-Revert-lib-Remove-ObexFTP-browsing.patch
    desktop/experimental/gnome-bluetooth/debian/patches/02_gettext_macros.patch

Modified: desktop/experimental/gnome-bluetooth/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-bluetooth/debian/changelog?rev=39398&op=diff
==============================================================================
--- desktop/experimental/gnome-bluetooth/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-bluetooth/debian/changelog	[utf-8] Thu Aug 29 10:35:29 2013
@@ -1,8 +1,18 @@
-gnome-bluetooth (3.8.1-3) UNRELEASED; urgency=low
-
+gnome-bluetooth (3.9.3-1) UNRELEASED; urgency=low
+
+  [ Michael Biebl ]
   * Drop obsolete configure switches.
 
- -- Michael Biebl <biebl at debian.org>  Mon, 01 Jul 2013 10:43:10 +0200
+  [ Andreas Henriksson ]
+  * New upstream development release (3.9.3)
+  * Bump glib build-dependency to >= 2.36
+  * Rename package for new SONAME (11 -> 12).
+  * Update debian/libgnome-bluetooth12.symbols
+  * Replace debian/patches/02_gettext_macros.patch with upstream commit.
+  * gnome-bluetooth was ported to the new BlueZ5 API in the 3.9 series.
+    - bump dependency on bluez to >= 5.5
+
+ -- Andreas Henriksson <andreas at fatal.se>  Thu, 29 Aug 2013 12:01:27 +0200
 
 gnome-bluetooth (3.8.1-2) unstable; urgency=low
 

Modified: desktop/experimental/gnome-bluetooth/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-bluetooth/debian/control.in?rev=39398&op=diff
==============================================================================
--- desktop/experimental/gnome-bluetooth/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gnome-bluetooth/debian/control.in	[utf-8] Thu Aug 29 10:35:29 2013
@@ -7,7 +7,7 @@
                cdbs (>= 0.4.93),
                gnome-common,
                gnome-pkg-tools,
-               libglib2.0-dev (>= 2.29.90),
+               libglib2.0-dev (>= 2.36.0),
                libgtk-3-dev (>= 3.0.0),
                libx11-dev,
                libxi-dev,
@@ -27,7 +27,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${gir:Depends},
-         bluez (>= 4.36),
+         bluez (>= 5.5),
          obexd-client,
          udev (>= 154),
          consolekit,
@@ -48,7 +48,7 @@
  bluetooth-applet provides an agent to ask for PIN and managing pairing with
  devices, together with bluetooth-properties.
 
-Package: libgnome-bluetooth11
+Package: libgnome-bluetooth12
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
@@ -61,7 +61,7 @@
 
 Package: libgnome-bluetooth-dev
 Section: libdevel
-Depends: libgnome-bluetooth11 (= ${binary:Version}),
+Depends: libgnome-bluetooth12 (= ${binary:Version}),
          gir1.2-gnomebluetooth-1.0 (= ${binary:Version}),
          ${misc:Depends},
          libgtk-3-dev,

Copied: desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth12.symbols (from r39387, desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth11.symbols)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth12.symbols?rev=39398&op=diff
==============================================================================
--- desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth11.symbols	[utf-8] (original)
+++ desktop/experimental/gnome-bluetooth/debian/libgnome-bluetooth12.symbols	[utf-8] Thu Aug 29 10:35:29 2013
@@ -1,67 +1,70 @@
-libgnome-bluetooth.so.11 libgnome-bluetooth11 #MINVER#
- bluetooth_agent_error_quark at Base 3.4.0
- bluetooth_agent_new at Base 3.4.0
- bluetooth_agent_register at Base 3.4.0
- bluetooth_agent_set_authorize_func at Base 3.4.0
- bluetooth_agent_set_cancel_func at Base 3.4.0
- bluetooth_agent_set_confirm_func at Base 3.4.0
- bluetooth_agent_set_display_func at Base 3.4.0
- bluetooth_agent_set_passkey_func at Base 3.4.0
- bluetooth_agent_set_pincode_func at Base 3.4.0
- bluetooth_agent_setup at Base 3.4.0
- bluetooth_agent_unregister at Base 3.4.0
- bluetooth_browse_address at Base 3.1.3
- bluetooth_browse_address_finish at Base 3.1.3
- bluetooth_category_get_type at Base 2.91.2
- bluetooth_chooser_button_available at Base 2.91.2
- bluetooth_chooser_button_get_type at Base 2.91.2
- bluetooth_chooser_button_new at Base 2.91.2
- bluetooth_chooser_combo_get_type at Base 2.91.2
- bluetooth_chooser_combo_new at Base 2.91.2
- bluetooth_chooser_dump_selected_device at Base 3.4.0
- bluetooth_chooser_get_model at Base 2.91.2
- bluetooth_chooser_get_scrolled_window at Base 2.91.92
- bluetooth_chooser_get_selected_device at Base 2.91.2
- bluetooth_chooser_get_selected_device_icon at Base 2.91.2
- bluetooth_chooser_get_selected_device_info at Base 2.91.2
- bluetooth_chooser_get_selected_device_is_connected at Base 2.91.2
- bluetooth_chooser_get_selected_device_name at Base 2.91.2
- bluetooth_chooser_get_selected_device_type at Base 2.91.2
- bluetooth_chooser_get_treeview at Base 2.91.2
- bluetooth_chooser_get_type at Base 2.91.2
- bluetooth_chooser_new at Base 2.91.2
- bluetooth_chooser_start_discovery at Base 2.91.2
- bluetooth_chooser_stop_discovery at Base 2.91.2
- bluetooth_class_to_type at Base 3.1.3
- bluetooth_client_connect_service at Base 3.4.0
- bluetooth_client_connect_service_finish at Base 3.4.0
- bluetooth_client_create_device at Base 3.4.0
- bluetooth_client_dump_device at Base 3.4.0
- bluetooth_client_get_adapter_model at Base 2.91.2
- bluetooth_client_get_device_model at Base 2.91.2
- bluetooth_client_get_filter_model at Base 2.91.2
- bluetooth_client_get_model at Base 2.91.2
- bluetooth_client_get_type at Base 2.91.2
- bluetooth_client_new at Base 2.91.2
- bluetooth_client_set_trusted at Base 3.4.0
- bluetooth_column_get_type at Base 2.91.2
- bluetooth_filter_widget_bind_filter at Base 2.91.2
- bluetooth_filter_widget_get_type at Base 2.91.2
- bluetooth_filter_widget_new at Base 2.91.2
- bluetooth_filter_widget_set_title at Base 2.91.2
- bluetooth_killswitch_get_state at Base 3.4.0
- bluetooth_killswitch_get_type at Base 3.4.0
- bluetooth_killswitch_has_killswitches at Base 3.4.0
- bluetooth_killswitch_new at Base 3.4.0
- bluetooth_killswitch_set_state at Base 3.4.0
- bluetooth_killswitch_state_to_string at Base 3.4.0
- bluetooth_plugin_manager_cleanup at Base 3.4.0
- bluetooth_plugin_manager_device_deleted at Base 3.4.0
- bluetooth_plugin_manager_get_widgets at Base 3.4.0
- bluetooth_plugin_manager_init at Base 3.4.0
- bluetooth_send_to_address at Base 3.1.3
- bluetooth_status_get_type at Base 3.2.1
- bluetooth_type_get_type at Base 2.91.2
- bluetooth_type_to_string at Base 2.91.2
- bluetooth_uuid_to_string at Base 2.91.2
- bluetooth_verify_address at Base 2.91.2
+libgnome-bluetooth.so.12 libgnome-bluetooth12 #MINVER#
+ bluetooth_agent_error_quark at Base 3.9.3
+ bluetooth_agent_new at Base 3.9.3
+ bluetooth_agent_register at Base 3.9.3
+ bluetooth_agent_set_authorize_func at Base 3.9.3
+ bluetooth_agent_set_authorize_service_func at Base 3.9.3
+ bluetooth_agent_set_cancel_func at Base 3.9.3
+ bluetooth_agent_set_confirm_func at Base 3.9.3
+ bluetooth_agent_set_display_func at Base 3.9.3
+ bluetooth_agent_set_passkey_func at Base 3.9.3
+ bluetooth_agent_set_pincode_func at Base 3.9.3
+ bluetooth_agent_setup at Base 3.9.3
+ bluetooth_agent_unregister at Base 3.9.3
+ bluetooth_browse_address at Base 3.9.3
+ bluetooth_browse_address_finish at Base 3.9.3
+ bluetooth_category_get_type at Base 3.9.3
+ bluetooth_chooser_button_available at Base 3.9.3
+ bluetooth_chooser_button_get_type at Base 3.9.3
+ bluetooth_chooser_button_new at Base 3.9.3
+ bluetooth_chooser_combo_get_type at Base 3.9.3
+ bluetooth_chooser_combo_new at Base 3.9.3
+ bluetooth_chooser_dump_selected_device at Base 3.9.3
+ bluetooth_chooser_get_model at Base 3.9.3
+ bluetooth_chooser_get_scrolled_window at Base 3.9.3
+ bluetooth_chooser_get_selected_device at Base 3.9.3
+ bluetooth_chooser_get_selected_device_icon at Base 3.9.3
+ bluetooth_chooser_get_selected_device_info at Base 3.9.3
+ bluetooth_chooser_get_selected_device_is_connected at Base 3.9.3
+ bluetooth_chooser_get_selected_device_name at Base 3.9.3
+ bluetooth_chooser_get_selected_device_type at Base 3.9.3
+ bluetooth_chooser_get_treeview at Base 3.9.3
+ bluetooth_chooser_get_type at Base 3.9.3
+ bluetooth_chooser_new at Base 3.9.3
+ bluetooth_chooser_start_discovery at Base 3.9.3
+ bluetooth_chooser_stop_discovery at Base 3.9.3
+ bluetooth_class_to_type at Base 3.9.3
+ bluetooth_client_connect_service at Base 3.9.3
+ bluetooth_client_connect_service_finish at Base 3.9.3
+ bluetooth_client_dump_device at Base 3.9.3
+ bluetooth_client_get_adapter_model at Base 3.9.3
+ bluetooth_client_get_connectable at Base 3.9.3
+ bluetooth_client_get_device at Base 3.9.3
+ bluetooth_client_get_device_model at Base 3.9.3
+ bluetooth_client_get_filter_model at Base 3.9.3
+ bluetooth_client_get_model at Base 3.9.3
+ bluetooth_client_get_type at Base 3.9.3
+ bluetooth_client_new at Base 3.9.3
+ bluetooth_client_set_trusted at Base 3.9.3
+ bluetooth_client_setup_device at Base 3.9.3
+ bluetooth_column_get_type at Base 3.9.3
+ bluetooth_filter_widget_bind_filter at Base 3.9.3
+ bluetooth_filter_widget_get_type at Base 3.9.3
+ bluetooth_filter_widget_new at Base 3.9.3
+ bluetooth_filter_widget_set_title at Base 3.9.3
+ bluetooth_killswitch_get_state at Base 3.9.3
+ bluetooth_killswitch_get_type at Base 3.9.3
+ bluetooth_killswitch_has_killswitches at Base 3.9.3
+ bluetooth_killswitch_new at Base 3.9.3
+ bluetooth_killswitch_set_state at Base 3.9.3
+ bluetooth_killswitch_state_to_string at Base 3.9.3
+ bluetooth_plugin_manager_cleanup at Base 3.9.3
+ bluetooth_plugin_manager_device_deleted at Base 3.9.3
+ bluetooth_plugin_manager_get_widgets at Base 3.9.3
+ bluetooth_plugin_manager_init at Base 3.9.3
+ bluetooth_send_to_address at Base 3.9.3
+ bluetooth_status_get_type at Base 3.9.3
+ bluetooth_type_get_type at Base 3.9.3
+ bluetooth_type_to_string at Base 3.9.3
+ bluetooth_uuid_to_string at Base 3.9.3
+ bluetooth_verify_address at Base 3.9.3

Modified: desktop/experimental/gnome-bluetooth/debian/patches/01-Revert-lib-Remove-ObexFTP-browsing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-bluetooth/debian/patches/01-Revert-lib-Remove-ObexFTP-browsing.patch?rev=39398&op=diff
==============================================================================
--- desktop/experimental/gnome-bluetooth/debian/patches/01-Revert-lib-Remove-ObexFTP-browsing.patch	[utf-8] (original)
+++ desktop/experimental/gnome-bluetooth/debian/patches/01-Revert-lib-Remove-ObexFTP-browsing.patch	[utf-8] Thu Aug 29 10:35:29 2013
@@ -12,11 +12,9 @@
  lib/bluetooth-utils.h |    8 ++++
  2 files changed, 115 insertions(+)
 
-diff --git a/lib/bluetooth-utils.c b/lib/bluetooth-utils.c
-index 25ff91e..b19b4e1 100644
 --- a/lib/bluetooth-utils.c
 +++ b/lib/bluetooth-utils.c
-@@ -340,3 +340,110 @@ bluetooth_send_to_address (const char *address,
+@@ -340,3 +340,110 @@
  	g_ptr_array_free (a, TRUE);
  }
  
@@ -127,11 +125,9 @@
 +	g_free (uri);
 +	g_object_unref (file);
 +}
-diff --git a/lib/bluetooth-utils.h b/lib/bluetooth-utils.h
-index 8920b4c..53c341b 100644
 --- a/lib/bluetooth-utils.h
 +++ b/lib/bluetooth-utils.h
-@@ -35,6 +35,14 @@ const gchar   *bluetooth_type_to_string (guint type);
+@@ -64,6 +64,14 @@
  gboolean       bluetooth_verify_address (const char *bdaddr);
  const char    *bluetooth_uuid_to_string (const char *uuid);
  
@@ -146,6 +142,3 @@
  void bluetooth_send_to_address (const char *address,
  				const char *alias);
  
--- 
-1.7.10.4
-

Modified: desktop/experimental/gnome-bluetooth/debian/patches/02_gettext_macros.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-bluetooth/debian/patches/02_gettext_macros.patch?rev=39398&op=diff
==============================================================================
--- desktop/experimental/gnome-bluetooth/debian/patches/02_gettext_macros.patch	[utf-8] (original)
+++ desktop/experimental/gnome-bluetooth/debian/patches/02_gettext_macros.patch	[utf-8] Thu Aug 29 10:35:29 2013
@@ -1,8 +1,38 @@
-Index: gnome-bluetooth-3.0.0/configure.ac
-===================================================================
---- gnome-bluetooth-3.0.0.orig/configure.ac	2011-05-24 11:45:22.573543108 -0400
-+++ gnome-bluetooth-3.0.0/configure.ac	2011-05-24 11:45:33.643543107 -0400
-@@ -41,9 +41,6 @@
+From 8db421228020b0e195add49aa8ed332c87d49cf2 Mon Sep 17 00:00:00 2001
+From: Seán de Búrca <leftmostcat at gmail.com>
+Date: Tue, 27 Aug 2013 15:07:07 +0000
+Subject: Fix autogen with latest gnome-common and intltool failure in config
+
+Side-by-side use of IT_PROG_INTLTOOL and AM_GNU_GETTEXT is not supported.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=705378
+---
+diff --git a/Makefile.am b/Makefile.am
+index 1ea7333..1521128 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,6 +6,8 @@ if ENABLE_DOCUMENTATION
+ SUBDIRS += help
+ endif
+ 
++ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
++
+ EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in ChangeLog.pre-2.27 gtk-doc.make
+ 
+ DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install \
+diff --git a/configure.ac b/configure.ac
+index 9305910..fe61daa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8,6 +8,7 @@ AC_INIT([gnome-bluetooth],
+         [gnomebt_version_major.gnomebt_version_minor.gnomebt_version_micro],
+         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-bluetooth])
+ 
++AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR([applet/bluetooth-applet.c])
+ AC_CONFIG_HEADERS([config.h])
+ 
+@@ -41,9 +42,6 @@ AM_PROG_LIBTOOL
  # i18n stuff
  IT_PROG_INTLTOOL([0.40.0])
  
@@ -12,3 +42,5 @@
  GETTEXT_PACKAGE=gnome-bluetooth2
  AC_SUBST(GETTEXT_PACKAGE)
  AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
+--
+cgit v0.9.2




More information about the pkg-gnome-commits mailing list