-# upgrade apache -> apache2
-upgrade_apache () {
- local delpkg p
-
- # bugfix for apache2-cn postinst
- mkdir -p /etc/apache2
- touch /etc/apache2/httpd.conf
-
- # temporary remove packages conflicting with apache2
- delpkg=""
- for p in aosi-aai aosi-www-aai \
- php4-cn php4-odbc php4-xslt \
- squirrelmail-cn; do
-
- # remember installed packages
- if pkg $p; then
- delpkg="$delpkg $p"
- fi
+# upgrade apache2 to etch
+upgrade_apache2 () {
+ local package packages
+
+ # php-suhosin-cn causes removal of applications on dist-upgrade
+ # because of php5 only dependencies
+ pkgrm php-suhosin-cn
+
+ for package in \
+ libapache2-mod-php4 \
+ php4-cli \
+ php4-cgi \
+ php4-cn \
+ apache2-cn \
+ php4-odbc \
+ php4-suhosin
+ do
+ if pkg $package; then
+ packages="$packages $package"
+ fi