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

[Sjoerd Simons]

Author: sjoerd
Date: 2006-02-16 11:04:55 +0000 (Thu, 16 Feb 2006)
New Revision: 595

Added:
   packages/unstable/dbus/debian/patches/dbus-0.60-mono-arguments-fix.diff
   packages/unstable/dbus/debian/patches/dbus-0.60-mono-return-null-fix.diff
Modified:
   packages/unstable/dbus/debian/changelog
   packages/unstable/dbus/debian/dbus.postinst
Log:
* Sync relavant changes from ubuntu 
  + dbus-0.60-mono-arguments-fix.diff
    - Added. 64bit fixes ((fd.o bugzilla #4410)
  + dbus-0.60-mono-return-null-fix.diff
    - Added. Don't return null for the session bus (fd.o bugzilla #5716)
  + Send the update-notifier reboot required notification if it's installed

Modified: packages/unstable/dbus/debian/changelog
===================================================================
--- packages/unstable/dbus/debian/changelog	2006-02-16 10:19:19 UTC (rev 594)
+++ packages/unstable/dbus/debian/changelog	2006-02-16 11:04:55 UTC (rev 595)
@@ -1,3 +1,14 @@
+dbus (0.60-6) unstable; urgency=low
+
+  * Sync relavant changes from ubuntu 
+    + dbus-0.60-mono-arguments-fix.diff
+      - Added. 64bit fixes ((fd.o bugzilla #4410)
+    + dbus-0.60-mono-return-null-fix.diff
+      - Added. Don't return null for the session bus (fd.o bugzilla #5716)
+    + Send the update-notifier reboot required notification if it's installed
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Thu, 16 Feb 2006 11:46:43 +0100
+
 dbus (0.60-5) unstable; urgency=low
 
   * Fix a bashim in the postinst script (Closes: #347453)

Modified: packages/unstable/dbus/debian/dbus.postinst
===================================================================
--- packages/unstable/dbus/debian/dbus.postinst	2006-02-16 10:19:19 UTC (rev 594)
+++ packages/unstable/dbus/debian/dbus.postinst	2006-02-16 11:04:55 UTC (rev 595)
@@ -18,6 +18,9 @@
 if [ "$1" = "configure" ]; then
     if [ -e /var/run/dbus/pid ] && 
       ps --no-heading -p $(cat /var/run/dbus/pid) > /dev/null; then
+        # trigger an update notification which recommends to reboot
+        [ -x /usr/share/update-notifier/notify-reboot-required ] && \
+            /usr/share/update-notifier/notify-reboot-required || true
         exit 0
     fi
 fi

Added: packages/unstable/dbus/debian/patches/dbus-0.60-mono-arguments-fix.diff
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-0.60-mono-arguments-fix.diff	2006-02-16 10:19:19 UTC (rev 594)
+++ packages/unstable/dbus/debian/patches/dbus-0.60-mono-arguments-fix.diff	2006-02-16 11:04:55 UTC (rev 595)
@@ -0,0 +1,38 @@
+diff -aur dbus-0.60-orig/mono/Arguments.cs dbus-0.60/mono/Arguments.cs
+--- dbus-0.60-orig/mono/Arguments.cs	2005-03-08 20:36:15.000000000 -0800
++++ dbus-0.60/mono/Arguments.cs	2006-01-28 01:41:59.000000000 -0800
+@@ -10,7 +10,7 @@
+ 	public class Arguments : IEnumerable, IDisposable
+   {
+     // Must follow sizeof(DBusMessageIter)
+-    internal const int DBusMessageIterSize = 14*4;
++    internal static readonly int DBusMessageIterSize = Marshal.SizeOf (typeof(_DBusMessageIter));
+     private static Hashtable dbusTypes = null;
+     private Message message;
+     private IntPtr appenderIter;
+@@ -240,6 +240,25 @@
+       return new ArgumentsEnumerator(this);
+     }
+ 
++    [StructLayout(LayoutKind.Sequential)]
++    private class _DBusMessageIter
++    {
++       IntPtr dummy1;
++       IntPtr dummy2;
++       int    dummy3;
++       int    dummy4;
++       int    dummy5;
++       int    dummy6;
++       int    dummy7;
++       int    dummy8;
++       int    dummy9;
++       int    dummy10;
++       int    dummy11;
++       int    pad1;
++       int    pad2;
++       IntPtr pad3;
++   }
++	    
+     private class ArgumentsEnumerator : IEnumerator
+     {
+       private Arguments arguments;

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-02-16 10:19:19 UTC (rev 594)
+++ packages/unstable/dbus/debian/patches/dbus-0.60-mono-return-null-fix.diff	2006-02-16 11:04:55 UTC (rev 595)
@@ -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