Merge remote-tracking branch 'origin/2.7'

* origin/2.7:
  doc: catch up with master.
  doc: update release notes.
  bf: two step build.
  bf: fix pattern for distro packages.

Conflicts:
	Makefile.am
	build-aux
	doc/Makefile.am
	doc/platforms/jazz.tex
	doc/specs/lang.tex
	doc/tables/release-notes.tex
	doc/tutorial/first-steps.tex
	doc/uobject/api.tex
	doc/urbi-sandbox.tex
	doc/urbi-sdk-single.tex
	doc/urbi-sdk.sty
	doc/urbi.dict
	scripts/www/HEADER.html

Makefile.am

@@ -135,8 +135,8 @@ install-doc:
 ## FIXME: Race condition on this script.  It would be better to
 ## have the script run ssh rather that the converse.
 	scp $(build_aux_dir)/bin/symlink-to-latest $(doc_host):/tmp
-	ssh $(doc_host) 'perl -f /tmp/symlink-to-latest $(doc_dir)'
-	scp $(top_srcdir)/scripts/www/HEADER.html $(doc_host):$(doc_dir)
+	ssh $(doc_host) 'perl -f /tmp/symlink-to-latest $(dir $(doc_dir))'
+	scp $(top_srcdir)/scripts/www/HEADER.html $(doc_host):$(dir $(doc_dir))
 
 ## ------- ##
 ## Check.  ##

buildfarm/build

@@ -3,4 +3,7 @@
 set -e
 . $(dirname "$0")/common
 
-cd "$DIR_BUILD" && make -j ${JOBS}
+# It may look stupid, but we sometimes have concurrency issues.
+cd "$DIR_BUILD"
+make -j ${JOBS}
+make

buildfarm/package

@@ -256,7 +256,8 @@ fi
 # 6. Distribution packages.
 case $BUILDFARM_HOSTNAME in (bf-3)
   make -C "$DIR_BUILD" packages
-  move_into $DIR_PACKAGES $DIR_BUILD/*$SHA1*.{rpm,deb}
+  sha1=$(echo "$SHA1" | sed 's/[-_]/./g')
+  move_into $DIR_PACKAGES $DIR_BUILD/*$sha1*.{rpm,deb}
 esac
 
 ## --------------------- ##

doc/platforms/jazz.tex

@@ -1,4 +1,4 @@
-%% Copyright (C) 2009-2011, Gostai S.A.S.
+%% Copyright (C) 2009-2012, Gostai S.A.S.
 %%
 %% This software is provided "as is" without warranty of any kind,
 %% either expressed or implied, including but not limited to the
@@ -13,9 +13,6 @@ \chapter{Gostai Open Jazz}
   \lowersections
   \let\urbiObject\refObject
   \let\urbiSlot\refSlot
-  %% Unfortunately between 2.7 and master \labelObject and \defObject have
-  %% exchanged their semantics.  So use a wrapper.
-  \let\labelJazz\labelObject
   \input{platforms/open-jazz}
 }
 

doc/tables/release-notes.tex

@@ -423,9 +423,6 @@ \subsection{Fixes}
 \item Windows packages with the installer now have some \us files (namely
   \file{platform.u}) which properly depend on whether you are using the
   debug or release flavor.
-\item The developer documentation for Urbi SDK Remote Java is included in
-  the binary packages (as
-  \file{share/doc/urbi-sdk/doc/sdk-remote-java.htmldir}).
 \end{itemize}
 
 \subsection{Changes}
@@ -437,8 +434,7 @@ \subsection{Changes}
   \usdk now defines a macro \lstinline{foreach} much more widely than
   before.  Never include \file{boost/foreach.hpp}, rather, use
   \file{libport/foreach.hh}.
-\item \command{urbi-launch-java} is documented,
-  \autoref{sec:tools:urbi-launch-java}.
+\item Thanks to Adam Oleksy, we now provide Debian and RedHat packages.
 \item \command{urbi-launch-java} supports the new option \option[C]{check}
   which checks if Java support is available.
 \item We now use the version 8 of the Independent JPEG Group's (IJG)
@@ -449,6 +445,11 @@ \subsection{Documentation}
 \begin{itemize}
 \item Table of figures (\autoref{sec:lof}) and table of tables
   (\autoref{sec:lot}).
+\item \command{urbi-launch-java} is documented,
+  \autoref{sec:tools:urbi-launch-java}.
+\item The developer documentation for Urbi SDK Remote Java is included in
+  the binary packages (as
+  \file{share/doc/urbi-sdk/doc/sdk-remote-java.htmldir}).
 \end{itemize}
 
 \section{\usdk 2.7.4}

doc/urbi-sandbox.tex

@@ -1,4 +1,4 @@
-%% Copyright (C) 2010, 2011, 2012, Gostai S.A.S.
+%% Copyright (C) 2010-2012, Gostai S.A.S.
 %%
 %% This software is provided "as is" without warranty of any kind,
 %% either expressed or implied, including but not limited to the

doc/urbi-sdk.sty

@@ -1,4 +1,4 @@
-%% Copyright (C) 2009-2011, Gostai S.A.S.
+%% Copyright (C) 2009-2012, Gostai S.A.S.
 %%
 %% This software is provided "as is" without warranty of any kind,
 %% either expressed or implied, including but not limited to the
@@ -31,6 +31,7 @@
   \fi%
 }
 
+\newboolean[true]{urbiThree}
 
 %%% Local Variables:
 %%% mode: latex

doc/urbi.dict

@@ -1114,6 +1114,7 @@ redBallTracker
 redBlink
 redefinable
 redefinitionMode
+RedHat
 redRotate
 relicensing
 remoteIP