Remove desktop applications via xserver-xorg.

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 12aea51..b4bd0e3 100644 (file)
--- 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

diff --git a/src/actions/post_upgrade.queue b/src/actions/post_upgrade.queue
index 1a0d520..0bda10b 100644 (file)
--- a/src/actions/post_upgrade.queue
+++ b/src/actions/post_upgrade.queue
@@ -6,7 +6,7 @@
 # instalirao.  To se mozda odnosi na ntp-cn, pa je za svaki slucaj dodan.
 true                           debconf_priority reset
 true                           add_group_proc          # + restart oidentd ako treba
-pkg x11-common                 remove_x
+pkg xserver-xorg               remove_x
 true                           install_new
 pkg kernel-2.6-cn              dpkg-reconfigure kernel-2.6-cn
 # ovo bi trebalo biti predzadnje na popisu

diff --git a/src/functions.sh b/src/functions.sh
index f5a0859..deffe51 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -147,7 +147,7 @@ remove_x() {
   LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$msg_remove_x" 18 75
   if [ $? -eq 0 ]; then
     log "Removing X Window System"
-    pkgrm x11-common
+    pkgrm xserver-xorg
   else
     log "Skipping X Window System removal"
   fi