Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Release

README

@@ -18,7 +18,7 @@ as those based upon the OpenSim platform.
 Singularity is maintained by a small group of volunteers who can be contacted
 both, in-world (SingularityViewer group) as well as on IRC (#SingularityViewer
 @ FreeNode). Bug requests and features requests can be submitted through our
-Issue Tracker (http://code.google.com/p/singularity-viewer/issues/list or from
+Issue Tracker (http://links.singularityviewer.org/?to=issues or from
 the viewer menu: Help --> Bug Reporting --> Singularity Issue Tracker...)
 
 

indra/cmake/Variables.cmake

@@ -85,7 +85,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  set(LINUX ON BOOl FORCE)
+  set(LINUX ON BOOL FORCE)
 
   # If someone has specified a word size, use that to determine the
   # architecture.  Otherwise, let the architecture specify the word size.
@@ -108,7 +108,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
       set(WORD_SIZE 32)
       set(AUTOBUILD_PLATFORM_NAME "linux")
     else()
-      message(FATAL_ERROR "Unkown Architecture!")
+      message(FATAL_ERROR "Unknown Architecture!")
     endif (CMAKE_SIZEOF_VOID_P EQUAL 8)
   endif (WORD_SIZE EQUAL 32)
 

scripts/install-deps.sh

@@ -15,7 +15,7 @@ if [ -f /etc/arch-release ]; then
 	else
 		pacman -S --asdeps ${DEPS}
 	fi
-elif [ -f /etc/lsb-release ]; then
+elif [ -f /etc/lsb-release ] || [ -f /etc/debian_version ]; then
 	$echo -e "\e[1;31mDebian/Ubuntu Linux detected!\e[0m"
 	DEPS="libapr1-dev libaprutil1-dev build-essential libboost-dev libc-ares-dev cmake libcurl4-openssl-dev libdb-dev libdbus-glib-1-dev libexpat1-dev fontconfig libalut-dev libfreetype6-dev libgoogle-perftools-dev libglib2.0-dev libgstreamer-plugins-base0.10-dev libgtk2.0-dev libhunspell-dev libjpeg-turbo8-dev libogg-dev libpng12-dev libvorbis-dev libopenal-dev libssl-dev libpcre3-dev libqtwebkit-dev libsdl1.2-dev"
 	for dep in $DEPS; do