[SCM] Debian GNU Mach packaging branch, master, updated. debian/2%1.3.99.dfsg.git20120219-1-48-g2fced06

[Samuel Thibault]

The following commit has been merged in the master branch:
commit 2fced06e575f0e0af5bba8a70c6c21fe6ec5ed0c
Author: Samuel Thibault <address@hidden>
Date:   Sat May 5 14:08:49 2012 +0200

    patches/70_dde.patch: Fix erroneous prototype.

diff --git a/debian/changelog b/debian/changelog
index 58083d4..cd2747a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ gnumach (2:1.3.99.dfsg.git20120505-1) UNRELEASED; urgency=low
   * control: Bump Standards-Version to 3.9.3 (no changes).
   * patches/50_initrd.patch: Refresh.
   * patches/60_bigmem.patch: Also update the kernel/user addresses limit.
+  * patches/70_dde.patch: Fix erroneous prototype.
 
  -- Samuel Thibault <address@hidden>  Sat, 05 May 2012 13:22:36 +0200
 
diff --git a/debian/patches/70_dde.patch b/debian/patches/70_dde.patch
index d88ce09..bebab00 100644
--- a/debian/patches/70_dde.patch
+++ b/debian/patches/70_dde.patch
@@ -763,13 +763,15 @@ index 95b499b..c360af6 100644
  #ifndef MACH
        console_map_init();
 diff --git a/kern/ipc_kobject.c b/kern/ipc_kobject.c
-index bd171a7..285f90d 100644
+index c922d7f..078b1d0 100644
 --- a/kern/ipc_kobject.c
 +++ b/kern/ipc_kobject.c
-@@ -152,6 +152,7 @@ ipc_kobject_server(request)
+@@ -151,7 +151,8 @@ ipc_kobject_server(request)
+                               mach_host_server_routine(),
                                device_server_routine(),
                                device_pager_server_routine(),
-                               mach4_server_routine();
+-                              mach4_server_routine();
++                              mach4_server_routine(),
 +                              experimental_server_routine();
  #if   MACH_DEBUG
        extern mig_routine_t    mach_debug_server_routine();

-- 
Debian GNU Mach packaging