--- misc/scripts/ubuntu-base.sh	2010/07/01 11:16:43	947
+++ misc/scripts/ubuntu-base.sh	2012/03/29 14:26:07	1766
@@ -22,6 +22,7 @@
 	else
 		echo "Installing udev rules"
 		echo 'SUBSYSTEM=="usb", SYSFS{idVendor}=="0bb4", MODE="0666"' | sudo tee  $FILE
+		echo 'SUBSYSTEM=="usb", SYSFS{idVendor}=="0502", MODE="0666"' | sudo tee  $FILE
 		sudo restart udev
 	fi
 }
@@ -55,9 +56,21 @@
 
 function inst_java
 {
-	inst sun-java6-jdk
-	sudo update-java-alternatives --set java-6-sun
-	sudo ln -s  /usr/lib/jvm/java-6-sun/jre/lib/i386/libnpjp2.so /usr/lib/mozilla/plugins/
+	#inst sun-java6-jdk
+	#sudo update-java-alternatives --set java-6-sun
+	#sudo ln -s  /usr/lib/jvm/java-6-sun/jre/lib/i386/libnpjp2.so /usr/lib/mozilla/plugins/
+	inst openjdk-6-jdk
+	inst icedtea-6-plugin
+}
+
+inst_teamviewer()
+{
+	if [ -x /usr/bin/teamviewer ] ; then
+		echo "TeamViewer installed"
+	else
+		wget -O /dev/shm/teamviewer_linux.deb http://www.teamviewer.com/download/teamviewer_linux.deb
+		dpkg -i /dev/shm/teamviewer_linux.deb
+	fi
 }
 
 remove()
@@ -107,23 +120,27 @@
 #gnome office packages sucks too
 remove abiword abiword-common gnumeric gnumeric-common evolution
 
+#skal installeres inden remove_orphans
+inst deborphan 
+
 autoremove
 remove_orphans
 
-inst vim deborphan whois tree
-inst openssh-server x11vnc rsync screen minicom tsclient xtightvncviewer
+inst vim whois tree
+inst openssh-server x11vnc rsync screen minicom xtightvncviewer remmina rdesktop
+inst network-manager-openvpn
 inst nfs-common
-inst firefox firebug
-inst flashplugin-nonfree
+inst firefox 
+#inst firebug
+inst flashplugin-installer
 inst vlc mplayer
 inst pavucontrol
-#mozilla-mplayer
 inst acroread 
 
 #inst gnochm #temporary disabled
 
-#inst grip
 inst_java
+inst_teamviewer
 inst openoffice.org myspell-da
 inst subversion libsvn-java rapidsvn git-core cvs
 inst gimp vym umbrello dia inkscape gwenview
@@ -138,7 +155,7 @@
 inst gcc g++ cmake
 
 #if [ "`hostname`" == "pumba" ] ; then
-	inst virtualbox-ose
+	inst virtualbox
 	inst k3b xsane
 	inst unetbootin audacity
 
@@ -146,21 +163,17 @@
 	#inst kdevelop temporary
 	inst automake intltool libtool
 	inst libqt4-dev libwxgtk2.8-dev libncurses5-dev
-	inst libmysqlclient15-dev
+	inst libmysqlclient-dev
  
 	### gnome/gtk+ dev pkgs
 	inst libgtk2.0-dev libpango1.0-dev libxml2-dev
 
 	### used for developing smsdaemon
-	inst libcurl4-openssl-dev libexpat1-dev
+	#inst libcurl4-openssl-dev libexpat1-dev
 
 #	inst tvtime
 	inst xubuntu-restricted-extras
-	### change when gfx card is updated
-	#inst nvidia-glx-96
-#	inst nvidia-glx-185
 
-	#inst xserver-xorg-video-nouveau
 
 #fi