X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=deffe518a79456866117fc0b8dbbed5dbb0174a7;hb=c114b9878b474e560c7b8bc0d4d91d68bf5e5fe1;hp=83fc87d6a0c3a456c8dd0d673bf7361a3cf24af0;hpb=1e7fccdeae88ff8dd143dd1c38083f8c5fcce67b;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index 83fc87d..deffe51 100644
--- 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
@@ -787,14 +787,14 @@ apt_listchanges () {
       case $command in
            disable)
                if [ -f $file ]; then
-                   dpkg-divert --local --rename --divert $file.$backup_ext \
+                   dpkg-divert --local --rename --divert $file.disabled \
                                --add $file || true
                fi
                ;;
 
            enable)
-               if [ -f $file.$backup_ext ]; then
-                   dpkg-divert --remove $file || true
+               if [ -f $file.disabled ]; then
+                   dpkg-divert --rename --remove $file || true
                fi
                ;;
      esac