sync with upstream packaging

1 files changed, 11 insertions, 29 deletions

diff --git a/debian/control b/debian/control
index 2c82a07..3c789e4 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Section: debug
 Priority: extra
 Architecture: any-i386
 Build-Profiles: <!stage1>
-Depends: ${misc:Depends}, gnumach-image-1.5-686-dbg
+Depends: ${misc:Depends}, gnumach-image-1.6-686-dbg
 Breaks: grub-pc (<< 1.98+20100527-1)
 Description: Dummy transition package for gnumach-image-*-dbg
  This is a dummy package to ease the transition to gnumach-image-*dbg
@@ -33,40 +33,22 @@ Description: Dummy transition package for gnumach-image-*-dbg
 Package: gnumach-image-1-686
 Architecture: any-i386
 Build-Profiles: <!stage1>
-Depends: ${misc:Depends}, gnumach-image-1.5-686
+Depends: ${misc:Depends}, gnumach-image-1.6-686
 Description: GNU version of the Mach microkernel
  This package depends on the latest GNU Mach kernel for use on PCs
  with a 686, Pentium or compatible processor.
 
-Package: gnumach-image-1-686-dbg
-Architecture: any-i386
-Build-Profiles: <!stage1>
-Depends: ${misc:Depends}, gnumach-image-1.5-686-dbg
-Description: GNU version of the Mach microkernel
- This package depends on the latest GNU Mach kernel for use on PCs
- with a 686, Pentium or compatible processor, debug version.
-
 Package: gnumach-image-1-xen-686
 Architecture: any-i386
 Build-Profiles: <!stage1>
-Depends: ${misc:Depends}, gnumach-image-1.5-xen-686
+Depends: ${misc:Depends}, gnumach-image-1.6-xen-686
 Description: GNU version of the Mach microkernel
  This package depends on the latest GNU Mach kernel for use on PCs
  with a 686, Pentium or compatible processor.
  .
  This kernel is for use in unprivileged (domU) Xen domains.
 
-Package: gnumach-image-1-xen-686-dbg
-Architecture: any-i386
-Build-Profiles: <!stage1>
-Depends: ${misc:Depends}, gnumach-image-1.5-xen-686-dbg
-Description: GNU version of the Mach microkernel
- This package depends on the latest GNU Mach kernel for use on PCs
- with a 686, Pentium or compatible processor, debug version.
- .
- This kernel is for use in unprivileged (domU) Xen domains.
-
-Package: gnumach-image-1.5-686
+Package: gnumach-image-1.6-686
 Architecture: any-i386
 Build-Profiles: <!stage1>
 Depends: ${misc:Depends}, gnumach-common
@@ -75,7 +57,7 @@ Breaks: libc0.3 (<< 2.10.1-3), hurd (<< 20120520-1), xserver-xorg-core (<< 2:1.9
 Description: GNU version of the Mach microkernel
  This is the Utah Mach microkernel used by the Hurd.
 
-Package: gnumach-image-1.5-xen-686
+Package: gnumach-image-1.6-xen-686
 Architecture: any-i386
 Build-Profiles: <!stage1>
 Depends: ${misc:Depends}, gnumach-common
@@ -86,8 +68,8 @@ Description: GNU version of the Mach microkernel for Xen
  .
  The version in this package is compiled with Xen support.
 
-Package: kernel-image-1.5-686-di
-XB-Kernel-Version: 1.5-686
+Package: kernel-image-1.6-686-di
+XB-Kernel-Version: 1.6-686
 Package-Type: udeb
 Provides: kernel-image, floppy-modules, ide-modules, input-modules, scsi-modules, serial-modules
 Section: debian-installer
@@ -99,8 +81,8 @@ Description: GNU version of the Mach microkernel for the Debian installer
  Installer boot images. It does _not_ provide a usable kernel for
  your full Debian system.
 
-Package: kernel-image-1.5-xen-686-di
-XB-Kernel-Version: 1.5-xen-686
+Package: kernel-image-1.6-xen-686-di
+XB-Kernel-Version: 1.6-xen-686
 Package-Type: udeb
 Provides: kernel-image, input-modules
 Section: debian-installer
@@ -112,7 +94,7 @@ Description: GNU version of the Mach microkernel for the Debian installer
  Installer boot images. It does _not_ provide a usable kernel for
  your full Debian system.
 
-Package: gnumach-image-1.5-686-dbg
+Package: gnumach-image-1.6-686-dbg
 Section: debug
 Priority: extra
 Provides: gnumach
@@ -127,7 +109,7 @@ Description: GNU version of the Mach microkernel for debugging
  gnumach package, except that it is not stripped and has the
  kernel-level debugger compiled in.
 
-Package: gnumach-image-1.5-xen-686-dbg
+Package: gnumach-image-1.6-xen-686-dbg
 Section: debug
 Priority: extra
 Provides: gnumach