[FE training-materials-updates] Update distribution and middleware pages

[Michael Opdenacker]

Repository : git://git.free-electrons.com/training-materials.git

On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=e822247ab14f9aade9982ab865fc71c7e7f67108

>---------------------------------------------------------------

commit e822247ab14f9aade9982ab865fc71c7e7f67108
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Fri Mar 14 17:32:22 2014 +0100

    Update distribution and middleware pages
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>


>---------------------------------------------------------------

e822247ab14f9aade9982ab865fc71c7e7f67108
 slides/sysdev-embedded-linux/angstrom.png          |  Bin 0 -> 20962 bytes
 slides/sysdev-embedded-linux/meego.png             |  Bin 11326 -> 0 bytes
 slides/sysdev-embedded-linux/mer.png               |  Bin 0 -> 5550 bytes
 .../sysdev-embedded-linux.tex                      |   35 ++++++++++++++++----
 slides/sysdev-embedded-linux/tizen.png             |  Bin 0 -> 46086 bytes
 5 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/slides/sysdev-embedded-linux/angstrom.png b/slides/sysdev-embedded-linux/angstrom.png
new file mode 100644
index 0000000..841c008
Binary files /dev/null and b/slides/sysdev-embedded-linux/angstrom.png differ
diff --git a/slides/sysdev-embedded-linux/meego.png b/slides/sysdev-embedded-linux/meego.png
deleted file mode 100644
index c488f38..0000000
Binary files a/slides/sysdev-embedded-linux/meego.png and /dev/null differ
diff --git a/slides/sysdev-embedded-linux/mer.png b/slides/sysdev-embedded-linux/mer.png
new file mode 100644
index 0000000..7a672ad
Binary files /dev/null and b/slides/sysdev-embedded-linux/mer.png differ
diff --git a/slides/sysdev-embedded-linux/sysdev-embedded-linux.tex b/slides/sysdev-embedded-linux/sysdev-embedded-linux.tex
index c062f6d..49cedb7 100644
--- a/slides/sysdev-embedded-linux/sysdev-embedded-linux.tex
+++ b/slides/sysdev-embedded-linux/sysdev-embedded-linux.tex
@@ -1569,11 +1569,6 @@ $(eval $(autotools-package))
     \column{0.8\textwidth}
     Distributions designed for specific types of devices
     \begin{itemize}
-    \item {\bf Meego}: \url{http://meego.com/}\\
-      Distribution targeting phones, media players, netbooks, TVs and
-      In Vehicle Infotainment.\\
-      Dropped by Nokia and Intel, and will be replaced by Tizen, a new
-      project (\url{https://www.tizen.org/}).
     \item {\bf Android}: \url{http://www.android.com/}\\
       Google's distribution for phones and tablet PCs.\\
       Except the Linux kernel, very different userspace
@@ -1584,8 +1579,36 @@ $(eval $(autotools-package))
       Binaries available for arm little endian.
     \end{itemize}
     \column{0.2\textwidth}
-    \includegraphics[width=\textwidth]{slides/sysdev-embedded-linux/meego.png}\\
     \includegraphics[width=\textwidth]{slides/sysdev-embedded-linux/android.png}\\
+    \includegraphics[width=\textwidth]{slides/sysdev-embedded-linux/angstrom.png}\\
+  \end{columns}
+\end{frame}
+
+\begin{frame}
+  \frametitle{Application frameworks}
+  \small
+  \begin{columns}
+    \column{0.8\textwidth}
+    Not real distributions you can download. Instead, they
+    implement middleware running on top of the Linux kernel
+    and allowing to develop applications.
+    \begin{itemize}
+    \item {\bf Mer}: \url{http://merproject.org/}\\
+      Fork from the Meego project.\\
+      Targeting mobile devices.\\
+      Supports x86, ARM and MIPS. \\
+      See \url{http://en.wikipedia.org/wiki/Mer\_(software\_distribution)}
+    \item {\bf Tizen}: \url{https://www.tizen.org/} \\
+      Targeting smartphones, tablets, netbooks, smart TVs and
+      In Vehicle Infotainment devices.\\
+      Supported by big phone manufacturers and operators \\
+      HTML5 base application framework. \\
+      Likely to compete against Android! \\
+      See \url{http://en.wikipedia.org/wiki/Tizen}
+    \end{itemize}
+    \column{0.2\textwidth}
+    \includegraphics[width=\textwidth]{slides/sysdev-embedded-linux/mer.png}\\
+    \includegraphics[width=\textwidth]{slides/sysdev-embedded-linux/tizen.png}\\
   \end{columns}
 \end{frame}
 
diff --git a/slides/sysdev-embedded-linux/tizen.png b/slides/sysdev-embedded-linux/tizen.png
new file mode 100644
index 0000000..a402da7
Binary files /dev/null and b/slides/sysdev-embedded-linux/tizen.png differ