fix build rule to build uml for i386 only.

3 files changed, 33 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 2c61587..a9964d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,11 @@ pbuilder (0.45) unstable; urgency=low
   * Standards-Version: 3.5.7. 
   * Build-dep on debhelper 4.1.0 or greater, which removed usr/doc symlink.
   * fix failure cases when initial *dsc file is invalid.
+  * change pbuilder-uml to be i386 only.
+  * build-depends-indep -> build-depends.
+  * Fix build rules to have both binary-arch and binary-indep rules.
 
- -- Junichi Uekawa <dancer@debian.org>  Thu, 24 Oct 2002 13:47:35 +0900
+ -- Junichi Uekawa <dancer@debian.org>  Thu, 24 Oct 2002 19:41:50 +0900
 
 pbuilder (0.44) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 1c6dd89..4327041 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pbuilder
 Section: devel
 Priority: extra
 Maintainer: Junichi Uekawa <dancer@debian.org>
-Build-Depends-Indep: debhelper (>= 4.1.0)
+Build-Depends: debhelper (>= 4.1.0)
 Standards-Version: 3.5.7
 
 Package: pbuilder
@@ -30,7 +30,7 @@ Description: personal package builder for Debian packages
  pbuilder just like "debuild", as a normal user.
 
 Package: pbuilder-uml
-Architecture: all
+Architecture: i386
 Depends: rootstrap, user-mode-linux, pbuilder (= ${Source-Version})
 Description: user-mode-linux version of pbuilder
  pbuilder-uml uses a User-mode-linux system, and builds Debian packages
diff --git a/debian/rules b/debian/rules
index 73ea991..f7ddef9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@
 
 # This is the debhelper compatability version to use.
 export DH_COMPAT=3
+ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 configure: configure-stamp
 configure-stamp:
@@ -39,26 +40,39 @@ install: build
 
 	# Add here commands to install the package into debian/build-package.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/pbuilder
+	dh_movefiles -ppbuilder-uml --sourcedir=debian/pbuilder
 
 # Build architecture-independent files here.
 binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdocs -i
 	dh_installman pbuilder.8 pbuilderrc.5 pdebuild.1 debuild-pbuilder.1 
-	dh_installman -ppbuilder-uml pbuilder-user-mode-linux.1
-	dh_movefiles --sourcedir=debian/pbuilder
-	dh_installchangelogs
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_installchangelogs -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 # Build architecture-dependent files here.
 binary-arch: build install
+ifeq (${ARCH},i386)
+	dh_testdir -a
+	dh_testroot -a
+	dh_installdocs -a
+	dh_installman -ppbuilder-uml pbuilder-user-mode-linux.1
+	dh_installchangelogs -a
+	dh_link -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_gencontrol  -a
+	dh_md5sums  -a
+	dh_builddeb -a
+endif
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure