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.

15 files changed, 133 insertions, 33 deletions

diff --git a/debian/changelog b/debian/changelog
index b122b80..364a503 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,15 +5,26 @@ gnumach (2:1.3.99.dfsg.git20100732-2) unreleased; urgency=low
   * debian/source/options: Enable bz2 compression.
   * debian/patches/60_bigmem.patch: Add patch to support almost up to 2GiB
     memory.
+  * debian/rules: Rename /boot/gnumach* into
+    /boot/gnumach-1.3.99-{xen-,}486{,-dbg}
   * debian/control:
-    - Add gnumach-xen and gnumach-xen-dbg, containing Xen variants of gnumach
-    and gnumach-dbg. Add gnumach-common to contain msgids shared by gnumach and
-    gnumach-xen, which now depend on it.
-    - Build gnumach-udeb on hurd-i386 only.
+    - 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.
     - Use Package-Type instead of XC-Package-Type.
     - Make gnumach packages break glibc versions before the one which can cope
     with > 1GiB memory support.
     - Fix upstream URL (Closes: Bug#604257).
+  * debian/rules: Apply package renames in $(pkg{,_xen,_udeb,_dbg,_xen_dbg).
+  * debian/gnumach*.{install,docs}: Rename accordingly.
 
  -- Samuel Thibault <sthibault@debian.org>  Sat, 31 Jul 2010 17:35:20 +0200
 
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.
  .
diff --git a/debian/gnumach-xen.info b/debian/gnumach-common.info
index 87c8231..87c8231 100644
--- a/debian/gnumach-xen.info
+++ b/debian/gnumach-common.info
diff --git a/debian/gnumach-dbg.docs b/debian/gnumach-image-1.3.99-486-dbg.docs
index 4b4e16d..4b4e16d 100644
--- a/debian/gnumach-dbg.docs
+++ b/debian/gnumach-image-1.3.99-486-dbg.docs
diff --git a/debian/gnumach-dbg.install b/debian/gnumach-image-1.3.99-486-dbg.install
index 36ef4c3..36ef4c3 100644
--- a/debian/gnumach-dbg.install
+++ b/debian/gnumach-image-1.3.99-486-dbg.install
diff --git a/debian/gnumach.docs b/debian/gnumach-image-1.3.99-486.docs
index 4b4e16d..4b4e16d 100644
--- a/debian/gnumach.docs
+++ b/debian/gnumach-image-1.3.99-486.docs
diff --git a/debian/gnumach-udeb.install b/debian/gnumach-image-1.3.99-486.install
index 36ef4c3..36ef4c3 100644
--- a/debian/gnumach-udeb.install
+++ b/debian/gnumach-image-1.3.99-486.install
diff --git a/debian/gnumach-xen-dbg.docs b/debian/gnumach-image-1.3.99-xen-486-dbg.docs
index 9eafbe1..9eafbe1 100644
--- a/debian/gnumach-xen-dbg.docs
+++ b/debian/gnumach-image-1.3.99-xen-486-dbg.docs
diff --git a/debian/gnumach-xen-dbg.install b/debian/gnumach-image-1.3.99-xen-486-dbg.install
index 36ef4c3..36ef4c3 100644
--- a/debian/gnumach-xen-dbg.install
+++ b/debian/gnumach-image-1.3.99-xen-486-dbg.install
diff --git a/debian/gnumach-xen.docs b/debian/gnumach-image-1.3.99-xen-486.docs
index 9eafbe1..9eafbe1 100644
--- a/debian/gnumach-xen.docs
+++ b/debian/gnumach-image-1.3.99-xen-486.docs
diff --git a/debian/gnumach-xen.install b/debian/gnumach-image-1.3.99-xen-486.install
index 36ef4c3..36ef4c3 100644
--- a/debian/gnumach-xen.install
+++ b/debian/gnumach-image-1.3.99-xen-486.install
diff --git a/debian/gnumach.info b/debian/gnumach.info
deleted file mode 100644
index 87c8231..0000000
--- a/debian/gnumach.info
+++ /dev/null
@@ -1 +0,0 @@
-#build/doc/mach.info*
diff --git a/debian/gnumach.install b/debian/kernel-image-1.3.99-486-di.install
index 36ef4c3..36ef4c3 100644
--- a/debian/gnumach.install
+++ b/debian/kernel-image-1.3.99-486-di.install
diff --git a/debian/kernel-image-1.3.99-xen-486-di.install b/debian/kernel-image-1.3.99-xen-486-di.install
new file mode 100644
index 0000000..36ef4c3
--- /dev/null
+++ b/debian/kernel-image-1.3.99-xen-486-di.install
@@ -0,0 +1 @@
+boot
diff --git a/debian/rules b/debian/rules
index eeb85d5..4c220f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,15 @@
 # Rewritten by Guillem Jover <guillem@debian.org>
 #
 
-pkg := gnumach
-pkg_xen := gnumach-xen
-pkg_udeb := gnumach-udeb
-pkg_dbg := gnumach-dbg
-pkg_xen_dbg := gnumach-xen-dbg
+VERSION=1.3.99
+MACHINE=486
+
+pkg := gnumach-image-$(VERSION)-$(MACHINE)
+pkg_xen := gnumach-image-$(VERSION)-xen-$(MACHINE)
+pkg_udeb := kernel-image-$(VERSION)-$(MACHINE)-di
+pkg_xen_udeb := kernel-image-$(VERSION)-xen-$(MACHINE)-di
+pkg_dbg := gnumach-image-$(VERSION)-$(MACHINE)-dbg
+pkg_xen_dbg := gnumach-image-$(VERSION)-xen-$(MACHINE)-dbg
 pkg_common := gnumach-common
 pkg_dev := gnumach-dev
 
@@ -139,35 +143,49 @@ install: build
 	$(MAKE) -C build-xen-dbg install-exec \
 		DESTDIR=$(D_XEN_DBG) \
 	
-	mv $(D_XEN)/boot/gnumach $(D_XEN)/boot/gnumach-xen
-	mv $(D_DBG)/boot/gnumach $(D_DBG)/boot/gnumach-dbg
-	mv $(D_XEN_DBG)/boot/gnumach $(D_XEN_DBG)/boot/gnumach-xen-dbg
+	mv $(D)/boot/gnumach $(D)/boot/gnumach-$(VERSION)-$(MACHINE)
+	mv $(D_XEN)/boot/gnumach $(D_XEN)/boot/gnumach-$(VERSION)-xen-$(MACHINE)
+	mv $(D_DBG)/boot/gnumach $(D_DBG)/boot/gnumach-$(VERSION)-$(MACHINE)-dbg
+	mv $(D_XEN_DBG)/boot/gnumach $(D_XEN_DBG)/boot/gnumach-$(VERSION)-xen-$(MACHINE)-dbg
 
 binary: binary-indep binary-arch
 
-binary-indep:
+binary-indep: install
+	dh_testdir
+	dh_testroot
+	
+	dh_install -i --sourcedir=$(D)
+	
+	dh_installdocs -i
+	dh_installchangelogs -i -k ChangeLog
+#	dh_installinfo -a
+	
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 binary-arch: install
 	dh_testdir
 	dh_testroot
 	
-	dh_install -a -N$(pkg_xen) -N$(pkg_dbg) -N$(pkg_xen_dbg) --sourcedir=$(D)
-	dh_install -p$(pkg_xen) --sourcedir=$(D_XEN)
+	dh_install -a -N$(pkg_xen) -N$(pkg_xen_udeb) -N$(pkg_dbg) -N$(pkg_xen_dbg) --sourcedir=$(D)
+	dh_install -p$(pkg_xen) -p$(pkg_xen_udeb) --sourcedir=$(D_XEN)
 	dh_install -p$(pkg_dbg) --sourcedir=$(D_DBG)
 	dh_install -p$(pkg_xen_dbg) --sourcedir=$(D_XEN_DBG)
 	
 	dh_installdocs -a
 	dh_installchangelogs -a -k ChangeLog
-#	dh_installinfo -a
 	
 	dh_link -a
 	dh_strip -a -N$(pkg_dbg) -N$(pkg_xen_dbg)
-	dh_compress -p$(pkg) -p$(pkg_udeb) -A boot/gnumach
-	dh_compress -p$(pkg_xen) boot/gnumach-xen
-	dh_compress -p$(pkg_dbg) boot/gnumach-dbg
-	dh_compress -p$(pkg_xen_dbg) boot/gnumach-xen-dbg
-	dh_compress -p$(pkg_common)
-	dh_compress -p$(pkg_dev)
+	dh_compress -a -N$(pkg) -N$(pkg_udeb) -N$(pkg_xen) -N$(pkg_xen_udeb) -N$(pkg_dbg) -N$(pkg_xen_dbg)
+	dh_compress -p$(pkg) -p$(pkg_udeb) -A boot/gnumach-$(VERSION)-$(MACHINE)
+	dh_compress -p$(pkg_xen) -p$(pkg_xen_udeb) -A boot/gnumach-$(VERSION)-xen-$(MACHINE)
+	dh_compress -p$(pkg_dbg) boot/gnumach-$(VERSION)-$(MACHINE)-dbg
+	dh_compress -p$(pkg_xen_dbg) boot/gnumach-$(VERSION)-xen-$(MACHINE)-dbg
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_gencontrol -a