X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fdata.sh;h=f71ba0763b833131d1da17f614d7b6787a0b29bd;hb=6d042d931b7f42f77624c866e91ef8dcc90c5b99;hp=6dde08dde0f2dc908bfdb987b4bbe16077ee6909;hpb=ddd2cffebce9e4cbf7b11472da6fbe108cebfa3a;p=carnet-upgrade.git

diff --git a/src/data.sh b/src/data.sh
index 6dde08d..f71ba07 100644
--- a/src/data.sh
+++ b/src/data.sh
@@ -1,5 +1,5 @@
 # Backup extension
-backup_ext=cn7-upgrade
+backup_ext=cn8-upgrade
 
 # carnet-upgrade aborts if these packages are not up to date
 # name		wanted version
@@ -11,7 +11,7 @@ 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
+debian-archive-keyring	2014.3~deb7u1
 dovecot-cn	1:1.2.15.3
 fail2ban-cn	0.8.5
 freeradius-aai	2.1.10-2
@@ -36,7 +36,7 @@ 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-wheezy/main/binary-i386/Packages'
+packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-jessie/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.
@@ -55,7 +55,7 @@ clamav-cn clamav-daemon
 dovecot-cn
 freeradius-aai freeradius
 isc-dhcp-client
-kernel-2.6-cn
+kernel-cn
 monit-cn
 munin-cn
 mysql-cn mysql-client mysql-server
@@ -88,13 +88,14 @@ usbmgr		usbmgr
 # CN services to offer for removal
 cn_bloats='
 aide-cn aide-central-cn aide
+alpine-cn alpine alpine-pico
 amavisd-cn amavisd-new
 amavis-stats-cn amavis-stats
 bind9-cn bind9
 clamav-cn clamav-daemon clamav-freshclam clamav clamav-base
 dovecot-cn dovecot dovecot-imapd dovecot-pop3d dovecot-common
 kernel-source-cn
-jre-cn sun-java5-jre sun-java5-bin sun-java5-fonts
+jre-cn sun-java6-jre sun-java6-bin sun-java6-fonts
 mailman-cn mailman
 mrtg-cn mrtg
 munin-cn munin munin-node