Index: branches/blackosx/trunk/package/buildpkg
===================================================================
--- branches/blackosx/trunk/package/buildpkg	(revision 201)
+++ branches/blackosx/trunk/package/buildpkg	(revision 202)
@@ -71,10 +71,25 @@
 		mkdir -p ${1}/Standard/Scripts/Tools
 		cp -f ${pkgroot}/Scripts/Standard/* ${1}/Standard/Scripts
 		ditto --arch i386 `which SetFile` ${1}/Standard/Scripts/Tools/SetFile
-		echo "Building boot0 package"
-		buildpackage "${1}/Standard" "/" "${coresize}" "start_enabled=\"true\" start_selected=\"upgrade_allowed()\" selected=\"exclusive(choices['EnhancedHFS']) && exclusive(choices['Standardhfs']) && exclusive(choices['EnhancedFAT']) && exclusive(choices['noboot'])\""
+		echo "Building standard package"
+		buildpackage "${1}/Standard" "/" "${coresize}" "start_enabled=\"true\" start_selected=\"upgrade_allowed()\" selected=\"exclusive(choices['EFI']) && exclusive(choices['noboot'])\""
 	# End build standard package 
 
+	# build efi package 
+		mkdir -p ${1}/EFI/Root
+		mkdir -p ${1}/EFI/Scripts/Tools
+		cp -f ${pkgroot}/Scripts/EFI/* ${1}/EFI/Scripts
+		ditto --arch i386 `which SetFile` ${1}/EFI/Scripts/Tools/SetFile
+		echo "Building efi package"
+		buildpackage "${1}/EFI" "/" "${coresize}" "start_visible=\"systemHasGPT()\" start_selected=\"false\" selected=\"exclusive(choices['Standard']) && exclusive(choices['noboot'])\""
+	# End build efi package 
+	
+	# build reset choice package 
+		mkdir -p ${1}/noboot/Root
+		echo "Building reset choice package"
+		buildpackage "${1}/noboot" "/binaries" "" "start_visible=\"true\" start_selected=\"false\" selected=\"exclusive(choices['Standard']) && exclusive(choices['EFI'])\""
+	# End build reset choice package 
+
 	((xmlindent--))
 	outline[$((outlinecount++))]="${indent[$xmlindent]}\t</line>"
 # End build Chameleon package
@@ -117,7 +132,8 @@
 			cp -f ${pkgroot}/doc/README ${1}/Documentation/Root
 			cp -f ${pkgroot}/doc/Users_Guide0.5.pdf ${1}/Documentation/Root
 			echo "Building Documentation package"
-			buildpackage "${1}/Documentation" "/Documentation/Chameleon2RC5" "" "start_selected=\"false\""
+			#buildpackage "${1}/Documentation" "/Documentation/Chameleon2RC5" "" "start_selected=\"false\""
+			buildpackage "${1}/Documentation" "/Library/Documentation/Chameleon2RC5" "" "start_selected=\"false\""
 		# End build package for Documentation
 
 		((xmlindent--))
Index: branches/blackosx/trunk/package/Resources/English.lproj/Localizable.strings
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/blackosx/trunk/revision
===================================================================
--- branches/blackosx/trunk/revision	(revision 201)
+++ branches/blackosx/trunk/revision	(revision 202)
@@ -1,3 +1 @@
-<<<<<<< .mine
-194=======
-195>>>>>>> .r196
+198:201
\ No newline at end of file