Enlevé Empathy et composants de Evolution

diff --git a/ubuntu/ubuntu-cfg.sh b/ubuntu/ubuntu-cfg.sh
index 50326ef..f0b9745 100755 (executable)
--- a/ubuntu/ubuntu-cfg.sh
+++ b/ubuntu/ubuntu-cfg.sh
@@ -10,6 +10,7 @@ GST=gstreamer0.10
 
 APT="sudo apt-get --yes --force-yes"
 AGI="${APT} install"
+AGINR="${AGI} --no-install-recommends"
 
 ubuntu_cleanup()
 {
@@ -46,7 +47,11 @@ if dpkg --list | grep "samba-common" 1> /dev/null 2>&1; then
 fi
 
 if dpkg --list | grep "evolution-exchange" 1> /dev/null 2>&1; then
-    ${APT} remove --purge evolution
+    ${APT} remove --purge evolution evolution-plugins evolution-webcal evolution-data-server evolution-indicator evolution-common
+fi
+
+if dpkg --list | grep "empathy-common" 1> /dev/null 2>&1; then
+    ${APT} remove --purge empathy*
 fi
 
 if dpkg --list | grep "pppconfig" 1> /dev/null 2>&1; then
@@ -176,7 +181,7 @@ ${AGI} emacs
 
 ${AGI} reiserfsprogs gparted
 ${AGI} gddrescue
-${AGI} smartmontools --no-install-recommends
+${AGINR} smartmontools
 
 # Connection serveurs NFS
 ${AGI} nfs-common portmap
@@ -186,6 +191,9 @@ ${AGI} subversion
 # Development
 if [ "x${INSTALL_DEV_TOOLS}" = "x1" ]; then
     ${AGI} git
+    # Set global configuration options to ~/.gitconfig
+    git config --global core.editor emacs
+    git config --global color.ui true
     ${AGI} build-essential texinfo gettext gawk bison flex
     ${AGI} autoconf autoconf-doc autotools-dev libtool
     ${AGI} manpages manpages-dev manpages-posix manpages-posix-dev
@@ -207,7 +215,7 @@ ${AGI} texlive texlive-latex-recommended texlive-latex-extra texlive-humanities
 
 # Jackd
 if [ "x${INSTALL_MUSIC_STUDIO}" = "x1" ]; then
-    ${AGI} jackd patchage
+    ${AGINR} jackd patchage
     sudo sed -i -e 's!^\(@audio\s*-\s*rtprio\s*\).*!\199!' \
         /etc/security/limits.d/audio.conf
     ${AGI} pulseaudio-module-jack