Provide a udeb package.

- Depend on debhelper >= 4.2.
Cleaned debian/rules:
- Merge install-gnumach-dev target with install-gnumach.
- Add PHONY targets.
- Remove unused all target.

3 files changed, 31 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index cdcb28d..31f56a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gnumach (1:20050501-3) unstable; urgency=low
+
+  * Provide a udeb package.
+    - Depend on debhelper >= 4.2.
+  * Cleaned debian/rules:
+    - Merge install-gnumach-dev target with install-gnumach.
+    - Add PHONY targets.
+    - Remove unused all target.
+
+ -- Guillem Jover <guillem@debian.org>  Thu,  2 Jun 2005 22:14:40 +0300
+
 gnumach (1:20050501-2) unstable; urgency=low
 
   * Add a system stabilizer patch.
diff --git a/debian/control b/debian/control
index 2e00d42..33d7426 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: GNU Hurd Maintainers <debian-hurd@lists.debian.org>
 Uploaders: Marcus Brinkmann <brinkmd@debian.org>, Jeff Bailey <jbailey@raspberryginger.com>, Neal H. Walfield <neal@debian.org>, Guillem Jover <guillem@debian.org>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.0.0), mig, sharutils, texinfo
+Build-Depends: debhelper (>= 4.2.0), mig, sharutils, texinfo
 
 Package: gnumach
 Section: base
@@ -13,6 +13,14 @@ Architecture: hurd-i386 i386 kfreebsd-i386 knetbsd-i386
 Description: The GNU version of the Mach microkernel
  This is the Utah Mach microkernel used by the Hurd.
 
+Package: gnumach-udeb
+XC-Package-Type: udeb
+Section: debian-installer
+Priority: optional
+Architecture: hurd-i386 i386 kfreebsd-i386 knetbsd-i386
+Description: The GNU version of the Mach microkernel
+ This is the Utah Mach microkernel used by the Hurd.
+
 Package: gnumach-dbg
 Section: devel
 Priority: extra
diff --git a/debian/rules b/debian/rules
index 770984e..9c2d2d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@
 #
 
 pkg := gnumach
+pkg_udeb := gnumach-udeb
 pkg_dbg := gnumach-dbg
 pkg_dev := gnumach-dev
 
@@ -46,7 +47,7 @@ stamp-configure-dbg:
 		--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 	touch stamp-configure-dbg
 
-all build:
+build:
 
 build-gnumach: configure
 	dh_testdir
@@ -72,18 +73,14 @@ clean::
 install-gnumach: build-gnumach
 	dh_testdir
 	dh_testroot
-	dh_clean -p$(pkg) -k
-	dh_installdirs -p$(pkg)
+	dh_clean -N$(pkg_dbg) -k
+	dh_installdirs -N$(pkg_dbg)
 	
 	$(MAKE) -C build install-kernel \
-		prefix=$(CURDIR)/debian/$(pkg)/usr \
 		exec_prefix=$(CURDIR)/debian/$(pkg)
-
-install-gnumach-dev: build-gnumach
-	dh_testdir
-	dh_testroot
-	dh_clean -p$(pkg_dev) -k
-	dh_installdirs -p$(pkg_dev)
+	
+	$(MAKE) -C build install-kernel \
+		exec_prefix=$(CURDIR)/debian/$(pkg_udeb)
 	
 	$(MAKE) -C build install-headers \
 		prefix=$(CURDIR)/debian/$(pkg_dev)/usr \
@@ -105,7 +102,7 @@ binary: binary-indep binary-arch
 
 binary-indep:
 
-binary-arch: install-gnumach install-gnumach-dev install-gnumach-dbg
+binary-arch: install-gnumach install-gnumach-dbg
 	dh_testdir
 	dh_testroot
 	dh_installdocs -a
@@ -113,7 +110,7 @@ binary-arch: install-gnumach install-gnumach-dev install-gnumach-dbg
 	dh_installinfo -a
 	dh_link -a
 	dh_strip -a -N$(pkg_dbg)
-	dh_compress -p$(pkg) boot/gnumach
+	dh_compress -p$(pkg) -p$(pkg_udeb) -A boot/gnumach
 	dh_compress -p$(pkg_dbg) boot/gnumach-dbg
 	dh_compress -p$(pkg_dev)
 	dh_fixperms -a
@@ -122,5 +119,6 @@ binary-arch: install-gnumach install-gnumach-dev install-gnumach-dbg
 	dh_md5sums -a
 	dh_builddeb -a
 
-.PHONY: build clean configure binary binary-indep binary-arch
+.PHONY: build build-gnumach build-gnumach-dbg clean configure configure-dbg
+.PHONY: install-gnumach install-gnumach-dbg binary binary-indep binary-arch