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

[From: subversion at stage.maemo.org]

Author: guillem
Date: 2008-12-05 15:50:11 +0200 (Fri, 05 Dec 2008)
New Revision: 16880

Added:
   projects/haf/trunk/dbus-glib/dbus-glib_0.78.orig.tar.gz
Removed:
   projects/haf/trunk/dbus-glib/dbus-glib_0.76.orig.tar.gz
   projects/haf/trunk/dbus-glib/debian/patches/05-unassociate-proxies-asserts.patch
Modified:
   projects/haf/trunk/dbus-glib/debian/changelog
   projects/haf/trunk/dbus-glib/debian/patches/13-zero-call_id-fix.patch
   projects/haf/trunk/dbus-glib/debian/patches/series
Log:
New dbus-glib upstream release 0.78


Deleted: projects/haf/trunk/dbus-glib/dbus-glib_0.76.orig.tar.gz
===================================================================
(Binary files differ)

Added: projects/haf/trunk/dbus-glib/dbus-glib_0.78.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: projects/haf/trunk/dbus-glib/dbus-glib_0.78.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: projects/haf/trunk/dbus-glib/debian/changelog
===================================================================
--- projects/haf/trunk/dbus-glib/debian/changelog	2008-12-05 13:41:38 UTC (rev 16879)
+++ projects/haf/trunk/dbus-glib/debian/changelog	2008-12-05 13:50:11 UTC (rev 16880)
@@ -1,3 +1,12 @@
+dbus-glib (0.78-0maemo1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - debian/patches/05-unassociate-proxies-asserts.patch: Removed, fixed
+      upstream.
+    - debian/patches/13-zero-call_id-fix.patch: Refreshed.
+
+ -- Guillem Jover <guillem.jover at nokia.com>  Fri, 05 Dec 2008 15:31:37 +0200
+
 dbus-glib (0.76-1maemo1) unstable; urgency=low
 
   * New maintainer.

Deleted: 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-12-05 13:41:38 UTC (rev 16879)
+++ projects/haf/trunk/dbus-glib/debian/patches/05-unassociate-proxies-asserts.patch	2008-12-05 13:50:11 UTC (rev 16880)
@@ -1,19 +0,0 @@
-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)
- 	    {
--	      g_assert (priv->associated);
--	      g_assert (priv->name_call == NULL);
-+              if (priv->name_call != NULL)
-+                {
-+                  dbus_g_proxy_cancel_call (manager->bus_proxy,
-+                                            priv->name_call);
-+                  priv->name_call = NULL;
-+                }
- 
- 	      priv->associated = FALSE;
- 	      manager->unassociated_proxies = g_slist_prepend (manager->unassociated_proxies, proxy);

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-12-05 13:41:38 UTC (rev 16879)
+++ projects/haf/trunk/dbus-glib/debian/patches/13-zero-call_id-fix.patch	2008-12-05 13:50:11 UTC (rev 16880)
@@ -2,7 +2,7 @@
 ===================================================================
 --- a/dbus/dbus-gproxy.c
 +++ b/dbus/dbus-gproxy.c
-@@ -2627,7 +2627,7 @@ dbus_g_proxy_call_with_timeout (DBusGPro
+@@ -2632,7 +2632,7 @@ dbus_g_proxy_call_with_timeout (DBusGPro
                     GType              first_arg_type,
                     ...)
  {
@@ -11,7 +11,7 @@
    guint call_id;
    va_list args;
    GValueArray *in_args;
-@@ -2643,8 +2643,10 @@ dbus_g_proxy_call_with_timeout (DBusGPro
+@@ -2648,8 +2648,10 @@ dbus_g_proxy_call_with_timeout (DBusGPro
  
    g_value_array_free (in_args);
  

Modified: projects/haf/trunk/dbus-glib/debian/patches/series
===================================================================
--- projects/haf/trunk/dbus-glib/debian/patches/series	2008-12-05 13:41:38 UTC (rev 16879)
+++ projects/haf/trunk/dbus-glib/debian/patches/series	2008-12-05 13:50:11 UTC (rev 16880)
@@ -1,4 +1,3 @@
 01-dbus-gproxy-crash-fix.patch
-05-unassociate-proxies-asserts.patch
 07-install-doxygen-docs.patch
 13-zero-call_id-fix.patch