From 0435ea7b194f2477ebb616857d3ec2864c2e724e Mon Sep 17 00:00:00 2001
From: codehelp <codehelp@debian.org>
Date: Mon, 5 Apr 2010 19:48:04 +0000
Subject: [PATCH] experimental 2.1.x branch

git-svn-id: http://emdebian.org/svn/current@7044 563faec7-e20c-0410-992a-a66f704d0ccd
---
 debian/changelog |  6 ++++++
 debian/control   |  4 ++--
 em_multistrap    | 15 +++++++++++----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e81a98..77da007 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+emdebian-rootfs (2.1.0) experimental; urgency=low
+
+  * Experimental branch to replace pbuilder support in Crush. 
+
+ -- Neil Williams <codehelp@debian.org>  Mon, 05 Apr 2010 20:41:47 +0100
+
 emdebian-rootfs (2.0.9) unstable; urgency=low
 
   * Fix typos in translated strings.
diff --git a/debian/control b/debian/control
index 12fd5f7..b2e45b2 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Build-Depends-Indep: devscripts, docbook-xml, docbook-xsl, gnupg,
  libxml2-utils, xml-core, xsltproc, intltool
 Standards-Version: 3.8.4
 Homepage: http://www.emdebian.org/
-Vcs-Browser: http://buildd.emdebian.org/svn/browser/current/
-Vcs-Svn: http://buildd.emdebian.org/repos/current/
+Vcs-Browser: http://buildd.emdebian.org/svn/browser/current/host/trunk/emdebian-rootfs/trunk/
+Vcs-Svn: http://buildd.emdebian.org/repos/current/host/trunk/emdebian-rootfs/trunk/
 
 Package: emdebian-rootfs
 Architecture: all
diff --git a/em_multistrap b/em_multistrap
index 07f6d4a..731c081 100755
--- a/em_multistrap
+++ b/em_multistrap
@@ -178,10 +178,10 @@ system ("mkdir -p ${dir}etc/apt/preferences.d/")
 	if (not -d "${dir}etc/apt/preferences.d/");
 system ("mkdir -p ${dir}usr/share/info/dir")
 	if (not -d "${dir}usr/share/info/dir");
-#system ("mkdir -p ${dir}/usr/share/doc/gcc-4.2-base/")
-#	if (not -d "${dir}/usr/share/doc/gcc-4.2-base/");
-#system ("touch ${dir}/usr/share/doc/gcc-4.2-base/.copyright");
-#system ("touch ${dir}/usr/share/doc/gcc-4.2-base/#changelog.Debian.gz");
+system ("mkdir -p ${dir}/usr/share/doc/gcc-4.2-base/")
+	if (not -d "${dir}/usr/share/doc/gcc-4.2-base/");
+system ("touch ${dir}/usr/share/doc/gcc-4.2-base/.copyright");
+system ("touch ${dir}/usr/share/doc/gcc-4.2-base/changelog.Debian.gz");
 my $msg = sprintf(_g("Unable to create directory '%s'\n"), "${dir}etc/apt/preferences.d/");
 die ($msg)
 	if (not -d "${dir}etc/apt/preferences.d/");
@@ -1009,4 +1009,11 @@ A native multistrap can be used directly with chroot, so
 C<multistrap> runs C<dpkg --configure -a> at the end of the
 multistrap process. 
 
+=head1 Local repositories
+
+apt will not download packages from repositories that use the
+file:// type, so multistrap is unable to locate the package
+files. Always use a http:// or ftp:// method like
+F<http://localhost/debian>.
+
 =cut