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

[Samuel Thibault]

The following commit has been merged in the master branch:
commit c81a60d19be261ca3ac968caa1adac7072c6aa5d
Author: Samuel Thibault <address@hidden>
Date:   Sun Feb 27 13:20:52 2011 +0000

    Keep gnumach.gz name in d-i kernel-image packages

diff --git a/debian/changelog b/debian/changelog
index 551bc20..f3bdc28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,8 @@ gnumach (2:1.3.99.dfsg.git20110227-1) unreleased; urgency=low
   * 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}
+    - Rename gnumach{,-dbg} into gnumach-image-1.3.99-486{,-dbg} (except in
+    udebs).
     - 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.
diff --git a/debian/rules b/debian/rules
index 4c220f4..831a7b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,9 @@ pkg_common := gnumach-common
 pkg_dev := gnumach-dev
 
 D := $(CURDIR)/debian/tmp
+D_UDEB := $(D)-udeb
 D_XEN := $(D)-xen
+D_XEN_UDEB := $(D)-xen-udeb
 D_DBG := $(D)-dbg
 D_XEN_DBG := $(D)-xen-dbg
 
@@ -115,7 +117,7 @@ clean:
        dh_testdir
        
        rm -f machine
-       rm -rf build build-xen build-dbg build-xen-dbg $(D_XEN) $(D_DBG) 
$(D_XEN_DBG)
+       rm -rf build build-xen build-dbg build-xen-dbg $(D_UDEB) $(D_XEN_UDEB) 
$(D_XEN) $(D_DBG) $(D_XEN_DBG)
        
        # Clean up autogenerated cruft
        rm -rf autom4te.cache build-aux
@@ -143,7 +145,11 @@ install: build
        $(MAKE) -C build-xen-dbg install-exec \
                DESTDIR=$(D_XEN_DBG) \
        
+       mkdir -p $(D_UDEB)/boot
+       cp $(D)/boot/gnumach $(D_UDEB)/boot/
        mv $(D)/boot/gnumach $(D)/boot/gnumach-$(VERSION)-$(MACHINE)
+       mkdir -p $(D_XEN_UDEB)/boot
+       cp $(D_XEN)/boot/gnumach $(D_XEN_UDEB)/boot/
        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
@@ -171,8 +177,10 @@ binary-arch: install
        dh_testdir
        dh_testroot
        
-       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 -a -N$(pkg_udeb) -N$(pkg_xen) -N$(pkg_xen_udeb) -N$(pkg_dbg) 
-N$(pkg_xen_dbg) --sourcedir=$(D)
+       dh_install -p$(pkg_udeb) --sourcedir=$(D_UDEB)
+       dh_install -p$(pkg_xen) --sourcedir=$(D_XEN)
+       dh_install -p$(pkg_xen_udeb) --sourcedir=$(D_XEN_UDEB)
        dh_install -p$(pkg_dbg) --sourcedir=$(D_DBG)
        dh_install -p$(pkg_xen_dbg) --sourcedir=$(D_XEN_DBG)
        
@@ -182,8 +190,10 @@ binary-arch: install
        dh_link -a
        dh_strip -a -N$(pkg_dbg) -N$(pkg_xen_dbg)
        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) boot/gnumach-$(VERSION)-$(MACHINE)
+       dh_compress -p$(pkg_udeb) boot/gnumach
+       dh_compress -p$(pkg_xen) boot/gnumach-$(VERSION)-xen-$(MACHINE)
+       dh_compress -p$(pkg_xen_udeb) boot/gnumach
        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

-- 
Debian GNU Mach packaging