[SCM] live-build branch, debian-next, updated. debian/3.0_a21-1-14-ge0a1da6

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit e0a1da6abaa2f75a5997d63a34283e2de54ee878
Author: Colin Watson <cjwatson at canonical.com>
Date:   Wed Jun 15 15:15:34 2011 +0100

    Fix default for LB_PARENT_ARCHIVE_AREAS (Closes: #630604).

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 4675a2d..6e3c1cb 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -550,12 +550,12 @@ Set_defaults ()
 			;;
 
 		ubuntu)
-			LB_PARENT_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main restricted}"
+			LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-main restricted}"
 			LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-${LB_PARENT_ARCHIVE_AREAS}}"
 			;;
 
 		*)
-			LB_PARENT_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}"
+			LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-main}"
 			LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-${LB_PARENT_ARCHIVE_AREAS}}"
 			;;
 	esac

-- 
live-build