From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Mon, 13 Jul 2009 09:02:29 +0000 (+0200)
Subject: Remove x11-common to delete X.
X-Git-Tag: debian/5.0.2~1
X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=commitdiff_plain;h=61698b049bc7c3d64c7eaf91aca46df22583e61a;p=carnet-upgrade.git

Remove x11-common to delete X.
---

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 11160b0..572eb9a 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -5,7 +5,7 @@ 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
diff --git a/src/actions/post_upgrade.queue b/src/actions/post_upgrade.queue
index 695ea4e..1e22860 100644
--- a/src/actions/post_upgrade.queue
+++ b/src/actions/post_upgrade.queue
@@ -6,6 +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
 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 ecac67b..09b5479 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -157,7 +157,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 xlibs
+    pkgrm x11-common
   else
     log "Skipping X Window System removal"
   fi