[SCM] Debian GNU Mach packaging branch, master, updated. debian/2%1.3.99.dfsg.git20120610-1-12-ge3641e6

[Samuel Thibault]

The following commit has been merged in the master branch:
commit e3641e62f841af2bf27c56d651a183e0601f150d
Author: Samuel Thibault <address@hidden>
Date:   Sun Sep 23 00:49:39 2012 +0200

    Remove iopl compatibility device, break xorg depending on it
    
      * patches/40_iopl_mem.patch: Remove
      * control: Break xserver before 1.9.99.1.

diff --git a/debian/changelog b/debian/changelog
index 2d42901..f8f8d73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gnumach (2:1.3.99.dfsg.git20120710-2) UNRELEASED; urgency=low
 
   * patches/60_bigmem.patch: Also set Xen to 2/2 memory model.
+  * patches/40_iopl_mem.patch: Remove
+  * control: Break xserver before 1.9.99.1.
 
  -- Samuel Thibault <address@hidden>  Sat, 14 Jul 2012 15:59:33 +0200
 
diff --git a/debian/control b/debian/control
index f7a050e..66c3c13 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,7 @@ Package: gnumach-image-1.3.99-486
 Architecture: any-i386
 Depends: ${misc:Depends}, gnumach-common
 Provides: gnumach-image
-Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1)
+Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1), xserver-xorg-core (<< 
2:1.9.99.1~)
 Description: GNU version of the Mach microkernel
  This is the Utah Mach microkernel used by the Hurd.
 
@@ -93,7 +93,7 @@ Priority: extra
 Provides: gnumach
 Architecture: any-i386
 Depends: ${misc:Depends}, gnumach-common
-Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1)
+Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1), xserver-xorg-core (<< 
2:1.9.99.1~)
 Description: GNU version of the Mach microkernel for debugging
  This is the Utah Mach microkernel used by the Hurd.
  .
diff --git a/debian/patches/40_iopl_mem.patch b/debian/patches/40_iopl_mem.patch
deleted file mode 100644
index 1050493..0000000
--- a/debian/patches/40_iopl_mem.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-The mem device provides direct memory access (needed e.g. for Xorg), but
-some packages (Xorg, notably) are still using the iopl device.  TODO:
-drop this patch when xserver-xorg >= 1.9.99.1 enters unstable (and break
-previous versions).
-
-diff --git a/i386/i386at/conf.c b/i386/i386at/conf.c
-index d51b5ee..88e753c 100644
---- a/i386/i386at/conf.c
-+++ b/i386/i386at/conf.c
-@@ -135,6 +135,10 @@ struct dev_ops    dev_name_list[] =
-         nodev,        nodev,          nodev,          memmmap,
-         nodev,        nulldev,        nulldev,        0,
-         nodev },
-+      { "iopl",       nulldev,        nulldev,        nodev,
-+        nodev,        nodev,          nodev,          memmmap,
-+        nodev,        nulldev,        nulldev,        0,
-+        nodev },
- #endif        /* MACH_HYP */
- 
- #ifdef        MACH_KMSG
diff --git a/debian/patches/series b/debian/patches/series
index 4c7a3d0..e8eb4db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@
 12_version_suffix.patch
 13_ide_dma.patch
 24_pci_irq_fix.patch
-40_iopl_mem.patch
 50_initrd.patch
 60_bigmem.patch
 70_dde.patch

-- 
Debian GNU Mach packaging