X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Factions%2Fmain.queue;h=98574fb3009e30a73b372ea1a1df599b550a32c7;hb=62570336ff4a368ae1b9de58f08d94a0da99f14c;hp=4dc3cfdfba67ec891ff98efdaecedc7d78ec9ad2;hpb=a2abb60ae52da371d0a6fb6cb8a284ebd8887c73;p=carnet-upgrade.git

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 4dc3cfd..98574fb 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -1,10 +1,12 @@
 # Full upgrade
 true				first_warning
 true				check_my_version
+true				hold_carnet_upgrade
+true				check_php_version
 true				check_upgrade
 true				check_grsec_kernel
 true				check_reboot
-pkg xlibs			remove_x
+pkg x11-common			remove_x
 true				remove_bloat
 true				remove_cn_bloat
 true				apt_listchanges disable
@@ -38,7 +40,6 @@ pkg freeradius-aai		upgrade_freeradius
 pkg openldap-aai		upgrade_openldap
 pkg amavisd-new			upgrade_amavis
 pkg apache2-cn			upgrade_apache2
-pkg dovecot-cn			upgrade_dovecot
 pkg postfix-cn			upgrade_postfix
 # ntp i ntpdate se ne pokrenu ispravno bez lockanja
 pkg ntp && pkg ntpdate		pkgadd lockfile-progs
@@ -47,9 +48,11 @@ true				upgrade first		# neki paketi moraju rucno
 true				upgrade second		# neke pakete zelimo ranije
 true				remove_orphaned		# ocisti stare libove nakon sto su cn paketi nadogradjeni
 true				dist_upgrade		# instaliraj ostatak
+true				install_new		# instaliraj nove
 # i ostatak
 true				add_group_proc		# za oidentd
 true				pkgadd monit-cn
+true 				remove_php4
 pkg kernel-2.6-cn		dpkg-reconfigure kernel-2.6-cn
 # ovo bi trebalo biti predzadnje na popisu
 #  - izvrsi sve uvjetne post_upgrade akcije
@@ -57,5 +60,6 @@ true				run_post_upgrade
 true				apt_listchanges enable
 true				debconf_priority reset
 true				fix_issue
+true				release_carnet_upgrade
 # i konacno, provjeri da li stvari rade
 true				check_services postupgrade