From bccc15c533e3b33f9ab34e90c9184c5b17b50dac Mon Sep 17 00:00:00 2001
From: codehelp <codehelp@debian.org>
Date: Mon, 2 Aug 2010 21:50:18 +0000
Subject: [PATCH] Add all packages to the source dir, including calculated
 dependencies.

git-svn-id: http://emdebian.org/svn/current@7358 563faec7-e20c-0410-992a-a66f704d0ccd
---
 debian/changelog | 7 +++++++
 multistrap       | 7 ++++++-
 pod/multistrap   | 4 +++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0cd0182..08fd23c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+multistrap (2.1.7) unstable; urgency=low
+
+  * Add all packages to the source dir, including calculated
+    dependencies.
+
+ -- Neil Williams <codehelp@debian.org>  Mon, 02 Aug 2010 17:49:09 -0400
+
 multistrap (2.1.6) unstable; urgency=low
 
   * [INTL:fr] French manpage translation update (Closes: #584679)
diff --git a/multistrap b/multistrap
index bc656c8..473c973 100755
--- a/multistrap
+++ b/multistrap
@@ -478,6 +478,7 @@ sub force_unpack {
 		my $pkg=`LC_ALL=C dpkg -f ./${cachedir}archives/$deb Package`;
 		chomp ($ver);
 		chomp ($pkg);
+		push @dsclist, $pkg;
 		mkdir ("./tmp");
 		my $tmpdir = `mktemp -p ./tmp -d -t multistrap.XXXXXX`;
 		chomp ($tmpdir);
@@ -587,7 +588,11 @@ sub check_bin_sh {
 sub tidy_apt {
 	print _g("I: Tidying up apt cache and list data.\n");
 	if (defined $sourcedir) {
-		my $str = join (" ", @dsclist);
+		my %uniqdsc=();
+		foreach my $a (@dsclist) {
+			$uniqdsc{$a}++;
+		}
+		my $str = join (" ", sort keys %uniqdsc);
 		print "(cd $sourcedir; apt-get -d $config_str source $str)";
 		system ("(cd $sourcedir; apt-get -d $config_str source $str)");
 	}
diff --git a/pod/multistrap b/pod/multistrap
index 6da26d2..4321217 100644
--- a/pod/multistrap
+++ b/pod/multistrap
@@ -28,7 +28,9 @@ as noauth=true
 --sourcedir DIR - move the contents of var/cache/apt/archives/ from
 inside the chroot to the specified external directory, then add the
 Debian source packages for each used binary. Same as retainsources=DIR
-If the specified directory does not exist, nothing is done.
+If the specified directory does not exist, nothing is done. Requires
+--tidy-up in order to calculate the full list of source packages, 
+including dependencies.
 
 =head1 Description