Merge branch 'develop'

Patches master to version v0.3-rc.6

tools/btconnect

 #!/bin/bash
 
-# script to ease connecting to an NXT brick
+# script to ease connecting to an EV3 brick
 # (c) 2007-2009 Johannes Ballé
 
 # test if syntax is correct; if not, print help and exit
@@ -21,13 +21,13 @@ if [ $# = 0 -o $# -gt 3 ] || [ "$1" = "--help" -o "$1" = "-h" ] || ! { [ $# = 1
 
 		Examples:
 
-		${0##*/} NXT-20-B 2 6666
+		${0##*/} EV3-20-B 2 6666
 
-		This connects the NXT brick named "NXT-20-B" to rfcomm2 with PIN '6666'.
+		This connects the EV3 brick named "EV3-20-B" to rfcomm2 with PIN '6666'.
 
 		${0##*/} 00:16:53:06:D8:67
 
-		This connects the NXT brick with the hardware address 00:16:53:06:D8:67
+		This connects the EV3 brick with the hardware address 00:16:53:06:D8:67
 		to the first available rfcomm device (if no others are used, this will
 		be rfcomm0).
 

tools/rc.local.sh

@@ -6,6 +6,15 @@ for i in /opt/mindstorms/tools/*; do
 	ln -s $i /usr/local/bin/
 done
 
+
+# copy laboratory documentation
+echo "Copying documentation ..."
+DOCUMENTATION_DIR=/home/mindstorms/Desktop/Versuchsunterlagen
+[ ! -d ${DOCUMENTATION_DIR} ] && ( sudo -u mindstorms mkdir -p ${DOCUMENTATION_DIR} )
+wget -q -O - http://www.ient.rwth-aachen.de/cms/uploads/rwthonly/lehre/mindstorms/Versuchsunterlagen_EV3.tar.gz | tar -xzf - -C ${DOCUMENTATION_DIR}
+sudo chown -R mindstorms:mindstorms ${DOCUMENTATION_DIR}
+
+
 # Try to find a mindstorms.fat file / mindstorms.dir directory
 # in any local partition.
 # If it exists, mount it to /home/mindstorms/work.
@@ -149,18 +158,4 @@ cp   /usr/share/applications/matlab.desktop /home/mindstorms/Desktop/
 chmod +x /home/mindstorms/Desktop/matlab.desktop 
 sudo chown mindstorms:mindstorms /home/mindstorms/Desktop/matlab.desktop 
 
-# hack: add english, german language switcher
-echo "[org.gnome.desktop.input-sources]" > /usr/share/glib-2.0/schemas/99_input_sources.gschema.override
-echo "sources = [('xkb', 'us'), ('xkb', 'de+nodeadkeys')]" >> /usr/share/glib-2.0/schemas/99_input_sources.gschema.override
-echo "[com.canonical.indicator.keyboard]" >> /usr/share/glib-2.0/schemas/99_input_sources.gschema.override
-echo "visible=true" >> /usr/share/glib-2.0/schemas/99_input_sources.gschema.override
-
-glib-compile-schemas /usr/share/glib-2.0/schemas/
-
-# copy laboratory documentation
-echo "Copying documentation ..."
-DOCUMENTATION_DIR=/home/mindstorms/Desktop/Versuchsunterlagen
-[ ! -d ${DOCUMENTATION_DIR} ] && ( sudo -u mindstorms mkdir -p ${DOCUMENTATION_DIR} )
-wget -q -O - http://www.ient.rwth-aachen.de/cms/uploads/rwthonly/lehre/mindstorms/versuchsunterlagen.tar.gz | tar -xzf - -C ${DOCUMENTATION_DIR}
-sudo chown -R mindstorms:mindstorms ${DOCUMENTATION_DIR}