X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=b4bd0e3789193de9b496c779dfe07ff091e3594d;hb=c114b9878b474e560c7b8bc0d4d91d68bf5e5fe1;hp=39cab95f0425d178de6dbb52ffa2cb4a9b0da2f2;hpb=e4155197112942db5cb42c9f69b4b9059db506a6;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 39cab95..b4bd0e3 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -5,7 +5,7 @@ true				hold_carnet_upgrade
 true				install_keyrings	# update current keys
 true				check_upgrade
 true				check_reboot
-pkg x11-common			remove_x
+pkg xserver-xorg		remove_x
 true				remove_bloat
 true				remove_cn_bloat
 true				apt_listchanges disable
@@ -17,6 +17,7 @@ pkg slapd			backup_slapd_db
 true				backup_etc_dir		# etc i drugo
 true				create_sources_list
 true				apt_update
+true				cleanup_available
 true				check_archives_space
 true				check_kernel_space
 true				apt_download		# skini pakete
@@ -29,21 +30,22 @@ true				restore_configs
 pkg munin-cn			upgrade_munin
 # konacno, instalacija novih paketa
 pkg freeradius-aai		upgrade_freeradius
-pkg openldap-aai		upgrade_openldap
+pkg openldap-aai		pkgadd openldap-aai
 pkg amavisd-new			upgrade_amavis
 pkg apache2-cn			upgrade_apache2
 pkg postfix-cn			upgrade_postfix
 pkg bind9-cn			upgrade_bind
-true				upgrade_mysql
+pkg mysql-cn			upgrade_mysql
 true				upgrade_postgresql
 true				upgrade first		# neki paketi moraju rucno
 true				upgrade second		# neke pakete zelimo ranije
 true				dist_upgrade		# instaliraj ostatak
 true				install_new		# instaliraj nove
+pkg dhcp3-client		pkgadd isc-dhcp-client	# novi naziv za dhcp
 true				remove_orphaned		# ocisti stare libove nakon sto su cn paketi nadogradjeni
 # i ostatak
 true				add_group_proc		# za oidentd
-true				pkgadd monit-cn
+true				enable_monit
 pkg kernel-2.6-cn		dpkg-reconfigure kernel-2.6-cn
 true				dpkg-reconfigure sysv-rc
 # ovo bi trebalo biti predzadnje na popisu