From 66c813bb6a87b15e3226495fbd6f7a10f7f880d8 Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Tue, 11 Dec 2007 21:27:03 +0000
Subject: [PATCH] build_all.sh: don't source CONF.sh after already sourcing 
 earlier

---
 build_all.sh     | 2 --
 debian/changelog | 7 +++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build_all.sh b/build_all.sh
index ca4f0fdb..14d558b5 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -13,8 +13,6 @@ if [ -z "$COMPLETE" ] ; then
     export COMPLETE=1
 fi
 
-. CONF.sh
-
 PATH=$BASEDIR/tools:$PATH
 export PATH
 
diff --git a/debian/changelog b/debian/changelog
index 4e5fe1b5..8a0438f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,8 +45,11 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
     as much as possible. Also, log what debootstrap told us (in
     debootstrap-list) rather than just including the results directly in
     rawlist.
-	
- -- Steve McIntyre <93sam@debian.org>  Mon, 19 Nov 2007 23:40:32 +0000
+
+  [ Frans Pop ]
+  * build_all.sh: don't source CONF.sh after already sourcing $CF earlier.
+
+ -- Frans Pop <fjp@debian.org>  Tue, 11 Dec 2007 22:25:46 +0100
 
 debian-cd (3.0.3) unstable; urgency=low