X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=ubuntu%2Fubuntu-cfg.sh;h=c3a3fe9274f6efdc873500676dd9f26874d392d2;hb=b7d1d99f41dcf50a8635f608679947f4455a0c7c;hp=805b5a11724c56239a848722ffc3993c2ecdbca1;hpb=dc273ddb08fd050afa82a069a91db75037fe62c1;p=hvlinux.git

diff --git a/ubuntu/ubuntu-cfg.sh b/ubuntu/ubuntu-cfg.sh
index 805b5a1..c3a3fe9 100755
--- a/ubuntu/ubuntu-cfg.sh
+++ b/ubuntu/ubuntu-cfg.sh
@@ -76,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
@@ -216,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
 
@@ -253,9 +261,13 @@ fi
 ${AGI} ffmpeg
 ${AGI} ${GST}-ffmpeg ${GST}-plugins-bad ${GST}-plugins-ugly ${GST}-fluendo-mp3
 ${AGI} libavcodec-extra-52
-hv_add_repo "ppa:stebbins/handbrake-snapshots"
-${AGI} handbrake-cli
-${AGI} mozilla-plugin-gnash # Requires "mysql-common"
+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
@@ -274,6 +286,7 @@ if [ "x${INSTALL_MUSIC_STUDIO}" = "x1" ]; then
     ${AGI} lilypond
     ${AGI} vkeybd
     ${AGI} rosegarden
+    ${AGI} ardour
 fi
 
 ${AGI} sylpheed
@@ -288,7 +301,11 @@ fi
 hv_add_repo "ppa:chromium-daily/ppa"
 ${AGI} chromium-browser
 
-if [ "x${INSTALL_WMAKER}" = "x1" ]; then
+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"
@@ -311,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 $?