Removed generic comments from sources.list.

[carnet-upgrade.git] / usr / share / carnet-upgrade / data.sh

diff --git a/usr/share/carnet-upgrade/data.sh b/usr/share/carnet-upgrade/data.sh
index 08f0d7a..f35f556 100644 (file)
--- a/usr/share/carnet-upgrade/data.sh
+++ b/usr/share/carnet-upgrade/data.sh
@@ -27,6 +27,7 @@ aosi-aai      1.6.3
 aosi-www-aai   1.5.7sarge0
 freeradius-aai 1.1.7-0
 openldap-aai   2.2.23-13
+mysql-common   4.0.24-10sarge3
 '
 
 # Packages to forcibly install before installing the rest with dist-upgrade,
@@ -34,7 +35,10 @@ openldap-aai 2.2.23-13
 packages_first='
 php4-odbc
 php4-xslt
-apache2-cn php5-cn squirrelmail-cn
+amavisd-cn
+php5-cn
+squirrelmail-cn
+mysql-cn
 '
 
 # Packages that provide crucial services, upgrade them before the rest
@@ -43,7 +47,6 @@ bind9-cn bind9
 openssh-cn openssh-server              
 clamav-cn clamav-daemon
 spamassassin-cn        spamassassin razor dcc-client
-amavisd-cn
 postfix-cn
 dovecot-cn dovecot
 squirrelmail-cn
@@ -51,7 +54,6 @@ openldap-aai
 freeradius-aai freeradius
 aosi-aai
 aosi-www-aai
-mysql-cn
 ntp-cn ntp
 vsftpd-cn vsftpd
 xinetd-cn xinetd       
@@ -89,12 +91,13 @@ bind9-cn            bind            /usr/sbin/named                         Bind
 clamav-cn              clamav          /usr/sbin/clamd                         ClamAV
 freeradius-cn          freerad         /usr/sbin/freeradius                    FreeRADIUS
 mysql-cn               mysql           /usr/sbin/mysqld                        MySQL
-sendmail-cn            root            sendmail: MTA: accepting connections    Sendmail
+postfix-cn             root            /usr/lib/postfix/master Postfix
 openldap-cn            root            /usr/sbin/slapd                         OpenLDAP
 oidentd-cn             nobody          /usr/sbin/oidentd                       oidentd
 openssh-cn             root            /usr/sbin/sshd                          OpenSSH
 postgresql-cn          postgres        /usr/lib/postgresql/bin/postmaster      PostgreSQL
 proftpd-cn             nobody          proftpd: \(accepting connections\)      ProFTPD (mozda se pokrece iz (x)inetd-a)
+vsftpd-cn              root            /usr/sbin/vsftpd        VSFTPD
 spamassassin-cn                root            /usr/sbin/spamd                         SpamAssassin
 xinetd-cn              root            /usr/sbin/xinetd                        xinetd
 ntp-cn                 root            /usr/sbin/ntpd                          ntpd