X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=ubuntu%2Fubuntu-cfg.sh;h=c3a3fe9274f6efdc873500676dd9f26874d392d2;hb=32d65d92e012442869db211205afe55d77912ccf;hp=f0b97457fd1bb2c1bd942ab7bcf60695d58d89c0;hpb=315cb6e051715301d84c3550d632ba6e4ee5d8c7;p=hvlinux.git

diff --git a/ubuntu/ubuntu-cfg.sh b/ubuntu/ubuntu-cfg.sh
index f0b9745..c3a3fe9 100755
--- a/ubuntu/ubuntu-cfg.sh
+++ b/ubuntu/ubuntu-cfg.sh
@@ -20,6 +20,12 @@ ubuntu_cleanup()
     ${APT} autoclean
 }
 
+hv_add_repo()
+{
+    sudo add-apt-repository ${1}
+    ${APT} update
+}
+
 if [ "`id -u`" -eq 0 ]; then
     echo "You must NOT be the super-user to execute this script"
     exit 1
@@ -70,6 +76,10 @@ if dpkg --list | grep "vinagre" 1> /dev/null 2>&1; then
     ${APT} remove --purge vinagre
 fi
 
+if dpkg --list | grep "modemmanager" 1> /dev/null 2>&1; then
+    ${APT} remove --purge modemmanager
+fi
+
 # Braille
 if dpkg --list | grep "brltty" 1> /dev/null 2>&1; then
     ${APT} remove --purge brltty
@@ -210,6 +220,10 @@ if [ "x${INSTALL_DEV_TOOLS}" = "x1" ]; then
     ${AGI} dh-make lintian dupload
 fi
 
+if [ "x${INSTALL_WEB_SERVER}" = "x1" ]; then
+    ${AGI} libapache2-mod-php5
+fi
+
 ${AGI} abiword gnumeric gnumeric-plugins-extra
 ${AGI} texlive texlive-latex-recommended texlive-latex-extra texlive-humanities
 
@@ -246,7 +260,14 @@ if [ ! -h /usr/lib/libdvdcss.so.2 ]; then
 fi
 ${AGI} ffmpeg
 ${AGI} ${GST}-ffmpeg ${GST}-plugins-bad ${GST}-plugins-ugly ${GST}-fluendo-mp3
-${AGI} mozilla-plugin-gnash # Requires "mysql-common"
+${AGI} libavcodec-extra-52
+if [ "x${INSTALL_GNASH}" = "x1" ]; then
+    ${AGI} mozilla-plugin-gnash # Requires "mysql-common"
+else
+    if dpkg --list | grep "gnash" 1> /dev/null 2>&1; then
+        ${APT} remove --purge gnash*
+    fi
+fi
 if [ -h /dev/cdrom ]; then # Don't install on machines without CD/DVD-ROM
 ${AGI} vlc mozilla-plugin-vlc
     ${AGI} sound-juicer
@@ -265,6 +286,7 @@ if [ "x${INSTALL_MUSIC_STUDIO}" = "x1" ]; then
     ${AGI} lilypond
     ${AGI} vkeybd
     ${AGI} rosegarden
+    ${AGI} ardour
 fi
 
 ${AGI} sylpheed
@@ -275,7 +297,15 @@ if [ -f ${HOME}/.sylpheed-2.0/folderlist.xml ]; then
         ${HOME}/.sylpheed-2.0/folderlist.xml
 fi
 
-if [ "x${INSTALL_WMAKER}" = "x1" ]; then
+# Chromium
+hv_add_repo "ppa:chromium-daily/ppa"
+${AGI} chromium-browser
+
+if [ "x${INSTALL_NETBOOK}" = "x1" ]; then
+    ${AGI} battery-status
+    ${AGI} maximus
+    ${AGI} window-picker-applet
+else
     ${AGI} wmaker
     if [ -d ${HOME}/GNUstep/Library/WindowMaker ]; then
         cat > ${HOME}/GNUstep/Library/WindowMaker/autostart << "EOF"
@@ -298,6 +328,9 @@ ${AGI} psutils
 ${AGI} imagemagick
 ${AGI} gimp
 
+# Pour changer la couleur des scrollbars (gris sur gris par défaut)
+${AGI} gnome-color-chooser
+
 ubuntu_cleanup
 
 exit $?