Merge branch 'master' of ssh://git.haiku-os.org/haiku

build/jam/HaikuImage

@@ -360,7 +360,7 @@ AddDirectoryToHaikuImage home mail draft ;
 AddDirectoryToHaikuImage home mail in ;
 AddDirectoryToHaikuImage home mail out ;
 
-AddSymlinkToHaikuImage home config settings : deskbar : be ;
+AddSymlinkToHaikuImage home config : settings/deskbar : be ;
 # Deskbar Application links
 AddDirectoryToHaikuImage home config settings deskbar Applications ;
 DESKBAR_APPLICATIONS = ActivityMonitor CharacterMap CodyCam CDPlayer DeskCalc

data/bin/installoptionalpackage

@@ -399,10 +399,13 @@ function GetBuildFile()
 	if ! [ -f ${baseDir}/${buildfile} ] ; then
 		echo "Fetching ${buildfile} ..."
 		cd ${baseDir}
-		local baseURL=http://dev.haiku-os.org/export/
-		local revision=`uname -v | awk '{print $1}' | sed -e 's/r//'`
-		local url="${baseURL}${revision}/haiku/trunk/build/jam/${buildfile}"
-		wget -q ${url} || ErrorExit "...failed to download $buildfile"
+		local baseURL=http://cgit.haiku-os.org/haiku/plain
+		local revisionTag=`uname -v | awk '{print $1}' | sed -e 's/-.*//'`
+			# the sed invocation above drops potential dirty markers off the
+			# revision tag
+		local url="${baseURL}/build/jam/${buildfile}?id=${revisionTag}"
+		wget -q ${url} -O ${buildfile} \
+			|| ErrorExit "...failed to download $buildfile"
 	fi
 }
 

src/apps/debuganalyzer/gui/ListSelectionModel.h

@@ -8,10 +8,9 @@
 
 #include <SupportDefs.h>
 
+#include <Array.h>
 #include <ObjectList.h>
 
-#include "Array.h"
-
 
 class ListSelectionModel {
 public: