Merge branche make

[hvlinux.git] / ubuntu / ubuntu-cfg.sh

diff --git a/ubuntu/ubuntu-cfg.sh b/ubuntu/ubuntu-cfg.sh
index ef37242..c3a3fe9 100755 (executable)
--- a/ubuntu/ubuntu-cfg.sh
+++ b/ubuntu/ubuntu-cfg.sh
@@ -261,10 +261,12 @@ 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
 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
@@ -284,6 +286,7 @@ if [ "x${INSTALL_MUSIC_STUDIO}" = "x1" ]; then
     ${AGI} lilypond
     ${AGI} vkeybd
     ${AGI} rosegarden
+    ${AGI} ardour
 fi
 
 ${AGI} sylpheed
@@ -298,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"
@@ -321,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 $?