* Change /usr/lib/debootstrap to /usr/share/debootstrap for both debootstrap and base-installer as befits an Architecture: all package

* Fix various inconsistencies and minor errors in build scripts:
  - let debhelper create needed directories and don't duplicate that in the Makefile
  - let debhelper install the manpage, which automatically keeps it out of the udeb
* Fix dpkg-genchanges warning 'missing Priority for source files'
* Update Standards-Version to 3.7.2. No changes needed


r50134

8 files changed, 25 insertions, 25 deletions

diff --git a/Makefile b/Makefile
index f6c2856..4388ffb 100644
--- a/Makefile
+++ b/Makefile
@@ -10,11 +10,9 @@ clean:
 	rm -f devices.tar.gz
 	rm -rf dev
 
-DSDIR=$(DESTDIR)/usr/lib/debootstrap
+DSDIR=$(DESTDIR)/usr/share/debootstrap
 install:
-	mkdir -p $(DSDIR)/scripts
-	mkdir -p $(DESTDIR)/usr/sbin
-	mkdir -p $(DESTDIR)/usr/share/man/man8
+	# Dirs are created by dh_installdirs
 	install -o root -g root -m 0644 scripts/debian/* $(DSDIR)/scripts/
 	install -o root -g root -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
 	install -o root -g root -m 0644 functions $(DSDIR)/
@@ -25,7 +23,6 @@ install:
 
 	ln -s gutsy $(DSDIR)/scripts/hardy
 
-	install -o root -g root -m 0755 debootstrap.8 $(DESTDIR)/usr/share/man/man8/
 	sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap
 	chown root:root $(DESTDIR)/usr/sbin/debootstrap
 	chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
diff --git a/debian/changelog b/debian/changelog
index 39a32f8..ac32951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,15 @@ debootstrap (1.0.7) UNRELEASED; urgency=low
     architecture.
   * Utility pkgdetails moved from debootstrap-udeb to bootstrap-base so that
     the udeb can become 'Architecture: all'.
+  * Change /usr/lib/debootstrap to /usr/share/debootstrap. Closes: #430615.
   * Use tab indentation in debootstrap and functions saving 3kB (relevant for
     Debian Installer).
+  * Fix various inconsistencies in build scripts.
+  * Fix dpkg-genchanges warning 'missing Priority for source files'.
+  * Update Standards-Version to 3.7.2. No changes needed.
   * Changes in udeb require base-installer 1.85.
 
- -- Frans Pop <fjp@debian.org>  Tue, 13 Nov 2007 13:42:30 +0100
+ -- Frans Pop <fjp@debian.org>  Wed, 14 Nov 2007 10:03:05 +0100
 
 debootstrap (1.0.6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index aef1b07..e02f220 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
 Source: debootstrap
 Section: admin
+Priority: extra
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Anthony Towns <ajt@debian.org>, Joey Hess <joeyh@debian.org>, Frans Pop <fjp@debian.org>, Junichi Uekawa <dancer@debian.org>, Colin Watson <cjwatson@debian.org>
 Build-Depends: debhelper (>= 4.2), makedev (>= 2.3.1-69)
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
 Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/debootstrap
 
 Package: debootstrap
-Priority: extra
 Architecture: all
 Depends: wget, binutils
 Description: Bootstrap a basic Debian system
diff --git a/debian/debootstrap-udeb.dirs b/debian/debootstrap-udeb.dirs
index bf290a7..8884784 100644
--- a/debian/debootstrap-udeb.dirs
+++ b/debian/debootstrap-udeb.dirs
@@ -1,2 +1,2 @@
-usr/lib/debootstrap/scripts
-usr/share/man/man8
+usr/sbin
+usr/share/debootstrap/scripts
diff --git a/debian/debootstrap.dirs b/debian/debootstrap.dirs
new file mode 100644
index 0000000..8884784
--- /dev/null
+++ b/debian/debootstrap.dirs
@@ -0,0 +1,2 @@
+usr/sbin
+usr/share/debootstrap/scripts
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index b174b44..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/sbin
-usr/share/man/man8
diff --git a/debian/rules b/debian/rules
index abc8232..42df8ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,18 +64,17 @@ binary-indep: install
 	dh_installman -i debootstrap.8
 	dh_installchangelogs -i
 	dh_link -i
-	-rm -rf debian/debootstrap-udeb/usr/share \
-		debian/debootstrap-udeb/usr/lib/debootstrap/scripts/potato \
-		debian/debootstrap-udeb/usr/lib/debootstrap/scripts/woody \
-		debian/debootstrap-udeb/usr/lib/debootstrap/scripts/sarge \
-		debian/debootstrap-udeb/usr/lib/debootstrap/scripts/warty \
-		debian/debootstrap-udeb/usr/lib/debootstrap/scripts/hoary \
-		debian/debootstrap-udeb/usr/lib/debootstrap/scripts/breezy \
-		debian/debootstrap-udeb/usr/lib/debootstrap/scripts/dapper \
-		debian/debootstrap-udeb/usr/lib/debootstrap/scripts/edgy \
-		debian/debootstrap-udeb/usr/lib/debootstrap/scripts/feisty \
-		debian/debootstrap-udeb/usr/lib/debootstrap/scripts/*.buildd \
-		debian/debootstrap-udeb/usr/lib/debootstrap/scripts/*.fakechroot
+	-rm -rf debian/debootstrap-udeb/usr/share/debootstrap/scripts/potato \
+		debian/debootstrap-udeb/usr/share/debootstrap/scripts/woody \
+		debian/debootstrap-udeb/usr/share/debootstrap/scripts/sarge \
+		debian/debootstrap-udeb/usr/share/debootstrap/scripts/warty \
+		debian/debootstrap-udeb/usr/share/debootstrap/scripts/hoary \
+		debian/debootstrap-udeb/usr/share/debootstrap/scripts/breezy \
+		debian/debootstrap-udeb/usr/share/debootstrap/scripts/dapper \
+		debian/debootstrap-udeb/usr/share/debootstrap/scripts/edgy \
+		debian/debootstrap-udeb/usr/share/debootstrap/scripts/feisty \
+		debian/debootstrap-udeb/usr/share/debootstrap/scripts/*.buildd \
+		debian/debootstrap-udeb/usr/share/debootstrap/scripts/*.fakechroot
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
diff --git a/debootstrap b/debootstrap
index ee367af..d7edcbf 100755
--- a/debootstrap
+++ b/debootstrap
@@ -10,7 +10,7 @@ if [ "$DEBOOTSTRAP_DIR" = "" ]; then
 	if [ -x /debootstrap/debootstrap ]; then
 		DEBOOTSTRAP_DIR=/debootstrap
 	else
-		DEBOOTSTRAP_DIR=/usr/lib/debootstrap
+		DEBOOTSTRAP_DIR=/usr/share/debootstrap
 	fi
 fi