From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Wed, 10 Jun 2009 09:03:58 +0000 (+0200)
Subject: Remove apache-common (prevents installation of apache2-cn).
X-Git-Tag: debian/5.0.0~8
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-upgrade.git;a=commitdiff_plain;h=4a91a17bc198fb1c3ccb2ab3379930ded4d6644f

Remove apache-common (prevents installation of apache2-cn).
---

diff --git a/src/functions.sh b/src/functions.sh
index 6f16290..beccc6d 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -1019,6 +1019,7 @@ upgrade_libc () {
 
 # upgrade apache2/php5 to lenny
 upgrade_apache2 () {
+  pkgrm apache-common # prevents installation of apache2-suexec
   pkgadd_if_installed libapache2-mod-php5 php5-cli php5-cn apache2-cn \
     php5-odbc php5-suhosin php-suhosin-cn
 }