[SCM] Debian GNU Mach packaging branch, master, updated. debian/1.3.99.dfsg.git20100732-1-11-g89e5eab

[Samuel Thibault]

The following commit has been merged in the master branch:
commit 89e5eab5ad3176652a6b0fc22d540bb736cf9aeb
Author: Samuel Thibault <address@hidden>
Date:   Sat Feb 26 21:32:55 2011 +0100

    gnumach-image-{xen-,}486-dbg packages are not really needed

diff --git a/debian/changelog b/debian/changelog
index 364a503..12b3606 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,10 +12,10 @@ gnumach (2:1.3.99.dfsg.git20100732-2) unreleased; 
urgency=low
     - 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
+    - Add gnumach-image-{xen-,}486, which depend on
+    gnumach-image-1.3.99-{xen-,}486.
+    - Re-add gnumach{,-dbg} packages, which depend on gnumach-image-486 and
+    gnumach-image-1.3.99-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.
diff --git a/debian/control b/debian/control
index c4b5083..af04953 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Package: gnumach-dbg
 Section: debug
 Priority: extra
 Architecture: any-i386
-Depends: ${misc:Depends}, gnumach-image-486-dbg
+Depends: ${misc:Depends}, gnumach (= ${binary:Version}), 
gnumach-image-1.3.99-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
@@ -45,26 +45,6 @@ Description: The GNU version of the Mach microkernel
  .
  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

-- 
Debian GNU Mach packaging