[maemo-commits] [maemo-commits] r16792 - in projects/haf/trunk/dbus-glib/debian: . patches

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Thu Nov 27 23:02:09 EET 2008 
Author: guillem
Date: 2008-11-27 23:02:07 +0200 (Thu, 27 Nov 2008)
New Revision: 16792

Added:
   projects/haf/trunk/dbus-glib/debian/libdbus-glib-1-2-dbg.links
   projects/haf/trunk/dbus-glib/debian/libdbus-glib-1-2.symbols
   projects/haf/trunk/dbus-glib/debian/libdbus-glib-1-doc.links
   projects/haf/trunk/dbus-glib/debian/patches/series
   projects/haf/trunk/dbus-glib/debian/watch
Removed:
   projects/haf/trunk/dbus-glib/debian/patches/08-fix-pending-call-remove.patch
   projects/haf/trunk/dbus-glib/debian/patches/09-replace-invalid-assert.patch
   projects/haf/trunk/dbus-glib/debian/patches/10-fix-free-in-dbus-gvalue.patch
   projects/haf/trunk/dbus-glib/debian/patches/11-add-va_end-to-locate_attributes.patch
   projects/haf/trunk/dbus-glib/debian/patches/12-remove_match_in_unregister.patch
Modified:
   projects/haf/trunk/dbus-glib/debian/changelog
   projects/haf/trunk/dbus-glib/debian/compat
   projects/haf/trunk/dbus-glib/debian/control
   projects/haf/trunk/dbus-glib/debian/libdbus-glib-1-doc.install
   projects/haf/trunk/dbus-glib/debian/patches/01-dbus-gproxy-crash-fix.patch
   projects/haf/trunk/dbus-glib/debian/patches/05-unassociate-proxies-asserts.patch
   projects/haf/trunk/dbus-glib/debian/patches/07-install-doxygen-docs.patch
   projects/haf/trunk/dbus-glib/debian/patches/13-zero-call_id-fix.patch
   projects/haf/trunk/dbus-glib/debian/rules
Log:
New upstream release (sync with Debian packaging 0.76-1)

