From 6a7586633fc5bf4c74976159eee3248c81ea59b1 Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Fri, 28 Jan 2011 22:39:04 +0000
Subject: [PATCH] =?utf8?q?-Ajout=20option=20pour=20serveur=20web=20-Ajout?=
 =?utf8?q?=20option=20pour=20GNASH=20-Enlev=C3=A9=20modemmanager?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 ubuntu/ubuntu-cfg.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/ubuntu/ubuntu-cfg.sh b/ubuntu/ubuntu-cfg.sh
index 805b5a1..ef37242 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
 
@@ -255,7 +263,9 @@ ${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"
+fi
 if [ -h /dev/cdrom ]; then # Don't install on machines without CD/DVD-ROM
 ${AGI} vlc mozilla-plugin-vlc
     ${AGI} sound-juicer
-- 
2.20.1