Rename gnumach packages into gnumach-image-1.3.99-{xen-,}486{,-dbg}

  * debian/rules: Rename /boot/gnumach* into
    /boot/gnumach-1.3.99-{xen-,}486{,-dbg}
  * debian/control:
    - Rename gnumach{,-dbg} into gnumach-image-1.3.99-486{,-dbg}
    - Add gnumach-image-1.3.99-xen-486{,-dbg} containing Xen variants of gnumach
    - Add gnumach-common to contain msgids and info documentation shared by
    gnumach-image-1.3.99 packages, which now depend on it.
    - Add gnumach-image-{xen-,}486{,-dbg}, which depend on
    gnumach-image-1.3.99-{xen-,}486{,-dbg}.
    - Re-add gnumach{,-dbg} packages, which depend on
    gnumach-image-486{,-dbg}, make these packages break grub-pc versions
    before the one which generate menu entries for all /boot/gnumach* files.
    - Rename gnumach-udeb into kernel-image-1.3.99-486-di.
    - Add kernel-image-1.3.99-xen-486-di.
  * debian/rules: Apply package renames in $(pkg{,_xen,_udeb,_dbg,_xen_dbg).
  * debian/gnumach*.{install,docs}: Rename accordingly.

1 files changed, 81 insertions, 10 deletions

diff --git a/debian/control b/debian/control
index fb814dc..c4b5083 100644
--- a/debian/control
+++ b/debian/control
@@ -13,35 +13,106 @@ Standards-Version: 3.9.1
 
 Package: gnumach
 Architecture: any-i386
+Depends: ${misc:Depends}, gnumach-image-486
+Breaks: grub-pc (<< 1.98+20100527-1)
+Description: Dummy transition package for gnumach-image-*
+ This is a dummy package to ease the transition to gnumach-image-*
+ package names.  It can be purged safely after upgrade.
+
+Package: gnumach-dbg
+Section: debug
+Priority: extra
+Architecture: any-i386
+Depends: ${misc:Depends}, gnumach-image-486-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
+ package names.  It can be purged safely after upgrade.
+
+Package: gnumach-image-486
+Architecture: any-i386
+Depends: ${misc:Depends}, gnumach-image-1.3.99-486
+Description: The GNU version of the Mach microkernel
+ This package depends on the latest GNU Mach kernel for use on PCs
+ with a 486, Pentium or compatible processor.
+
+Package: gnumach-image-xen-486
+Architecture: any-i386
+Depends: ${misc:Depends}, gnumach-image-1.3.99-xen-486
+Description: The GNU version of the Mach microkernel
+ This package depends on the latest GNU Mach kernel for use on PCs
+ with a 486, Pentium or compatible processor.
+ .
+ This kernel is for use in unprivileged (domU) Xen domains.
+
+Package: gnumach-image-486-dbg
+Section: debug
+Priority: extra
+Architecture: any-i386
+Depends: ${misc:Depends}, gnumach-image-1.3.99-486-dbg
+Description: The GNU version of the Mach microkernel for debugging
+ This package depends on the latest GNU Mach kernel for debugging on
+ PCs with a 486, Pentium or compatible processor.
+
+Package: gnumach-image-xen-486-dbg
+Section: debug
+Priority: extra
+Architecture: any-i386
+Depends: ${misc:Depends}, gnumach-image-1.3.99-xen-486-dbg
+Description: The GNU version of the Mach microkernel for debugging
+ This package depends on the latest GNU Mach kernel for debugging on
+ PCs with a 486, Pentium or compatible processor.
+ .
+ This kernel is for use in unprivileged (domU) Xen domains.
+
+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)
 Description: The GNU version of the Mach microkernel
  This is the Utah Mach microkernel used by the Hurd.
 
-Package: gnumach-xen
+Package: gnumach-image-1.3.99-xen-486
 Architecture: any-i386
 Depends: ${misc:Depends}, gnumach-common
+Provides: gnumach-image
 Breaks: libc0.3 (<< 2.10.1-3)
 Description: The GNU version of the Mach microkernel for Xen
  This is the Utah Mach microkernel used by the Hurd.
  .
  The version in this package is compiled with Xen support.
 
-Package: gnumach-udeb
+Package: kernel-image-1.3.99-486-di
+XB-Kernel-Version: 1.3.99-486
 Package-Type: udeb
 Provides: kernel-image, floppy-modules, ide-modules, input-modules, nic-modules, nic-pcmcia-modules, nic-wireless-modules, pcmcia-modules, scsi-modules, serial-modules
 Section: debian-installer
-Architecture: hurd-i386
-Depends: ${misc:Depends}
-Description: The GNU version of the Mach microkernel
- This is the Utah Mach microkernel used by the Hurd.
+Architecture: any-i386
+Depends: ${misc:Depends}, hurd-udeb
+Description: The GNU version of the Mach microkernel for the Debian installer
+ This is the Utah Mach microkernel used by the Hurd for the Debian
+ Installer boot images. It does _not_ provide a usable kernel for
+ your full Debian system.
 
-Package: gnumach-dbg
+Package: kernel-image-1.3.99-xen-486-di
+XB-Kernel-Version: 1.3.99-486
+Package-Type: udeb
+Provides: kernel-image, input-modules, nic-modules
+Section: debian-installer
+Architecture: any-i386
+Depends: ${misc:Depends}, hurd-udeb
+Description: The GNU version of the Mach microkernel for the Debian installer
+ This is the Utah Mach microkernel used by the Hurd for the Debian
+ Installer boot images. It does _not_ provide a usable kernel for
+ your full Debian system.
+
+Package: gnumach-image-1.3.99-486-dbg
 Section: debug
 Priority: extra
 Provides: gnumach
 Architecture: any-i386
-Depends: ${misc:Depends}, gnumach (= ${binary:Version})
+Depends: ${misc:Depends}, gnumach-image-1.3.99-486 (= ${binary:Version})
 Description: The GNU version of the Mach microkernel for debugging
  This is the Utah Mach microkernel used by the Hurd.
  .
@@ -49,12 +120,12 @@ Description: The 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-xen-dbg
+Package: gnumach-image-1.3.99-xen-486-dbg
 Section: debug
 Priority: extra
 Provides: gnumach
 Architecture: any-i386
-Depends: ${misc:Depends}, gnumach-xen (= ${binary:Version})
+Depends: ${misc:Depends}, gnumach-image-1.3.99-xen-486 (= ${binary:Version})
 Description: The GNU version of the Mach microkernel for Xen for debugging
  This is the Utah Mach microkernel used by the Hurd.
  .