xorg-server: Changes to 'debian-unstable'

[Brice Goglin <bgoglin@alioth.debian.org>]

 debian/changelog                 |    6 ++++++
 debian/patches/20_hurd-i386.diff |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 1530ea1e7dba6554fa70c1286f866061630ffce2
Author: Brice Goglin <bgoglin@debian.org>
Date:   Sun Sep 27 20:17:54 2009 +0200

    Update 20_hurd-i386.diff

diff --git a/debian/changelog b/debian/changelog
index 53758f4..c9b04f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.6.3.901-2) UNRELEASED; urgency=low
+
+  * Update 20_hurd-i386.diff, thanks Samuel Thibault, closes: #548606.
+
+ -- Brice Goglin <bgoglin@debian.org>  Sun, 27 Sep 2009 20:16:51 +0200
+
 xorg-server (2:1.6.3.901-1) unstable; urgency=low
 
   [ Julien Cristau ]
diff --git a/debian/patches/20_hurd-i386.diff b/debian/patches/20_hurd-i386.diff
index fbc32c6..fc54f4c 100644
--- a/debian/patches/20_hurd-i386.diff
+++ b/debian/patches/20_hurd-i386.diff
@@ -65,7 +65,7 @@ Index: xorg-server/hw/xfree86/os-support/hurd/hurd_video.c
 -pointer 
 -xf86MapVidMem(int ScreenNum,int Flags, unsigned long Base, unsigned long Size)
 +static pointer 
-+mapVidMem(int ScreenNum,int Flags, unsigned long Base, unsigned long Size)
++mapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int Flags)
  {
      mach_port_t device,iopl_dev;
      memory_object_t iopl_mem;