[Pkg-utopia-commits] r1242 - in packages/experimental/dbus-glib/debian: . patches

[Sebastian Dröge]

Author: slomo
Date: 2007-02-13 19:24:10 +0100 (Tue, 13 Feb 2007)
New Revision: 1242

Removed:
   packages/experimental/dbus-glib/debian/patches/01_proxy-crash.patch
   packages/experimental/dbus-glib/debian/patches/02_gthreads-deadlock.patch
Modified:
   packages/experimental/dbus-glib/debian/changelog
   packages/experimental/dbus-glib/debian/rules
Log:
* update to 0.73-1


Modified: packages/experimental/dbus-glib/debian/changelog
===================================================================
--- packages/experimental/dbus-glib/debian/changelog	2007-02-13 17:41:53 UTC (rev 1241)
+++ packages/experimental/dbus-glib/debian/changelog	2007-02-13 18:24:10 UTC (rev 1242)
@@ -1,3 +1,16 @@
+dbus-glib (0.73-1) experimental; urgency=low
+
+  * New upstream release:
+    + debian/patches/01_proxy-crash.patch,
+      debian/patches/02_gthreads-deadlock.patch:
+      - Dropped, merged upstream
+  * debian/rules:
+    + Bump shlibs to reflect API additions
+    + Use the new configure flag to specify the location of the dbus daemon
+      introspection data instead of the previous workaround.
+
+ -- Sebastian Dröge <slomo at debian.org>  Tue, 13 Feb 2007 19:03:19 +0100
+
 dbus-glib (0.72-4) experimental; urgency=low
 
   * debian/patches/02_gthreads-deadlock.patch:

Deleted: packages/experimental/dbus-glib/debian/patches/01_proxy-crash.patch
===================================================================
--- packages/experimental/dbus-glib/debian/patches/01_proxy-crash.patch	2007-02-13 17:41:53 UTC (rev 1241)
+++ packages/experimental/dbus-glib/debian/patches/01_proxy-crash.patch	2007-02-13 18:24:10 UTC (rev 1242)
@@ -1,51 +0,0 @@
-diff -pur dbus-glib-0.72/dbus/dbus-gproxy.c dbus-glib-0.72.new/dbus/dbus-gproxy.c
---- dbus-glib-0.72/dbus/dbus-gproxy.c	2006-10-25 22:59:07.000000000 +0300
-+++ dbus-glib-0.72.new/dbus/dbus-gproxy.c	2006-11-14 16:15:11.082313384 +0200
-@@ -717,18 +717,21 @@ dbus_g_proxy_manager_replace_name_owner 
- 
-       names = g_hash_table_lookup (manager->owner_names, prev_owner);
- 
--      link = g_slist_find_custom (names, name, find_name_in_info);
--
-       info = NULL;
--      if (link != NULL)
--	{
--	  info = link->data;
-+      if (names != NULL)
-+        {
-+	  link = g_slist_find_custom (names, name, find_name_in_info);
-+
-+	  if (link != NULL)
-+	    {
-+	      info = link->data;
- 	  
--	  names = g_slist_delete_link (names, link);
-+	      names = g_slist_delete_link (names, link);
- 
--	  if (names == NULL)
--	    g_hash_table_remove (manager->owner_names, prev_owner);
--	}
-+	      if (names == NULL)
-+	        g_hash_table_remove (manager->owner_names, prev_owner);
-+	    }
-+        }
- 
-       if (new_owner[0] == '\0')
- 	{
-@@ -757,8 +760,14 @@ dbus_g_proxy_manager_replace_name_owner 
- 	  g_slist_free (data.destroyed);
- 
- 	  LOCK_MANAGER (manager);
-+
-+	  if (info)
-+	    {
-+	      g_free (info->name);
-+	      g_free (info);
-+	    }
- 	}
--      else
-+      else if (info)
- 	{
- 	  insert_nameinfo (manager, new_owner, info);
- 	}
-

Deleted: packages/experimental/dbus-glib/debian/patches/02_gthreads-deadlock.patch
===================================================================
--- packages/experimental/dbus-glib/debian/patches/02_gthreads-deadlock.patch	2007-02-13 17:41:53 UTC (rev 1241)
+++ packages/experimental/dbus-glib/debian/patches/02_gthreads-deadlock.patch	2007-02-13 18:24:10 UTC (rev 1242)
@@ -1,14 +0,0 @@
---- dbus/dbus-gthread.c.old	2007-01-22 21:49:00.840504444 +0100
-+++ dbus/dbus-gthread.c	2007-01-22 21:49:49.967304020 +0100
-@@ -172,8 +172,9 @@
- {
-   if (!g_thread_supported ())
-     g_error ("g_thread_init() must be called before dbus_threads_init()");
--    
--  dbus_threads_init (&functions);
-+  
-+  dbus_threads_init_default ();
-+//  dbus_threads_init (&functions);
- }
- 
- /** @} end of public API */

Modified: packages/experimental/dbus-glib/debian/rules
===================================================================
--- packages/experimental/dbus-glib/debian/rules	2007-02-13 17:41:53 UTC (rev 1241)
+++ packages/experimental/dbus-glib/debian/rules	2007-02-13 18:24:10 UTC (rev 1242)
@@ -9,7 +9,7 @@
 include /usr/share/cdbs/1/class/autotools.mk
 
 # Strict library versioning
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V "libdbus-glib-1-2 (>= 0.73)"
 
-common-configure-impl::
-	cp $(CURDIR)/debian/dbus-bus-introspect.xml $(CURDIR)/tools/
+DEB_CONFIGURE_EXTRA_FLAGS := --with-introspect-xml=$(CURDIR)/debian/dbus-bus-introspect.xml
+