Adding upstream version 3.0~a69.

VERSION

-3.0~a68-1
+3.0~a69-1

functions/defaults.sh

@@ -712,6 +712,7 @@ Set_defaults ()
 						precise)
 							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}"
 							;;
+
 						*)
 							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
 							;;
@@ -719,21 +720,13 @@ Set_defaults ()
 					;;
 
 				*)
-					case "${LIST}" in
-						stripped|minimal)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486}"
+					case "${LB_PARENT_DISTRIBUTION}" in
+						squeeze)
+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686}"
 							;;
 
 						*)
-							case "${LB_PARENT_DISTRIBUTION}" in
-								squeeze)
-									LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686}"
-									;;
-
-								*)
-									LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}"
-									;;
-							esac
+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}"
 							;;
 					esac
 					;;
@@ -761,27 +754,11 @@ Set_defaults ()
 					;;
 
 				ubuntu|kubuntu)
-					case "${LIST}" in
-						stripped|minimal)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp}"
-							;;
-
-						*)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp}"
-							;;
-					esac
+					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp e500 powerpc-e500mc}"
 					;;
 
 				*)
-					case "${LIST}" in
-						stripped|minimal)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc}"
-							;;
-
-						*)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc powerpc64}"
-							;;
-					esac
+					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc powerpc64}"
 					;;
 			esac
 			;;
@@ -1253,12 +1230,11 @@ Check_defaults ()
 		elif [ ${CURRENT_CONFIG_VERSION} -eq 2 ]
 		then
 			Echo_error "This config tree is too old for this version of live-build (${VERSION})."
-			Echo_error "Aborting build, please repopulate the config tree."
+			Echo_error "Aborting build, please regenerate the config tree."
 			exit 1
-		elif [ ${CURRENT_CONFIG_VERSION} -lt 1 ]
-		then
+		else
 			Echo_warning "This config tree does not specify a format version or has an unknown version number."
-			Echo_warning "Continuing build, but it could lead to errors or different results. Please repopulate the config tree."
+			Echo_warning "Continuing build, but it could lead to errors or different results. Please regenerate the config tree."
 		fi
 	fi
 

manpages/de/lb.de.1

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb\fP \- wrapper for live\-build programs

manpages/de/lb_binary.de.1

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb binary\fP \- Complete the binary stage

manpages/de/lb_bootstrap.de.1

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb bootstrap\fP \- Complete the bootstrap stage

manpages/de/lb_build.de.1

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages

manpages/de/lb_chroot.de.1

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb chroot\fP \- Complete the chroot stage

manpages/de/lb_clean.de.1

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb clean\fP \- Clean build directory

manpages/de/lb_config.de.1

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb config\fP \- Create config directory

manpages/de/lb_source.de.1

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb source\fP \- Complete the source stage

manpages/de/lb_testroot.de.1

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb testroot\fP \- Ensure that a system is built as root

manpages/de/live-build.de.7

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 7 2012\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 2012\-12\-06 3.0~a69\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-build\fP \- the Debian Live tool suite

manpages/en/lb.1

-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69-1 "Debian Live Project"
 
 .SH NAME
 \fBlb\fR \- wrapper for live\-build programs

manpages/en/lb_binary.1

-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69-1 "Debian Live Project"
 
 .SH NAME
 \fBlb binary\fR \- Complete the binary stage

manpages/en/lb_bootstrap.1

-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69-1 "Debian Live Project"
 
 .SH NAME
 \fBlb bootstrap\fR \- Complete the bootstrap stage

manpages/en/lb_build.1

-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69-1 "Debian Live Project"
 
 .SH NAME
 \fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages

manpages/en/lb_chroot.1

-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69-1 "Debian Live Project"
 
 .SH NAME
 \fBlb chroot\fR \- Complete the chroot stage

manpages/en/lb_clean.1

-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69-1 "Debian Live Project"
 
 .SH NAME
 \fBlb clean\fR \- Clean build directory

manpages/en/lb_config.1

-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69-1 "Debian Live Project"
 
 .SH NAME
 \fBlb config\fR \- Create config directory

manpages/en/lb_source.1

-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-12\-06 3.0~a69-1 "Debian Live Project"
 
 .SH NAME
 \fBlb source\fR \- Complete the source stage