Make scripts directory in source tree look like installed directory,

and add a section to README explaining an easy way to run
debootstrap w/o installing it. Closes: #345762

r62297

32 files changed, 40 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 65b6d8e..ff4ff3a 100644
--- a/Makefile
+++ b/Makefile
@@ -13,28 +13,9 @@ install:
 	mkdir -p $(DSDIR)/scripts
 	mkdir -p $(DESTDIR)/usr/sbin
 
-	install -o root -g root -m 0644 scripts/debian/* $(DSDIR)/scripts/
-	install -o root -g root -m 0644 scripts/ubuntu/* $(DSDIR)/scripts/
+	cp -a scripts/* $(DSDIR)/scripts/
 	install -o root -g root -m 0644 functions $(DSDIR)/
 
-        # recent debian releases can all be handled by the sid script
-	ln -s sid $(DSDIR)/scripts/etch
-	ln -s sid $(DSDIR)/scripts/etch-m68k
-	ln -s sid $(DSDIR)/scripts/lenny
-	ln -s sid $(DSDIR)/scripts/squeeze
-	
-	# allow using symbolic release names instead of code names too
-	ln -s sid $(DSDIR)/scripts/stable
-	ln -s sid $(DSDIR)/scripts/testing
-	ln -s sid $(DSDIR)/scripts/unstable
-
-	# recent ubuntu releases can all be handled by the gutsy script
-	ln -s gutsy $(DSDIR)/scripts/hardy
-	ln -s gutsy $(DSDIR)/scripts/intrepid
-	ln -s gutsy $(DSDIR)/scripts/jaunty
-	ln -s gutsy $(DSDIR)/scripts/karmic
-	ln -s gutsy $(DSDIR)/scripts/lucid
-
 	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/README.Debian b/README
index 4956773..7564ed8 100644
--- a/debian/README.Debian
+++ b/README
@@ -3,6 +3,28 @@ README for debootstrap
 
 See the manpage for (some) documentation.
 
+Running debootstrap from source
+-------------------------------
+
+You can run debootstrap from its source tree without installing it. This
+can be useful if you want a quick way to make a Debian chroot on another
+system, or if you are testing modifications to debootstrap.
+
+First, get the source. 
+
+* Either by using subversion:
+  svn checkout svn://svn.debian.org/d-i/trunk/packages/debootstrap
+
+* Or by visiting <http://packages.debian.org/source/sid/debootstrap>
+  and downloading the tar.gz file
+
+Then as root, in the debootstrap source directory:
+
+make devices.tar.gz
+export DEBOOTSTRAP_DIR=`pwd`
+debootstrap sid sid
+
+
 Future
 ------
 
@@ -22,6 +44,7 @@ Future
     doing an install, and doing a buildd. Also, some installs want
     different base packages (to setup networking, or kernels, eg)
 
+
 NMUing
 ------
 
diff --git a/debian/changelog b/debian/changelog
index 2fba951..398832e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,9 @@ debootstrap (1.0.21) UNRELEASED; urgency=low
   [ Joey Hess ]
   * Allow the suite to be stable, testing, or unstable when debootstrapping
     Debian. Closes: #288109
+  * Make scripts directory in source tree look like installed directory,
+    and add a section to README explaining an easy way to run
+    debootstrap w/o installing it. Closes: #345762
 
  -- Frans Pop <fjp@debian.org>  Sun, 27 Dec 2009 18:51:06 +0100
 
diff --git a/debian/debootstrap.docs b/debian/debootstrap.docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/debootstrap.docs
@@ -0,0 +1 @@
+README
diff --git a/scripts/ubuntu/breezy b/scripts/breezy
index 2148cec..2148cec 100644
--- a/scripts/ubuntu/breezy
+++ b/scripts/breezy
diff --git a/scripts/ubuntu/dapper b/scripts/dapper
index af83c0c..af83c0c 100644
--- a/scripts/ubuntu/dapper
+++ b/scripts/dapper
diff --git a/scripts/ubuntu/edgy b/scripts/edgy
index 3af06de..3af06de 100644
--- a/scripts/ubuntu/edgy
+++ b/scripts/edgy
diff --git a/scripts/etch b/scripts/etch
new file mode 120000
index 0000000..9a63c96
--- /dev/null
+++ b/scripts/etch
@@ -0,0 +1 @@
+sid
\ No newline at end of file
diff --git a/scripts/etch-m68k b/scripts/etch-m68k
new file mode 120000
index 0000000..9a63c96
--- /dev/null
+++ b/scripts/etch-m68k
@@ -0,0 +1 @@
+sid
\ No newline at end of file
diff --git a/scripts/ubuntu/feisty b/scripts/feisty
index 30e20d5..30e20d5 100644
--- a/scripts/ubuntu/feisty
+++ b/scripts/feisty
diff --git a/scripts/ubuntu/gutsy b/scripts/gutsy
index 9c0a8b6..9c0a8b6 100644
--- a/scripts/ubuntu/gutsy
+++ b/scripts/gutsy
diff --git a/scripts/hardy b/scripts/hardy
new file mode 120000
index 0000000..3840936
--- /dev/null
+++ b/scripts/hardy
@@ -0,0 +1 @@
+gutsy
\ No newline at end of file
diff --git a/scripts/ubuntu/hoary b/scripts/hoary
index e5fe9fc..e5fe9fc 100644
--- a/scripts/ubuntu/hoary
+++ b/scripts/hoary
diff --git a/scripts/ubuntu/hoary.buildd b/scripts/hoary.buildd
index 8d10d80..8d10d80 100644
--- a/scripts/ubuntu/hoary.buildd
+++ b/scripts/hoary.buildd
diff --git a/scripts/intrepid b/scripts/intrepid
new file mode 120000
index 0000000..3840936
--- /dev/null
+++ b/scripts/intrepid
@@ -0,0 +1 @@
+gutsy
\ No newline at end of file
diff --git a/scripts/jaunty b/scripts/jaunty
new file mode 120000
index 0000000..3840936
--- /dev/null
+++ b/scripts/jaunty
@@ -0,0 +1 @@
+gutsy
\ No newline at end of file
diff --git a/scripts/karmic b/scripts/karmic
new file mode 120000
index 0000000..3840936
--- /dev/null
+++ b/scripts/karmic
@@ -0,0 +1 @@
+gutsy
\ No newline at end of file
diff --git a/scripts/lenny b/scripts/lenny
new file mode 120000
index 0000000..9a63c96
--- /dev/null
+++ b/scripts/lenny
@@ -0,0 +1 @@
+sid
\ No newline at end of file
diff --git a/scripts/lucid b/scripts/lucid
new file mode 120000
index 0000000..3840936
--- /dev/null
+++ b/scripts/lucid
@@ -0,0 +1 @@
+gutsy
\ No newline at end of file
diff --git a/scripts/debian/potato b/scripts/potato
index 304cbe0..304cbe0 100644
--- a/scripts/debian/potato
+++ b/scripts/potato
diff --git a/scripts/debian/sarge b/scripts/sarge
index b929544..b929544 100644
--- a/scripts/debian/sarge
+++ b/scripts/sarge
diff --git a/scripts/debian/sarge.buildd b/scripts/sarge.buildd
index 5c7e049..5c7e049 100644
--- a/scripts/debian/sarge.buildd
+++ b/scripts/sarge.buildd
diff --git a/scripts/debian/sarge.fakechroot b/scripts/sarge.fakechroot
index 91ac662..91ac662 100644
--- a/scripts/debian/sarge.fakechroot
+++ b/scripts/sarge.fakechroot
diff --git a/scripts/debian/sid b/scripts/sid
index 42c4785..42c4785 100644
--- a/scripts/debian/sid
+++ b/scripts/sid
diff --git a/scripts/squeeze b/scripts/squeeze
new file mode 120000
index 0000000..9a63c96
--- /dev/null
+++ b/scripts/squeeze
@@ -0,0 +1 @@
+sid
\ No newline at end of file
diff --git a/scripts/stable b/scripts/stable
new file mode 120000
index 0000000..9a63c96
--- /dev/null
+++ b/scripts/stable
@@ -0,0 +1 @@
+sid
\ No newline at end of file
diff --git a/scripts/testing b/scripts/testing
new file mode 120000
index 0000000..9a63c96
--- /dev/null
+++ b/scripts/testing
@@ -0,0 +1 @@
+sid
\ No newline at end of file
diff --git a/scripts/unstable b/scripts/unstable
new file mode 120000
index 0000000..9a63c96
--- /dev/null
+++ b/scripts/unstable
@@ -0,0 +1 @@
+sid
\ No newline at end of file
diff --git a/scripts/ubuntu/warty b/scripts/warty
index e21a6d8..e21a6d8 100644
--- a/scripts/ubuntu/warty
+++ b/scripts/warty
diff --git a/scripts/ubuntu/warty.buildd b/scripts/warty.buildd
index 09c5467..09c5467 100644
--- a/scripts/ubuntu/warty.buildd
+++ b/scripts/warty.buildd
diff --git a/scripts/debian/woody b/scripts/woody
index fa0920a..fa0920a 100644
--- a/scripts/debian/woody
+++ b/scripts/woody
diff --git a/scripts/debian/woody.buildd b/scripts/woody.buildd
index 2942478..2942478 100644
--- a/scripts/debian/woody.buildd
+++ b/scripts/woody.buildd