From: Valentin Vidic <vvidic@carnet.hr>
Date: Mon, 14 Jan 2008 09:58:14 +0000 (+0100)
Subject: Removed workaround for apache/php circular depends.
X-Git-Tag: debian/4.0.1~73
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=e6229d5597b864d2ab85212bedbeddd7bc47d980;p=carnet-upgrade.git

Removed workaround for apache/php circular depends.
---

diff --git a/src/functions.sh b/src/functions.sh
index 87d0e92..f98489a 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -470,13 +470,8 @@ upgrade_apache () {
   #pkgadd apache2-cn php5-cn aosi-aai aosi-www-aai # squirrelmail-cn
 
   pkgadd apache2 apache2-mpm-prefork libapache2-mod-php4 ssl-cert
-  apt-get install -y -d apache2-cn php4-cn
-  apt-get autoclean
-  dpkg -i --ignore-depends=apache2-cn \
-     /var/cache/apt/archives/apache2-cn_* \
-     /var/cache/apt/archives/php4-cn_*
-
-  pkgadd aosi-aai aosi-www-aai # squirrelmail-cn
+  pkgadd apache2-cn php4-cn
+  pkgadd aosi-aai aosi-www-aai squirrelmail-cn
 }
 
 upgrade_amavis () {