3 files changed, 14 insertions, 126 deletions
diff --git a/source/ap/vim/gvim.desktop b/source/ap/vim/gvim.desktop
deleted file mode 100644
index 60a71d15f..000000000
--- a/source/ap/vim/gvim.desktop
+++ /dev/null
@@ -1,119 +0,0 @@
-[Desktop Entry]
-Name=Vi IMproved
-Name[af]=Vi Verbeterde
-Name[ar]=في.أي المحسن
-Name[bn]=ভি-আই উন্নত
-Name[br]=Vi gwellaet
-Name[ca]=Vi millorat
-Name[cy]=VIM (Vi wedi'i wella)
-Name[da]=Vi IMproved (Vi forbedret)
-Name[eo]=VIM
-Name[fa]=Vi پیشرفت کرده VIM
-Name[hi]=वीआई इम्प्रूव्ड
-Name[hu]=VIM
-Name[is]=Vi endurbættur (vim)
-Name[it]=Vi iMproved
-Name[ko]=더 나은 Vi
-Name[mn]=Сайжирсан Vi
-Name[nso]=KAonafaditswe ka Vi
-Name[oc]=VI aMillorat
-Name[pl]=Poprawiony VI (vim)
-Name[pt_BR]=Vi melhorado
-Name[ru]=Улучшенный vi
-Name[rw]=Vi Ivuguruwe
-Name[sl]=Izboljšani vi (vim)
-Name[sv]=Förbättrad Vi
-Name[ta]=Vi மேம்படுத்தப்பட்ட
-Name[tg]=Vi пешрафт кардаи VIM
-Name[th]=VI IMprove
-Name[uz]=Яхшиланган Vi
-Name[ven]=Vi Khwinifhadzhwa
-Name[vi]=Vi Cải tiến
-Name[wa]=VIM
-Name[zh_CN]=改进的 VI (VIM)
-Name[zh_TW]=VIM
-Name[zu]=I-Vi yenziwe ngcono
-GenericName=Text Editor
-GenericName[af]=Teks Redigeerder
-GenericName[ar]=محرر نصوص
-GenericName[az]=Mətn Editoru
-GenericName[be]=Тэкставы рэдактар
-GenericName[bg]=Текстов редактор
-GenericName[bn]=টেক্সট সম্পাদক
-GenericName[br]=Aozer skrid
-GenericName[bs]=Tekst editor
-GenericName[ca]=Editor de text
-GenericName[cs]=Textový editor
-GenericName[cy]=Golygydd Testun
-GenericName[da]= Teksteditor
-GenericName[de]=Texteditor
-GenericName[el]=Επεξεργαστής κειμένου
-GenericName[eo]=Tekstredaktilo
-GenericName[es]=Editor de texto
-GenericName[et]=Tekstiredaktor
-GenericName[eu]=Testu editorea
-GenericName[fa]=ویرایشگر متن
-GenericName[fi]=Tekstieditori
-GenericName[fo]=Tekstritil
-GenericName[fr]=Éditeur de texte
-GenericName[fy]=Tekst Bewurker
-GenericName[ga]=Eagarthóir Téacs
-GenericName[gl]=Editor de Textos
-GenericName[he]=עורך טקסט
-GenericName[hi]=पाठ संपादक
-GenericName[hr]=Uređivač teksta
-GenericName[hsb]=Wobdźěłar tekstow
-GenericName[hu]=Szövegszerkesztő
-GenericName[is]=Textaritill
-GenericName[it]=Editor di testi
-GenericName[ja]=テキストエディタ
-GenericName[km]=កម្មវិធីវាយអត្ថបទ
-GenericName[ko]=글월 편집기
-GenericName[lo]=ເຄື່ອງມືແກ້ໄຂຂໍ້ຄວາມ
-GenericName[lt]=Teksto rengyklė
-GenericName[lv]=Teksta Redaktors
-GenericName[mk]=Уредувач на текст
-GenericName[mn]=Текст боловсруулагч
-GenericName[ms]=Penyunting Teks
-GenericName[mt]=Editur tat-test
-GenericName[nb]=Skriveprogram
-GenericName[nds]=Texteditor
-GenericName[nl]=Teksteditor
-GenericName[nn]=Skriveprogram
-GenericName[nso]=Mofetosi wa Sengwalwana
-GenericName[pa]=ਪਾਠ ਸੰਪਾਦਕ
-GenericName[pl]=Edytor tekstu
-GenericName[pt]=Editor de Texto
-GenericName[pt_BR]=Editor de Texto
-GenericName[ro]=Editor de text
-GenericName[ru]=Текстовый редактор
-GenericName[rw]=Muhinduzi Umwandiko
-GenericName[se]=Čállinprográmma
-GenericName[sk]=Textový editor
-GenericName[sl]=Urejevalnik besedil
-GenericName[sr]=Уређивач текста
-GenericName[sr@Latn]=Uređivač teksta
-GenericName[ss]=Sihleli sembhalo
-GenericName[sv]=Texteditor
-GenericName[ta]=உரை தொகுப்பாளர்
-GenericName[tg]=Муҳаррири матн
-GenericName[th]=โปรแกรมแก้ไขข้อความ
-GenericName[tr]=Metin Düzenleyici
-GenericName[tt]=Mäten Tözätkeçe
-GenericName[uk]=Редактор текстів
-GenericName[uz]=Матн таҳрирчи
-GenericName[ven]=Musengulusi wa Manwalwa
-GenericName[vi]=Trình soạn văn bản
-GenericName[wa]=Aspougneu di tecse
-GenericName[xh]=Umhleli Wombhalo
-GenericName[zh_CN]=文本编辑器
-GenericName[zh_TW]=文字編輯器
-GenericName[zu]=Umlungisi wombhalo
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=gvim -f %f
-Icon=gvim
-Type=Application
-Terminal=false
-X-KDE-StartupNotify=true
-X-KDE-AuthorizeAction=shell_access
-Categories=Utility;TextEditor;
diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild
index f990bdfad..8fdffc863 100755
--- a/source/ap/vim/vim-gvim.SlackBuild
+++ b/source/ap/vim/vim-gvim.SlackBuild
@@ -191,13 +191,8 @@ rm -r $PKG/vim/install
 # Finally, reference purge:
 rm -rf $PKG/vim
 
-# Perhaps we would be better off without this - forcing folks to run kappfinder
-# or something.  It seems better than starting with nothing, but might force
-# people into defaults they don't want.  Another nifty catch-22...
-mkdir -p $PKG/usr/share/applications
-cp -a $CWD/gvim.desktop $PKG/usr/share/applications
-mkdir -p $PKG/usr/share/pixmaps
-cp -a $CWD/gvim.png $PKG/usr/share/pixmaps
+# Get rid of the terminal-based vim.desktop file:
+rm -f $PKG/usr/share/applications/vim.desktop
 
 # Remove empty directories:
 find $PKG -type d -exec rmdir -p {} \; 2> /dev/null
diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild
index f9a579015..b6b712bdb 100755
--- a/source/ap/vim/vim.SlackBuild
+++ b/source/ap/vim/vim.SlackBuild
@@ -156,6 +156,18 @@ zcat $CWD/vim.vimrc.diff.gz | patch -p1 --verbose || exit 1
 # Add patched vimrc to the package:
 cat runtime/vimrc.new > $PKG/usr/share/vim/vimrc.new
 
+# Don't package gvim.desktop - it will be included in the vim-gvim package:
+rm -f $PKG/usr/share/applications/gvim.desktop
+
+# Move the vim.desktop into the docs directory. There's really not much use
+# for this .desktop file. It's easy enough to just open a terminal and run
+# vim in it without this.
+mkdir -p $PKG/usr/doc/vim-$VERSION
+mv $PKG/usr/share/applications/vim.desktop $PKG/usr/doc/vim-$VERSION
+
+# Remove empty directory:
+rmdir $PKG/usr/share/applications
+
 # Fix manpage symlinks:
 if [ -d $PKG/usr/man ]; then
   ( cd $PKG/usr/man