X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fdata.sh;h=5d2a15ef5c940b7e326a31bc1c9be8347750e040;hb=61c702aeb281fcc52bc9060e34b6896ca0c0a1e1;hp=983ff86831eb8ae495e079ce1acc2c2aa0368d9c;hpb=a6d312227bbc2de9212a0e07a3d7811be0ae38f4;p=carnet-upgrade.git

diff --git a/src/data.sh b/src/data.sh
index 983ff86..5d2a15e 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -4,45 +4,44 @@ backup_ext=cn6-upgrade
 # carnet-upgrade aborts if these packages are not up to date
 # name		wanted version
 needed_versions='
-amavis-stats-cn	0.1.12-3lenny1
-amavisd-cn	3:2.6.1-1
-aosi-aai	3.0.7
-aosi-www-aai	1:1.7.2
-apache2-cn	2.2-5lenny1
-bind9-cn	2:9.5.1-3
-carnet-tools-cn	2.8.3
-clamav-cn	3:0.95.3-1lenny1
-debian-archive-keyring	2010.08.28~lenny1
-dovecot-cn	1:1.0.15-2lenny2
-fail2ban-cn	0.8.3-2lenny1
-freeradius-aai	2.1.3-4
-iptables-cn	2:1.4.2-1
-kernel-2.6-cn	3:2.6.26.6
-mailman-cn	2:2.1.11-1
-monit-cn	1:4.10.1.4
-munin-cn	1.2.6-1
-mysql-cn	2:5.0.51-2lenny1
-ntp-cn	2:4.2.4p4-1
-openldap-aai	2.4.11-4
-openssh-cn	2:5.1p1-1lenny1
-php-suhosin-cn	0.9.27-1
-php5-cn	5.2.6-1
-postfix-cn	2.5.5-3lenny2
-samba-cn	3.2.5-1
-spamassassin-cn	2:3.2.5-7lenny1
-squirrelmail-change-pass-cn	3.0.2
-squirrelmail-cn	2:1.4.15-2lenny1
-vsftpd-cn	2.0.7-1
-webalizer-cn	2.01.10-32.4lenny1
+amavisd-cn	3:2.6.5
+aosi-aai	3.1.5
+aosi-www-aai	1:1.8.3
+apache2-cn	2.2+3
+bind9-cn	2:9.7.3
+carnet-tools-cn	3.0.3
+clamav-cn	3:0.97.8-1
+debian-archive-keyring	2010.08.28+squeeze1
+dovecot-cn	1:1.2.15.3
+fail2ban-cn	0.8.5
+freeradius-aai	2.1.10-2
+iptables-cn	2:1.4.8
+kernel-2.6-cn	3:2.6.32.1
+mailman-cn	2:2.1.13-1
+monit-cn	1:5.1.3
+munin-cn	1.4.5
+mysql-cn	2:5.1.49.2
+ntp-cn	2:4.2.6.p2.2
+openldap-aai	2.4.23-2
+openssh-cn	2:5.5p1.3
+php-suhosin-cn	0.9.32.2
+php5-cn	5.3.3+3
+postfix-cn	2.7.1.5
+samba-cn	3.5.6-1
+spamassassin-cn	2:3.3.3
+squirrelmail-change-pass-cn	3.1.2
+squirrelmail-cn	2:1.4.21+2
+vsftpd-cn	2.3.2.2
+webalizer-cn	2.01.10+2
 '
 
 # URL to use for checking the latest version of carnet-upgrade itself
-packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-squeeze/main/binary-i386/Packages'
+packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-wheezy/main/binary-i386/Packages'
 
 # Packages to forcibly install before installing the rest with dist-upgrade,
 # because dist-upgrade would rather remove or keep them back them.
 packages_first='
-libkrb5-17-heimdal postgresql-client unixodbc iptables oidentd libpam-modules procps base-passwd dhcp3-client
+libkrb5-17-heimdal postgresql-client unixodbc iptables oidentd libpam-modules procps base-passwd ifupdown
 '
 
 # Packages that provide crucial services, upgrade them before the rest
@@ -121,6 +120,8 @@ libcompress-zlib-perl
 dhcp3-client
 dhcp3-common
 mktemp
+libxapian15
+libdb4.6
 '
 
 # new packages to be installed