(Closes: NB#91472)
* Do not use tar-in-tar.
* Switch from simple-patchsys to patchsys-quilt.


Modified: projects/haf/trunk/dbus-glib/debian/changelog
===================================================================
--- projects/haf/trunk/dbus-glib/debian/changelog	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/changelog	2008-11-27 21:02:07 UTC (rev 16792)
@@ -1,9 +1,81 @@
-dbus-glib (0.74-0osso8) UNRELEASED; urgency=low
+dbus-glib (0.76-1osso1) UNRELEASED; urgency=low
 
   * New maintainer.
+  * New upstream release (sync with Debian packaging 0.76-1).
+    (Closes: NB#91472)
+    - debian/patches/08-fix-pending-call-remove.patch: Remove, merged upstream.
+    - debian/patches/09-replace-invalid-assert.patch: Likewise.
+    - debian/patches/10-fix-free-in-dbus-gvalue.patch: Likewise.
+    - debian/patches/11-add-va_end-to-locate_attributes.patch: Likewise.
+    - debian/patches/12-remove_match_in_unregister.patch: Likewise.
+    - debian/patches/01-dbus-gproxy-crash-fix.patch: Refresh.
+    - debian/patches/05-unassociate-proxies-asserts.patch: Likewise.
+    - debian/patches/07-install-doxygen-docs.patch: Likewise.
+    - debian/patches/13-zero-call_id-fix.patch: Likewise.
+  * Do not use tar-in-tar.
+  * Switch from simple-patchsys to patchsys-quilt.
 
  -- Guillem Jover <guillem.jover at nokia.com>  Thu, 27 Nov 2008 21:38:16 +0200
 
+dbus-glib (0.76-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/01-476080-freeze-error-abi.patch
+    - Removed, merged upstream.
+  * debian/patches/02-ignore-namespaced-nodes-and-attributes.patch
+    - Removed, merged upstream.
+  * Add symbols file for libdbus-glib-1-2. 
+  * debian/rules
+    - Bump shlibs to >= 0.76 due to API additions.
+
+ -- Michael Biebl <biebl at debian.org>  Fri, 06 Jun 2008 00:05:01 +0200
+
+dbus-glib (0.74-4) unstable; urgency=low
+
+  * debian/control
+    - Add myself to Uploaders.
+    - Add Vcs-* fields.
+    - Add Homepage field.
+    - Add Suggests: devhelp to libdbus-glib-1-doc which allows to easily
+      browse and search through the dbus-glib API documentation.
+  * debian/patches/02-ignore-namespaced-nodes-and-attributes.patch
+    - Ignore namespaced extensions to introspection XML. (Closes: #478265)
+      Patch pulled from upstream git.
+  * debian/watch
+    - Add watch file to track new upstream releases.
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 29 Apr 2008 00:57:43 +0200
+
+dbus-glib (0.74-3) unstable; urgency=low
+
+  * Use my debian.org address in Uploaders
+  * Add a -dbg package (Closes: #446240)
+  * Symlink the gtk-doc for the library into /usr/share/doc/libdbus-glib-1-doc
+    as well as installing it into /usr/share/gtk-doc
+  * Standards-Version: 3.7.3 (no changes)
+
+ -- Simon McVittie <smcv at debian.org>  Mon, 28 Apr 2008 11:55:09 +0100
+
+dbus-glib (0.74-2) unstable; urgency=low
+
+  * Fix error-enum ABI to match that of the current packages in lenny, Ubuntu
+    gutsy/feisty/hardy and Fedora 8, rather than picking up an arbitrarily
+    incompatible ABI depending on the installed libdbus (Closes: #476080)
+    (debian/patches/01-476080-freeze-error-abi.patch)
+  * Add myself to Uploaders and set Dm-Upload-Allowed: yes for future versions
+
+ -- Simon McVittie <smcv at ianadd.pseudorandom.co.uk>  Mon, 14 Apr 2008 13:25:29 +0100
+
+dbus-glib (0.74-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/rules:
+    + Update shlibs to >= 0.74 because of new API.
+  * debian/control:
+    + Use ${binary:Version} to make lintian happy.
+
+ -- Sebastian Dröge <slomo at debian.org>  Fri, 06 Jul 2007 14:00:42 +0200
+
 dbus-glib (0.74-0osso7) experimental; urgency=low
 
   * Fix the previous patch to always initialise 'ret'. Fixes: NB#87083
@@ -57,6 +129,28 @@
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 23 Jul 2007 14:46:47 +0300
 
+dbus-glib (0.73-2) unstable; urgency=low
+
+  * Upload to unstable
+  * Merge experimental branch
+  * debian/patches/00_unref_crash.patch:
+    removed. Fixed upstream.
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 09 Apr 2007 22:16:26 +0200
+
+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.73-0osso2) experimental; urgency=low
 
   * Added two patches from Ross Burton: one to add
@@ -75,6 +169,43 @@
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 22 Feb 2007 15:57:13 +0200
 
+dbus-glib (0.72-4) experimental; urgency=low
+
+  * debian/patches/02_gthreads-deadlock.patch:
+    + Instead of using gthreads just initialize the default dbus threads. This
+      fixes all the deadlocks in dbus-glib applications that are called via
+      sudo like gdmsetup for example. (fd.o: #9259)
+
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 22 Jan 2007 22:05:22 +0100
+
+dbus-glib (0.72-3) experimental; urgency=low
+
+  * No-change upload against unstable's libc6
+
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 22 Jan 2007 21:10:30 +0100
+
+dbus-glib (0.72-2) experimental; urgency=low
+
+  * debian/control:
+    + Updated to use my debian.org mail address
+  * debian/patches/01_proxy-crash.patch:
+    + Fix for a dbus-glib crash that could take down all dbus-glib using
+      applications at once (fd.o: #8235)
+
+ -- Sebastian Dröge <slomo at debian.org>  Mon,  8 Jan 2007 01:54:04 +0100
+
+dbus-glib (0.72-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/control:
+    + Require libdbus-1-dev (>= 0.94) and libglib2.0-dev (>= 2.6)
+    + Add build dependency on gtk-doc-tools (>= 1.4)
+  * debian/control,
+    debian/libdbus-glib-1-doc.install:
+    + Add libdbus-glib-1-doc package
+
+ -- Sebastian Dröge <slomo at ubuntu.com>  Wed,  1 Nov 2006 10:51:01 +0100
+
 dbus-glib (0.72-osso4) experimental; urgency=low
 
   * Trying to fix compilation problem in Sardine.

Modified: projects/haf/trunk/dbus-glib/debian/compat
===================================================================
--- projects/haf/trunk/dbus-glib/debian/compat	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/compat	2008-11-27 21:02:07 UTC (rev 16792)
@@ -1 +1 @@
-4
+5

Modified: projects/haf/trunk/dbus-glib/debian/control
===================================================================
--- projects/haf/trunk/dbus-glib/debian/control	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/control	2008-11-27 21:02:07 UTC (rev 16792)
@@ -2,13 +2,16 @@
 Section: devel
 Priority: optional
 Maintainer: Guillem Jover <guillem.jover at nokia.com>
-Build-Depends: cdbs, debhelper, libglib2.0-dev, libdbus-1-dev (>= 0.91), libexpat1-dev, doxygen, gtk-doc-tools
-Standards-Version: 3.7.2
+Build-Depends: cdbs (>= 0.4.43), quilt, debhelper (>= 5.0.37.2),
+ libglib2.0-dev (>= 2.6), libdbus-1-dev (>= 0.94), libexpat-dev,
+ doxygen, gtk-doc-tools (>= 1.4)
+Standards-Version: 3.7.3
+Homepage: http://www.freedesktop.org/wiki/Software/DBusBindings
 
 Package: libdbus-glib-1-dev
 Section: libdevel
 Architecture: any
-Depends: libdbus-glib-1-2 (= ${Source-Version}), libdbus-1-dev (>= 0.91), libglib2.0-dev, libexpat1
+Depends: libdbus-glib-1-2 (= ${binary:Version}), libdbus-1-dev (>= 0.91), libglib2.0-dev, ${shlibs:Depends}
 Conflicts: libdbus-glib-dev, dbus-glib-1-dev, dbus-1-utils (<< 0.50-2)
 Replaces: libdbus-glib0-dev, dbus-glib-1-dev, libdbus-1-dev (<< 0.90)
 Description: simple interprocess messaging system (GLib interface)
@@ -34,17 +37,31 @@
  .
  See the dbus description for more information about D-Bus in general.
 
+Package: libdbus-glib-1-doc
+Section: doc
+Architecture: all
+Depends: lynx | www-browser
+Suggests: devhelp
+Description: simple interprocess messaging system (GLib-based shared library)
+ D-Bus is a message bus, used for sending messages between applications.
+ Conceptually, it fits somewhere in between raw sockets and CORBA in
+ terms of complexity.
+ .
+ This package provides the HTML documentation for dbus-glib
+ .
+ See the dbus description for more information about D-Bus in general.
+
 Package: libdbus-glib-1-2-dbg
-Section: devel
+Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libdbus-glib-1-2 (= ${Source-Version})
-Description: libdbus-glib-1-2 debug symbols
- libdbus-glib-1-2 debug symbols
-
-Package: libdbus-glib-1-doc
-Section: doc
-Priority: extra
-Architecture: all
-Description: libdbus-glib-1-2 API documentation
- libdbus-glib-1-2 API documentation
+Depends: libdbus-glib-1-2 (= ${binary:Version})
+Description: simple interprocess messaging system (GLib library debug symbols)
+ D-Bus is a message bus, used for sending messages between applications.
+ Conceptually, it fits somewhere in between raw sockets and CORBA in
+ terms of complexity.
+ .
+ This package provides support for debugging programs that use the GLib-based
+ shared library.
+ .
+ See the dbus description for more information about D-Bus in general.

Added: projects/haf/trunk/dbus-glib/debian/libdbus-glib-1-2-dbg.links
===================================================================
--- projects/haf/trunk/dbus-glib/debian/libdbus-glib-1-2-dbg.links	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/libdbus-glib-1-2-dbg.links	2008-11-27 21:02:07 UTC (rev 16792)
@@ -0,0 +1 @@
+usr/share/doc/libdbus-glib-1-2 usr/share/doc/libdbus-glib-1-2-dbg

Added: projects/haf/trunk/dbus-glib/debian/libdbus-glib-1-2.symbols
===================================================================
--- projects/haf/trunk/dbus-glib/debian/libdbus-glib-1-2.symbols	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/libdbus-glib-1-2.symbols	2008-11-27 21:02:07 UTC (rev 16792)
@@ -0,0 +1,87 @@
+libdbus-glib-1.so.2 libdbus-glib-1-2 #MINVER#
+ dbus_connection_get_g_connection at Base 0.74
+ dbus_connection_get_g_type at Base 0.71
+ dbus_connection_setup_with_g_main at Base 0.71
+ dbus_g_bus_get at Base 0.71
+ dbus_g_connection_flush at Base 0.71
+ dbus_g_connection_get_connection at Base 0.71
+ dbus_g_connection_get_g_type at Base 0.71
+ dbus_g_connection_lookup_g_object at Base 0.71
+ dbus_g_connection_open at Base 0.71
+ dbus_g_connection_ref at Base 0.71
+ dbus_g_connection_register_g_object at Base 0.71
+ dbus_g_connection_unref at Base 0.71
+ dbus_g_error_domain_register at Base 0.71
+ dbus_g_error_get_name at Base 0.71
+ dbus_g_error_has_name at Base 0.71
+ dbus_g_error_quark at Base 0.71
+ dbus_g_message_get_g_type at Base 0.71
+ dbus_g_message_get_message at Base 0.71
+ dbus_g_message_ref at Base 0.71
+ dbus_g_message_unref at Base 0.71
+ dbus_g_method_get_reply at Base 0.71
+ dbus_g_method_get_sender at Base 0.71
+ dbus_g_method_return at Base 0.71
+ dbus_g_method_return_error at Base 0.71
+ dbus_g_method_send_reply at Base 0.71
+ dbus_g_object_path_get_g_type at Base 0.71
+ dbus_g_object_register_marshaller at Base 0.71
+ dbus_g_object_register_marshaller_array at Base 0.71
+ dbus_g_object_type_install_info at Base 0.71
+ dbus_g_proxy_add_signal at Base 0.71
+ dbus_g_proxy_begin_call at Base 0.71
+ dbus_g_proxy_begin_call_with_timeout at Base 0.74
+ dbus_g_proxy_call at Base 0.71
+ dbus_g_proxy_call_no_reply at Base 0.71
+ dbus_g_proxy_call_with_timeout at Base 0.74
+ dbus_g_proxy_cancel_call at Base 0.71
+ dbus_g_proxy_connect_signal at Base 0.71
+ dbus_g_proxy_disconnect_signal at Base 0.71
+ dbus_g_proxy_end_call at Base 0.71
+ dbus_g_proxy_get_bus_name at Base 0.71
+ dbus_g_proxy_get_interface at Base 0.71
+ dbus_g_proxy_get_path at Base 0.71
+ dbus_g_proxy_get_type at Base 0.71
+ dbus_g_proxy_new_for_name at Base 0.71
+ dbus_g_proxy_new_for_name_owner at Base 0.71
+ dbus_g_proxy_new_for_peer at Base 0.71
+ dbus_g_proxy_new_from_proxy at Base 0.71
+ dbus_g_proxy_send at Base 0.71
+ dbus_g_proxy_set_default_timeout at Base 0.76
+ dbus_g_proxy_set_interface at Base 0.71
+ dbus_g_thread_init at Base 0.71
+ dbus_g_type_collection_get_fixed at Base 0.71
+ dbus_g_type_collection_peek_vtable at Base 0.71
+ dbus_g_type_collection_value_iterate at Base 0.71
+ dbus_g_type_get_collection at Base 0.71
+ dbus_g_type_get_collection_specialization at Base 0.71
+ dbus_g_type_get_map at Base 0.71
+ dbus_g_type_get_map_key_specialization at Base 0.71
+ dbus_g_type_get_map_value_specialization at Base 0.71
+ dbus_g_type_get_struct at Base 0.71
+ dbus_g_type_get_struct_member_type at Base 0.71
+ dbus_g_type_get_struct_size at Base 0.71
+ dbus_g_type_get_structv at Base 0.71
+ dbus_g_type_is_collection at Base 0.71
+ dbus_g_type_is_map at Base 0.71
+ dbus_g_type_is_struct at Base 0.71
+ dbus_g_type_map_peek_vtable at Base 0.71
+ dbus_g_type_map_value_iterate at Base 0.71
+ dbus_g_type_register_collection at Base 0.71
+ dbus_g_type_register_map at Base 0.71
+ dbus_g_type_register_struct at Base 0.71
+ dbus_g_type_specialized_collection_append at Base 0.71
+ dbus_g_type_specialized_collection_end_append at Base 0.71
+ dbus_g_type_specialized_construct at Base 0.71
+ dbus_g_type_specialized_init at Base 0.71
+ dbus_g_type_specialized_init_append at Base 0.71
+ dbus_g_type_specialized_map_append at Base 0.71
+ dbus_g_type_struct_get at Base 0.71
+ dbus_g_type_struct_get_member at Base 0.71
+ dbus_g_type_struct_peek_vtable at Base 0.71
+ dbus_g_type_struct_set at Base 0.71
+ dbus_g_type_struct_set_member at Base 0.71
+ dbus_glib_internal_do_not_use_run_tests at Base 0.71
+ dbus_message_get_g_type at Base 0.71
+ dbus_server_setup_with_g_main at Base 0.71
+ dbus_set_g_error at Base 0.71

Modified: projects/haf/trunk/dbus-glib/debian/libdbus-glib-1-doc.install
===================================================================
--- projects/haf/trunk/dbus-glib/debian/libdbus-glib-1-doc.install	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/libdbus-glib-1-doc.install	2008-11-27 21:02:07 UTC (rev 16792)
@@ -1 +1,2 @@
 debian/tmp/usr/share/doc/dbus-glib/html usr/share/doc/libdbus-glib-1-doc/api/
+debian/tmp/usr/share/gtk-doc/html/dbus-glib

Added: projects/haf/trunk/dbus-glib/debian/libdbus-glib-1-doc.links
===================================================================
--- projects/haf/trunk/dbus-glib/debian/libdbus-glib-1-doc.links	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/libdbus-glib-1-doc.links	2008-11-27 21:02:07 UTC (rev 16792)
@@ -0,0 +1 @@
+usr/share/gtk-doc/html/dbus-glib usr/share/doc/libdbus-glib-1-doc/dbus-glib

Modified: projects/haf/trunk/dbus-glib/debian/patches/01-dbus-gproxy-crash-fix.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/01-dbus-gproxy-crash-fix.patch	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/patches/01-dbus-gproxy-crash-fix.patch	2008-11-27 21:02:07 UTC (rev 16792)
@@ -1,8 +1,8 @@
-Index: dbus/dbus-gproxy.c
+Index: b/dbus/dbus-gproxy.c
 ===================================================================
---- dbus/dbus-gproxy.c	(.../ags/dbus/0.61-osso2)	(revision 2887)
-+++ dbus/dbus-gproxy.c	(.../runk/dbus)	(revision 2887)
-@@ -493,6 +493,8 @@
+--- a/dbus/dbus-gproxy.c
++++ b/dbus/dbus-gproxy.c
+@@ -496,6 +496,8 @@ find_name_in_info (gconstpointer a, gcon
    const DBusGProxyNameOwnerInfo *info = a;
    const char *name = b;
  

Modified: projects/haf/trunk/dbus-glib/debian/patches/05-unassociate-proxies-asserts.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/05-unassociate-proxies-asserts.patch	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/patches/05-unassociate-proxies-asserts.patch	2008-11-27 21:02:07 UTC (rev 16792)
@@ -1,7 +1,8 @@
-diff -pur dbus/dbus-gproxy.c dbus.new/glib/dbus-gproxy.c
---- dbus/dbus-gproxy.c	2006-09-18 14:54:25.000000000 +0300
-+++ dbus.new/dbus-gproxy.c	2006-11-06 14:35:07.653816192 +0200
-@@ -655,8 +655,12 @@ unassociate_proxies (gpointer key, gpoin
+Index: b/dbus/dbus-gproxy.c
+===================================================================
+--- a/dbus/dbus-gproxy.c
++++ b/dbus/dbus-gproxy.c
+@@ -660,8 +660,12 @@ unassociate_proxies (gpointer key, gpoin
  	{
  	  if (!priv->for_owner)
  	    {

Modified: projects/haf/trunk/dbus-glib/debian/patches/07-install-doxygen-docs.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/07-install-doxygen-docs.patch	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/patches/07-install-doxygen-docs.patch	2008-11-27 21:02:07 UTC (rev 16792)
@@ -1,5 +1,7 @@
---- dbus-glib-0.72/doc/Makefile.am	2006-09-27 15:27:24.000000000 +0300
-+++ dbus-glib-0.72.new/doc/Makefile.am	2006-11-14 17:47:24.820057376 +0200
+Index: b/doc/Makefile.am
+===================================================================
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
 @@ -1 +1,10 @@
 -SUBDIRS=reference
 \ No newline at end of file

Deleted: projects/haf/trunk/dbus-glib/debian/patches/08-fix-pending-call-remove.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/08-fix-pending-call-remove.patch	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/patches/08-fix-pending-call-remove.patch	2008-11-27 21:02:07 UTC (rev 16792)
@@ -1,30 +0,0 @@
---- dbus-glib-0.74/dbus/dbus-gproxy.c.old	2008-03-07 16:39:02.000000000 +0200
-+++ dbus-glib-0.74/dbus/dbus-gproxy.c	2008-03-07 16:52:08.000000000 +0200
-@@ -1433,13 +1433,14 @@ dbus_g_proxy_class_init (DBusGProxyClass
-                   G_TYPE_NONE, 2, DBUS_TYPE_MESSAGE, G_TYPE_POINTER);
- }
- 
--static void
-+static gboolean
- cancel_pending_call (gpointer key, gpointer val, gpointer data)
- {
--  DBusGProxyCall *call = key;
--  DBusGProxy *proxy = data;
-+  DBusPendingCall *pending = val;
- 
--  dbus_g_proxy_cancel_call (proxy, call);
-+  dbus_pending_call_cancel (pending);
-+
-+  return TRUE;
- }
- 
- static void
-@@ -1454,7 +1455,7 @@ dbus_g_proxy_dispose (GObject *object)
-     }
- 
-   /* Cancel outgoing pending calls */
--  g_hash_table_foreach (priv->pending_calls, cancel_pending_call, proxy);
-+  g_hash_table_foreach_remove (priv->pending_calls, cancel_pending_call, NULL);
-   g_hash_table_destroy (priv->pending_calls);
-   priv->pending_calls = NULL;
- 

Deleted: projects/haf/trunk/dbus-glib/debian/patches/09-replace-invalid-assert.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/09-replace-invalid-assert.patch	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/patches/09-replace-invalid-assert.patch	2008-11-27 21:02:07 UTC (rev 16792)
@@ -1,37 +0,0 @@
-diff -pur dbus-glib-0.74/dbus/dbus-gproxy.c dbus-glib-0.74.new/dbus/dbus-gproxy.c
---- dbus-glib-0.74/dbus/dbus-gproxy.c	2007-04-20 19:36:09.000000000 +0300
-+++ dbus-glib-0.74.new/dbus/dbus-gproxy.c	2007-10-19 16:43:34.990501168 +0300
-@@ -2167,7 +2167,11 @@ dbus_g_proxy_begin_call_internal (DBusGP
-                                         timeout))
-     goto oom;
-   dbus_message_unref (message);
--  g_assert (pending != NULL);
-+  if (pending == NULL)
-+    {
-+      g_debug ("Disconnected");
-+      return 0;
-+    }
- 
-   call_id = ++priv->call_id_counter;
- 
-@@ -2526,8 +2530,18 @@ dbus_g_proxy_call (DBusGProxy        *pr
- 
-   g_value_array_free (in_args);
- 
--  first_arg_type = va_arg (args, GType);
--  ret = dbus_g_proxy_end_call_internal (proxy, call_id, error, first_arg_type, args);
-+  if (call_id > 0)
-+    {
-+      first_arg_type = va_arg (args, GType);
-+      ret = dbus_g_proxy_end_call_internal (proxy, call_id, error, first_arg_type, args);
-+    }
-+  else
-+    {
-+      g_set_error (error, DBUS_GERROR,
-+		   DBUS_GERROR_FAILED,
-+		   _("Disconnection or out-of-memory"));
-+      ret = FALSE;
-+    }
- 
-   va_end (args);
- 

Deleted: projects/haf/trunk/dbus-glib/debian/patches/10-fix-free-in-dbus-gvalue.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/10-fix-free-in-dbus-gvalue.patch	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/patches/10-fix-free-in-dbus-gvalue.patch	2008-11-27 21:02:07 UTC (rev 16792)
@@ -1,22 +0,0 @@
-diff -pur dbus-glib-0.74/dbus/dbus-gvalue.c dbus-glib-0.74.new/dbus/dbus-gvalue.c
---- dbus-glib-0.74/dbus/dbus-gvalue.c	2007-03-29 14:14:51.000000000 +0300
-+++ dbus-glib-0.74.new/dbus/dbus-gvalue.c	2007-10-18 15:50:13.436219016 +0300
-@@ -766,7 +766,6 @@ demarshal_valuearray (DBusGValueMarshalC
-       current_sig = dbus_message_iter_get_signature (&subiter);
-       elt_type = _dbus_gtype_from_signature (current_sig, TRUE);
- 
--      dbus_free (current_sig);
-       if (elt_type == G_TYPE_INVALID)
- 	{
- 	  g_value_array_free (ret);
-@@ -774,8 +773,10 @@ demarshal_valuearray (DBusGValueMarshalC
- 		       DBUS_GERROR,
- 		       DBUS_GERROR_INVALID_ARGS,
- 		       _("Couldn't demarshal argument with signature \"%s\""), current_sig);
-+	  dbus_free (current_sig);
- 	  return FALSE;
- 	}
-+      dbus_free (current_sig);
-       
-       g_value_init (val, elt_type);
- 

Deleted: projects/haf/trunk/dbus-glib/debian/patches/11-add-va_end-to-locate_attributes.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/11-add-va_end-to-locate_attributes.patch	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/patches/11-add-va_end-to-locate_attributes.patch	2008-11-27 21:02:07 UTC (rev 16792)
@@ -1,16 +0,0 @@
-diff -pur dbus-glib-0.74/dbus/dbus-gparser.c dbus-glib-0.74.new/dbus/dbus-gparser.c
---- dbus-glib-0.74/dbus/dbus-gparser.c	2006-09-27 15:27:24.000000000 +0300
-+++ dbus-glib-0.74.new/dbus/dbus-gparser.c	2007-10-19 10:19:56.823794400 +0300
-@@ -76,7 +76,11 @@ locate_attributes (const char  *element_
- 
-   while (name != NULL)
-     {
--      g_return_val_if_fail (retloc != NULL, FALSE);
-+      if (retloc == NULL)
-+        {
-+          va_end (args);
-+          return FALSE;
-+        }
- 
-       g_assert (n_attrs < MAX_ATTRS);
-       

Deleted: projects/haf/trunk/dbus-glib/debian/patches/12-remove_match_in_unregister.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/12-remove_match_in_unregister.patch	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/patches/12-remove_match_in_unregister.patch	2008-11-27 21:02:07 UTC (rev 16792)
@@ -1,18 +0,0 @@
-diff -pur dbus-glib-0.74/dbus/dbus-gproxy.c dbus-glib-0.74.new/dbus/dbus-gproxy.c
---- dbus-glib-0.74/dbus/dbus-gproxy.c	2007-04-20 19:36:09.000000000 +0300
-+++ dbus-glib-0.74.new/dbus/dbus-gproxy.c	2007-11-02 15:50:06.249556712 +0200
-@@ -1059,6 +1059,14 @@ dbus_g_proxy_manager_unregister (DBusGPr
-     {
-       g_hash_table_destroy (manager->proxy_lists);
-       manager->proxy_lists = NULL;
-+
-+      /* remove the match added in dbus_g_proxy_manager_register */
-+      dbus_bus_remove_match (manager->connection,
-+                          "type='signal',sender='" DBUS_SERVICE_DBUS
-+			  "',path='" DBUS_PATH_DBUS
-+			  "',interface='" DBUS_INTERFACE_DBUS
-+			  "',member='NameOwnerChanged'",
-+			  NULL);
-     }
- 
-   g_free (tri);

Modified: projects/haf/trunk/dbus-glib/debian/patches/13-zero-call_id-fix.patch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/13-zero-call_id-fix.patch	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/patches/13-zero-call_id-fix.patch	2008-11-27 21:02:07 UTC (rev 16792)
@@ -1,7 +1,8 @@
-diff -pur dbus-glib-0.74/dbus/dbus-gproxy.c dbus-glib-0.74.new/dbus/dbus-gproxy.c
---- dbus-glib-0.74/dbus/dbus-gproxy.c	2007-04-20 19:36:09.000000000 +0300
-+++ dbus-glib-0.74.new/dbus/dbus-gproxy.c	2008-08-05 13:06:09.000000000 +0300
-@@ -2559,7 +2559,7 @@ dbus_g_proxy_call_with_timeout (DBusGPro
+Index: b/dbus/dbus-gproxy.c
+===================================================================
+--- a/dbus/dbus-gproxy.c
++++ b/dbus/dbus-gproxy.c
+@@ -2627,7 +2627,7 @@ dbus_g_proxy_call_with_timeout (DBusGPro
                     GType              first_arg_type,
                     ...)
  {
@@ -10,7 +11,7 @@
    guint call_id;
    va_list args;
    GValueArray *in_args;
-@@ -2575,8 +2575,10 @@ dbus_g_proxy_call_with_timeout (DBusGPro
+@@ -2643,8 +2643,10 @@ dbus_g_proxy_call_with_timeout (DBusGPro
  
    g_value_array_free (in_args);
  

Added: projects/haf/trunk/dbus-glib/debian/patches/series
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/series	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/patches/series	2008-11-27 21:02:07 UTC (rev 16792)
@@ -0,0 +1,4 @@
+01-dbus-gproxy-crash-fix.patch
+05-unassociate-proxies-asserts.patch
+07-install-doxygen-docs.patch
+13-zero-call_id-fix.patch

Modified: projects/haf/trunk/dbus-glib/debian/rules
===================================================================
--- projects/haf/trunk/dbus-glib/debian/rules	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/rules	2008-11-27 21:02:07 UTC (rev 16792)
@@ -4,31 +4,29 @@
 # Copyright © 2006 Sjoerd Simons <sjoerd at debian.org>
 # Copyright © 2006 Nokia Corporation. All rights reserved.
 
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_TAR_SRCDIR := dbus-glib-0.74
-include /usr/share/cdbs/1/rules/tarball.mk
-
 # Use soft-float and thumb mode if it is enabled.
 ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
         CFLAGS += -mthumb
 endif
 
 # Strict library versioning
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V "libdbus-glib-1-2 (>= 0.76)"
 
-DEB_DH_STRIP_ARGS := --dbg-package=libdbus-glib-1-2
+DEB_CONFIGURE_EXTRA_FLAGS := --with-introspect-xml=$(CURDIR)/debian/dbus-bus-introspect.xml
 
+# these doc directories can safely be symlinks to the library's docs
+DEB_INSTALL_DOCS_libdbus-glib-1-2-dbg := --no-act
+DEB_INSTALL_CHANGELOGS_libdbus-glib-1-2-dbg := --no-act
+
 # this is needed because we patch Makefile.ams in the tarball
 makebuilddir/libdbus-glib-1-2::
 	cd $(DEB_BUILDDIR); AUTOMAKE=automake-1.9 ACLOCAL=aclocal-1.9 autoreconf
 
-common-configure-impl::
-	cp $(CURDIR)/debian/dbus-bus-introspect.xml $(DEB_BUILDDIR)/tools/
-
 doxygen-stamp:
 	cd $(DEB_BUILDDIR); doxygen Doxyfile
 	touch doxygen-stamp
@@ -38,4 +36,3 @@
 clean::
 	rm -f doxygen-stamp
 	rm -rf $(DEB_BUILDDIR)/doc/api
-	rm -f *.cdbs-config_list

Added: projects/haf/trunk/dbus-glib/debian/watch
===================================================================
--- projects/haf/trunk/dbus-glib/debian/watch	2008-11-27 19:41:29 UTC (rev 16791)
+++ projects/haf/trunk/dbus-glib/debian/watch	2008-11-27 21:02:07 UTC (rev 16792)
@@ -0,0 +1,2 @@
+version=3
+http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-(.*)\.tar\.gz
More information about the maemo-commits mailing list