diff options
| author | Guillem Jover <guillem@debian.org> | 2006-08-27 19:39:02 +0000 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2006-08-27 19:39:02 +0000 |
| commit | 26a435c96bc3fccfa6713736fef733014acdb177 (patch) | |
| tree | 587509b85e8dbd3236fb34763a9bd8122e8511d1 /debian | |
| parent | 408df965b6965ed9ed39ccfba472703e34c5eb54 (diff) | |
Conflict with hurd <= 20060825-1, due to an interface change in the
networking code.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index c71eb00..246bb35 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ gnumach (1:20060826.dfsg.1-1) UNRELEASED; urgency=low * New upstream CVS snapshot. - Disable wavelan driver as it does not build anymore with the updated Linux header files. + - Conflict with hurd <= 20060825-1, due to an interface change in the + networking code. - debian/patches/05_halt_on_panic_flag.patch: Sync. - debian/patches/10_cdromlock.patch: Likewise. - debian/patches/12_sis900.patch: Likewise. diff --git a/debian/control b/debian/control index 46fc06f..4756180 100644 --- a/debian/control +++ b/debian/control @@ -12,6 +12,7 @@ Package: gnumach Section: base Priority: optional Architecture: hurd-i386 i386 kfreebsd-i386 knetbsd-i386 +Conflicts: hurd (<= 20060825-1) Description: The GNU version of the Mach microkernel This is the Utah Mach microkernel used by the Hurd. @@ -20,6 +21,7 @@ XC-Package-Type: udeb Section: debian-installer Priority: optional Architecture: hurd-i386 i386 kfreebsd-i386 knetbsd-i386 +Conflicts: hurd-udeb (<= 20060825-1) Description: The GNU version of the Mach microkernel This is the Utah Mach microkernel used by the Hurd. |