Package: debootstrap Version: 0.3.1 Severity: normal Tags: patch debhelper knows how to make udebs now, so it's possilble to clean up the rules file a lot. Also, you forgot to build debootstrap in binary-all when it moved to arch all. The attached patch does that and cleans up the rules file using new debhelper. debdiff reports no modifications to the binary packages as a result of building with this patch.
(It also removes a copyright notice which I am happy to see people remove.) -- see shy jo
diff -ur debootstrap.old/debian/changelog debootstrap-0.3.1.1/debian/changelog
--- debootstrap.old/debian/changelog 2005-06-18 11:59:08.000000000 -0400
+++ debootstrap-0.3.1.1/debian/changelog 2005-06-18 18:53:39.000000000
-0400
@@ -1,3 +1,10 @@
+debootstrap (0.3.1.3) UNRELEASED; urgency=low
+
+ * Use debhelper's udeb support.
+ * Fix use of binary-arch/indep in rules file.
+
+ -- Joey Hess <[EMAIL PROTECTED]> Sat, 18 Jun 2005 18:53:02 -0400
+
debootstrap (0.3.1.2) unstable; urgency=low
* NMU.
diff -ur debootstrap.old/debian/control debootstrap-0.3.1.1/debian/control
--- debootstrap.old/debian/control 2005-06-18 11:59:44.000000000 -0400
+++ debootstrap-0.3.1.1/debian/control 2005-06-18 18:54:40.000000000 -0400
@@ -2,7 +2,7 @@
Section: admin
Maintainer: Anthony Towns <[EMAIL PROTECTED]>
Uploaders: J.H.M. Dassen (Ray) <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 2.0.0), makedev (>= 2.3.1-69)
+Build-Depends: debhelper (>= 4.2), makedev (>= 2.3.1-69)
Standards-Version: 3.6.1
Package: debootstrap
@@ -20,6 +20,7 @@
Section: debian-installer
Architecture: any
Depends: ${shlibs:Depends}, mounted-partitions
+XC-Package-Type: udeb
Description: Bootstrap the Debian system
debootstrap is used to create a Debian base system from scratch,
without requiring the availability of dpkg or apt. It does this by
diff -ur debootstrap.old/debian/rules debootstrap-0.3.1.1/debian/rules
--- debootstrap.old/debian/rules 2005-06-18 11:51:12.000000000 -0400
+++ debootstrap-0.3.1.1/debian/rules 2005-06-18 18:52:54.000000000 -0400
@@ -1,14 +1,8 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-VER := $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
-ARCH := $(shell dpkg --print-architecture)
-FILENAME := debootstrap-udeb_$(VER)_$(ARCH).udeb
-
# This is the debhelper compatability version to use.
export DH_COMPAT=2
@@ -42,9 +36,6 @@
$(MAKE) install-allarch DESTDIR=$(CURDIR)/debian/debootstrap
$(MAKE) install-arch DESTDIR=$(CURDIR)/debian/debootstrap-udeb
-binary-indep: install
-# We have nothing to do by default.
-
ARCHES="i386"
SUITE="testing"
VERSION=$(SUITE)
@@ -66,7 +57,7 @@
done
rm -f scripts
-binary-arch: install debootstrap-udeb
+binary-indep: install
dh_testdir
dh_testroot
# dh_installdebconf
@@ -82,31 +73,29 @@
# dh_undocumented
dh_installchangelogs
dh_link
- dh_strip
dh_compress
dh_fixperms
# dh_makeshlibs
- dh_installdeb -pdebootstrap
+ dh_installdeb
# dh_perl
- dh_shlibdeps -pdebootstrap
- dh_gencontrol -pdebootstrap
- dh_md5sums -pdebootstrap
- dh_builddeb -pdebootstrap
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
-debootstrap-udeb: install
+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/*.*
- dh_strip -pdebootstrap-udeb
- dh_compress -pdebootstrap-udeb
- dh_fixperms -pdebootstrap-udeb
- dh_installdeb -pdebootstrap-udeb
- dh_shlibdeps -pdebootstrap-udeb
- dh_gencontrol -- -fdebian/debootstrap-udeb.files~
- dpkg-distaddfile $(FILENAME) debian-installer required
- dh_builddeb -pdebootstrap-udeb --filename=$(FILENAME)
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_builddeb
binary: binary-indep binary-arch
.PHONY: build real-build clean binary-indep binary-arch binary install
configure binary-basedebs
signature.asc
Description: Digital signature
