[Pkg-utopia-commits] r755 - in packages/unstable/dbus/debian: . patches

[Sebastian Dröge]

Author: slomo-guest
Date: 2006-03-18 13:57:27 +0000 (Sat, 18 Mar 2006)
New Revision: 755

Added:
   packages/unstable/dbus/debian/patches/dbus-0.60-mono-return-null-fix.diff
Modified:
   packages/unstable/dbus/debian/changelog
   packages/unstable/dbus/debian/control
Log:
 * dbus/debian/patches/dbus-0.60-mono-return-null-fix.diff:
   + Added again as this wasn't applied upstream. This makes dbus-sharp
     useable again as you don't get null anymore when asking for the session
     bus (see fd.o #5716)


Modified: packages/unstable/dbus/debian/changelog
===================================================================
--- packages/unstable/dbus/debian/changelog	2006-03-16 22:16:59 UTC (rev 754)
+++ packages/unstable/dbus/debian/changelog	2006-03-18 13:57:27 UTC (rev 755)
@@ -1,3 +1,12 @@
+dbus (0.61-5) unstable; urgency=low
+
+  * debian/patches/dbus-0.60-mono-return-null-fix.diff:
+    + Added again as this wasn't applied upstream. This makes dbus-sharp
+      useable again as you don't get null anymore when asking for the session
+      bus (see fd.o #5716)
+
+ -- Sebastian Dröge <slomo at ubuntu.com>  Sat, 18 Mar 2006 14:40:48 +0100
+
 dbus (0.61-4) unstable; urgency=low
 
   * debian/patches/dbus-reload-usercache.patch

Modified: packages/unstable/dbus/debian/control
===================================================================
--- packages/unstable/dbus/debian/control	2006-03-16 22:16:59 UTC (rev 754)
+++ packages/unstable/dbus/debian/control	2006-03-18 13:57:27 UTC (rev 755)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers at lists.alioth.debian.org>
-Uploaders: Daniel Stone <daniels at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Daniel Stone <daniels at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Sebastian Dröge <slomo at ubuntu.com>
 Build-Depends: cdbs (>= 0.4.5.1), debhelper (>= 4.1.46), libglib2.0-dev, libexpat-dev, doxygen, docbook-utils, python2.4, libgtk2.0-dev, python-pyrex (>= 0.9.2.1-3), xmlto, python2.4-dev, libqt3-mt-dev, libqt4-dev
 Build-Depends-Indep: libgtk-cil, cli-common (>= 0.2.0), libmono-dev, mono-mcs, mono-gac, monodoc-base
 Standards-Version: 3.6.1.0

Added: packages/unstable/dbus/debian/patches/dbus-0.60-mono-return-null-fix.diff
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-0.60-mono-return-null-fix.diff	2006-03-16 22:16:59 UTC (rev 754)
+++ packages/unstable/dbus/debian/patches/dbus-0.60-mono-return-null-fix.diff	2006-03-18 13:57:27 UTC (rev 755)
@@ -0,0 +1,22 @@
+--- mono/Connection.cs.old	2006-02-07 18:13:30.886925672 +0100
++++ mono/Connection.cs	2006-02-07 18:14:07.426370832 +0100
+@@ -116,7 +116,7 @@
+ 	// Maybe we already have a Connection object associated with
+ 	// this rawConnection then return it
+ 	IntPtr rawThis = dbus_connection_get_data (rawConnection, slot);
+-	if (rawThis != IntPtr.Zero) {
++	if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Connection)) {
+ 	  return (DBus.Connection) ((GCHandle)rawThis).Target;
+ 	}
+       }
+--- mono/Message.cs.old	2006-02-07 18:11:27.917619848 +0100
++++ mono/Message.cs	2006-02-07 18:12:36.628174256 +0100
+@@ -110,7 +110,7 @@
+       if (slot > -1) {
+ 	// If we already have a Message object associated with this rawMessage then return it
+ 	IntPtr rawThis = dbus_message_get_data(rawMessage, slot);
+-	if (rawThis != IntPtr.Zero)
++	if (rawThis != IntPtr.Zero && ((GCHandle)rawThis).Target == typeof(DBus.Message))
+ 	  return (DBus.Message) ((GCHandle)rawThis).Target;
+       } 
+       // If it doesn't exist then create a new Message around it