Revert r32.

Move gnumach-dev to binary-arch.

3 files changed, 8 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index 9f72184..cc52a69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,9 +7,8 @@ gnumach (1:20040915-1) unstable; urgency=low
   * Honour DEB_BUILD_OPTIONS.
   * Split patches into debian/patches/.
   * Allow to build natively on non GNU/Hurd systems.
-  * Enable i386, kfreebsd-i386 and knetbsd-i386 on gnumach and gnumach-dbg
-    packages.
-  * Make gnumach-dev arch all.
+  * Enable i386, kfreebsd-i386 and knetbsd-i386 on all packages.
+  * Move gnumach-dev to binary-arch in debian/rules.
   * Switched to debhelper.
   * Now using Standards-Version 3.6.1.
   * Update autoconf.
diff --git a/debian/control b/debian/control
index 59fa42b..007558f 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,7 @@ Description: The GNU version of the Mach microkernel for debugging
 Package: gnumach-dev
 Section: devel
 Priority: optional
-Architecture: all
+Architecture: hurd-i386 i386 kfreebsd-i386 knetbsd-i386
 Description: The GNU version of the Mach microkernel
  These are the header files for the Utah Mach microkernel used by the Hurd.
 
diff --git a/debian/rules b/debian/rules
index 47b9cb2..b612fc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -153,9 +153,10 @@ clean::
 
 binary: binary-indep binary-arch
 
-# Build architecture-independent files here.
+binary-indep:
+binary-arch: binary-gnumach binary-gnumach-dev binary-gnumach-dbg
 
-binary-indep: build
+binary-gnumach-dev: stamp-build
 	dh_testdir
 	dh_testroot
 	dh_clean -p$(pkg_dev) -k
@@ -178,8 +179,6 @@ binary-indep: build
 	dh_md5sums -p$(pkg_dev)
 	dh_builddeb -p$(pkg_dev)
 
-binary-arch: binary-gnumach binary-gnumach-dbg
-
 binary-gnumach: stamp-build
 	dh_testdir
 	dh_testroot
@@ -225,8 +224,6 @@ binary-gnumach-dbg: stamp-build-dbg
 	dh_md5sums -p$(pkg_dbg)
 	dh_builddeb -p$(pkg_dbg)
 
-binary-indep: build
-
-.PHONY: build clean configure
-.PHONY: binary binary-indep binary-arch binary-gnumach binary-gnumach-dbg
+.PHONY: build clean configure binary binary-indep binary-arch
+.PHONY: binary-gnumach binary-gnumach-dev binary-gnumach-dbg