[SCM] live-build branch, debian-next, updated. debian/3.0_a48-1-3-g4b34d76

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 4b34d7612228b63a13d106ab53767ba84550d06e
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon May 28 12:35:15 2012 +0200

    Also writing ftp_proxy and http_proxy to configuration tree for reuse by debootstrap, cdeboostran, and wget within live-build.

diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index f1ae30c..d6b8ef3 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1062,6 +1062,9 @@ APT_OPTIONS="${APT_OPTIONS}"
 APTITUDE_OPTIONS="${APTITUDE_OPTIONS}"
 GZIP_OPTIONS="${GZIP_OPTIONS}"
 ISOHYBRID_OPTIONS="${ISOHYBRID_OPTIONS}"
+
+ftp_proxy="${LB_APT_FTP_PROXY}"
+http_proxy="${LB_APT_HTTP_PROXY}"
 EOF
 
 # Creating lb_bootstrap_* configuration

-- 
live-build