Make debootstrap-udeb 'Architecture: all'

For this to be possible, the utility pkgdetails is moved from debootstrap to base-installer

r50114

3 files changed, 16 insertions, 23 deletions

diff --git a/debian/changelog b/debian/changelog
index c69aa97..e457fff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
 debootstrap (1.0.7) UNRELEASED; urgency=low
 
   * No longer include full devices tarball in udeb.
-    Requires base-installer 1.85.
+  * Utility pkgdetails moved from debootstrap-udeb to bootstrap-base so that
+    the udeb can become 'Architecture: all'.
+  * Changes in udeb require base-installer 1.85.
 
- -- Frans Pop <fjp@debian.org>  Fri, 09 Nov 2007 21:21:11 +0100
+ -- Frans Pop <fjp@debian.org>  Tue, 13 Nov 2007 02:14:55 +0100
 
 debootstrap (1.0.6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8622c1d..aef1b07 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,6 @@ Package: debootstrap-udeb
 Priority: required
 Section: debian-installer
 XC-Package-Type: udeb
-Architecture: any
-Depends: ${shlibs:Depends}, mounted-partitions
+Architecture: all
+Depends: mounted-partitions
 Description: Bootstrap the Debian system
diff --git a/debian/rules b/debian/rules
index 99383a7..abc8232 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ install: real-build
 
 #	 install the package into debian/debootstrap
 	$(MAKE) install      DESTDIR=$(CURDIR)/debian/debootstrap
-	$(MAKE) install-udeb DESTDIR=$(CURDIR)/debian/debootstrap-udeb
+	$(MAKE) install      DESTDIR=$(CURDIR)/debian/debootstrap-udeb
 
 binary-indep: install
 # We have nothing to do by default.
@@ -64,17 +64,6 @@ binary-indep: install
 	dh_installman -i debootstrap.8
 	dh_installchangelogs -i
 	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_shlibdeps -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: install
-	dh_testdir
-	dh_testroot
 	-rm -rf debian/debootstrap-udeb/usr/share \
 		debian/debootstrap-udeb/usr/lib/debootstrap/scripts/potato \
 		debian/debootstrap-udeb/usr/lib/debootstrap/scripts/woody \
@@ -87,13 +76,15 @@ binary-arch: install
 		debian/debootstrap-udeb/usr/lib/debootstrap/scripts/feisty \
 		debian/debootstrap-udeb/usr/lib/debootstrap/scripts/*.buildd \
 		debian/debootstrap-udeb/usr/lib/debootstrap/scripts/*.fakechroot
-	dh_strip -s
-	dh_compress -s
-	dh_fixperms -s
-	dh_installdeb -s
-	dh_shlibdeps -s
-	dh_gencontrol -s
-	dh_builddeb -s
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+binary-arch:
 
 binary: binary-indep binary-arch
 .PHONY: build real-build clean binary-indep binary-arch binary install configure binary-basedebs