r190 - in trunk/vim/debian: . patches

Author: zack
Date: 2005-04-27 22:07:56 +0000 (Wed, 27 Apr 2005)
New Revision: 190

Modified:
   trunk/vim/debian/changelog
   trunk/vim/debian/patches/118_ocaml.vim.diff
   trunk/vim/debian/rules
   trunk/vim/debian/vim-variant.desktop
Log:
- fixed debian/rules bug which inhibit .desktop file installation
- minor changes (see debian/changelog)


Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog  2005-04-27 20:55:43 UTC (rev 189)
+++ trunk/vim/debian/changelog  2005-04-27 22:07:56 UTC (rev 190)
@@ -1,9 +1,19 @@
 vim (1:6.3-071+2) UNRELEASED; urgency=low
 
-  * DUMMY ENTRY
+  XXX REMOVE ME XXX Zack: changed changelog author to pkg-vim, is it ok?
 
- -- Norbert Tretkowski <nobse@xxxxxxxxxx>  Mon, 25 Apr 2005 00:12:17 +0200
+  * Stefano Zacchiroli <zack@xxxxxxxxxx>:
+    + Modifications on debian/rules:
+      - Do not invoke dh_installdirs before creating .dirs file for current
+        variant (fixes non-installation of gvim.desktop in all variants).
+      - Optional cmdline parameter PATCH_NAME for make_patch target.
+    + Modifications on debian/vim-variant.desktop
+      - Internationalized comment (inspired from gedit's one)
+      - Added MimeType entry
+    + Updated patch 118_ocaml.vim.diff (new upstream).
 
+ -- Debian VIM Maintainers <pkg-vim-maintainers@xxxxxxxxxxxxxxxxxxxxxxx>  Mon, 
25 Apr 2005 00:12:17 +0200
+
 vim (1:6.3-071+1) unstable; urgency=medium
 
   * New upstream patches (069 to 071), see README.gz for details.

Modified: trunk/vim/debian/patches/118_ocaml.vim.diff
===================================================================
--- trunk/vim/debian/patches/118_ocaml.vim.diff 2005-04-27 20:55:43 UTC (rev 
189)
+++ trunk/vim/debian/patches/118_ocaml.vim.diff 2005-04-27 22:07:56 UTC (rev 
190)
@@ -1,7 +1,7 @@
 diff -urN vim63/runtime/ftplugin/ocaml.vim vim63.new/runtime/ftplugin/ocaml.vim
 --- vim63/runtime/ftplugin/ocaml.vim   2003-05-11 21:09:36.000000000 +0200
-+++ vim63.new/runtime/ftplugin/ocaml.vim       2005-04-23 23:36:04.000000000 
+0200
-@@ -1,36 +1,64 @@
++++ vim63.new/runtime/ftplugin/ocaml.vim       2005-04-27 23:27:13.000000000 
+0200
+@@ -1,36 +1,62 @@
 -" Vim settings file
 -" Language:     OCaml
 -" Maintainers:  Mike Leary    <leary@xxxxxxxxxx>
@@ -17,7 +17,7 @@
 +"              Markus Mottl        <markus.mottl@xxxxxxxxx>
 +"              Stefano Zacchiroli  <zack@xxxxxxxxxx>
 +" URL:         http://www.ocaml.info/vim/ftplugin/ocaml.vim
-+" Last Change: 2005 March 25 + debian patch for efm (see below)
++" Last Change: 2005 Apr 26 - improved errorformat (SZ)
 +" Changelog:
 +"         0.12 - Modeline support
 +"              - Folding now works also when indent_struct != 2
@@ -80,10 +80,8 @@
 +      \%-Zmake%.%#,
 +      \%C%m,
 +      \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
-+      \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
-+      \%DMaking\ %*\\a\ in\ %f
-+" Last 3 lines added by Zack to the debian vim package, enable vim to follows
-+" directory changes perfomed by make. Not yet integrated upstream.
++       \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
++       \%DMaking\ %*\\a\ in\ %f
  
  " Add mappings, unless the user didn't want this.
  if !exists("no_plugin_maps") && !exists("no_ocaml_maps")
@@ -92,10 +90,14 @@
    if !hasmapto('<Plug>Comment')
      nmap <buffer> <LocalLeader>c <Plug>LUncomOn
      vmap <buffer> <LocalLeader>c <Plug>BUncomOn
-@@ -47,3 +75,338 @@
-     iabbrev <buffer> ASS (assert false)
-   endif
- endif
+@@ -44,6 +70,341 @@
+   vnoremap <buffer> <Plug>BUncomOff <ESC>:'<,'><CR>`<dd`>dd`<
+ 
+   if !hasmapto('<Plug>Abbrev')
+-    iabbrev <buffer> ASS (assert false)
++    iabbrev <buffer> ASS (assert false (* XXX *))
++  endif
++endif
 +
 +" Let % jump between structure elements (due to Issac Trotts)
 +let b:mw='\<let\>:\<and\>:\(\<in\>\|;;\),'
@@ -212,7 +214,7 @@
 +  " Comments around folds aren't merged to them.
 +  if synIDattr(synID(a:l, indent(a:l)+1, 0), "name") == "ocamlComment"
 +    return -1
-+  endif
+   endif
 +
 +  return '='
 +endfunction
@@ -254,7 +256,7 @@
 +
 +if !has("python")
 +  finish
-+endif
+ endif
 +
 +python << EOF
 +
@@ -433,7 +435,7 @@
 +vmap <LocalLeader>t :call OCamlPrintType("visual")<RETURN>
 diff -urN vim63/runtime/indent/ocaml.vim vim63.new/runtime/indent/ocaml.vim
 --- vim63/runtime/indent/ocaml.vim     2003-04-14 21:03:07.000000000 +0200
-+++ vim63.new/runtime/indent/ocaml.vim 2005-04-23 23:32:56.000000000 +0200
++++ vim63.new/runtime/indent/ocaml.vim 2005-04-27 23:26:08.000000000 +0200
 @@ -1,12 +1,12 @@
  " Vim indent file
 -" Language:   OCaml
@@ -715,7 +717,7 @@
  
 diff -urN vim63/runtime/syntax/ocaml.vim vim63.new/runtime/syntax/ocaml.vim
 --- vim63/runtime/syntax/ocaml.vim     2003-05-04 23:12:48.000000000 +0200
-+++ vim63.new/runtime/syntax/ocaml.vim 2005-04-23 23:32:56.000000000 +0200
++++ vim63.new/runtime/syntax/ocaml.vim 2005-04-27 23:26:08.000000000 +0200
 @@ -1,19 +1,23 @@
  " Vim syntax file
  " Language:     OCaml

Modified: trunk/vim/debian/rules
===================================================================
--- trunk/vim/debian/rules      2005-04-27 20:55:43 UTC (rev 189)
+++ trunk/vim/debian/rules      2005-04-27 22:07:56 UTC (rev 190)
@@ -136,11 +136,12 @@
 SOURCES+=$(NAME)-$(VERSION)-extra.tar.gz
 SRCDIR=$(NAME)$(subst .,,$(VERSION))
 
+PATCH_NAME=new
 make_patch: extract
        mv $(SRCDIR) $(SRCDIR).new
        rm -f extract-stamp*
        ./debian/rules extract
-       - diff -urN $(SRCDIR) $(SRCDIR).new > new.diff
+       - diff -urN $(SRCDIR) $(SRCDIR).new > $(PATCH_NAME).diff
        rm -rf $(SRCDIR)
        mv $(SRCDIR).new $(SRCDIR)
 
@@ -264,16 +265,16 @@
        dh_testdir
        dh_testroot
        dh_clean -k
-       dh_installdirs
        for x in preinst postinst postrm menu mime install dirs ; do \
          sed -e s/@PKG@/$*/ debian/vim-variant.$$x >debian/$*.$$x ;\
-       done ;\
+       done
+       dh_installdirs
        if [ "$(*)" != "vim-tiny" ] ; then \
          for x in links ; do \
            sed -e s/@PKG@/$*/ debian/vim-variant.$$x >debian/$*.$$x ;\
          done ;\
        fi
-       cp debian/vim-variant.desktop 
$(DESTDIR)/usr/share/applications/gvim.desktop ;\
+       cp debian/vim-variant.desktop 
$(DESTDIR)/usr/share/applications/gvim.desktop
        sed -e s/@PKG@/$*/ debian/lintian/vim-variant >debian/lintian/$*
        $(INSTALL) -D $(SRCDIR)/src/$(*) $(DESTDIR)/usr/bin/vim
 # add manpages

Modified: trunk/vim/debian/vim-variant.desktop
===================================================================
--- trunk/vim/debian/vim-variant.desktop        2005-04-27 20:55:43 UTC (rev 
189)
+++ trunk/vim/debian/vim-variant.desktop        2005-04-27 22:07:56 UTC (rev 
190)
@@ -1,10 +1,78 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Vim
-Comment=Vim Text Editor
+Name=GVim Text Editor
+Comment=Edit text files
+Comment[af]=Redigeer tekslêers
+Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
+Comment[ar]=حرّر ملفات نصية
+Comment[az]=Mətn fayllarını redaktə edin
+Comment[be]=Рэдагаваньне тэкставых файлаў
+Comment[bg]=Редактиране на текстови файлове
+Comment[bn]=টেক্স্ট ফাইল এডিট করুন
+Comment[bs]=Izmijeni tekstualne datoteke
+Comment[ca]=Edita fitxers de text
+Comment[cs]=Úprava textových souborů
+Comment[cy]=Golygu ffeiliau testun
+Comment[da]=Redigér tekstfiler
+Comment[de]=Textdateien bearbeiten
+Comment[el]=Επεξεργασία αρχείων κειμένου
+Comment[en_CA]=Edit text files
+Comment[en_GB]=Edit text files
+Comment[es]=Edita archivos de texto
+Comment[et]=Redigeeri tekstifaile
+Comment[eu]=Editatu testu-fitxategiak
+Comment[fa]=ویرایش پرونده‌های متنی
+Comment[fi]=Muokkaa tekstitiedostoja
+Comment[fr]=Édite des fichiers texte
+Comment[ga]=Eagar comhad Téacs
+Comment[gu]=લખાણ ફાઇલોમાં ફેરફાર કરો
+Comment[he]=ערוך קבצי טקסט
+Comment[hi]=पाठ फ़ाइलें संपादित करें
+Comment[hr]=Uređivanje tekstualne datoteke
+Comment[hu]=Szövegfájlok szerkesztése
+Comment[id]=Edit file teks
+Comment[it]=Modifica file di testo
+Comment[ja]=テキスト・ファイルを編集します
+Comment[kn]=ಪಠ್ಯ ಕಡತಗಳನ್ನು ಸಂಪಾದಿಸು
+Comment[ko]=텍스트 파일을 편집합니다
+Comment[lt]=Redaguoti tekstines bylas
+Comment[lv]=Rediģēt teksta failus
+Comment[mk]=Уреди текстуални фајлови
+Comment[ml]=വാചക രചനകള് തിരുത്തുക
+Comment[mn]=Текст файл боловсруулах
+Comment[mr]=गद्य फाइल संपादित करा
+Comment[ms]=Edit fail teks
+Comment[nb]=Rediger tekstfiler
+Comment[ne]=पाठ फाइललाई संशोधन गर्नुहोस्
+Comment[nl]=Tekstbestanden bewerken
+Comment[nn]=Rediger tekstfiler
+Comment[no]=Rediger tekstfiler
+Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
+Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ
+Comment[pl]=Edytor plików tekstowych
+Comment[pt]=Editar ficheiros de texto
+Comment[pt_BR]=Edite arquivos de texto
+Comment[ro]=Editare fişiere text
+Comment[ru]=Редактор текстовых файлов
+Comment[sk]=Úprava textových súborov
+Comment[sl]=Urejanje datotek z besedili
+Comment[sq]=Përpuno files teksti
+Comment[sr]=Измени текстуалне датотеке
+Comment[sr@Latn]=Izmeni tekstualne datoteke
+Comment[sv]=Redigera textfiler
+Comment[ta]=உரை கோப்புகளை தொகுக்கவும்
+Comment[th]=แก้ไขแฟ้มข้อความ
+Comment[tk]=Metin faýllary editle
+Comment[tr]=Metin dosyalarını düzenle
+Comment[uk]=Редактор текстових файлів
+Comment[vi]=Soạn thảo tập tin văn bản
+Comment[wa]=Asspougnî des fitchîs tecses
+Comment[zh_CN]=编辑文本文件
+Comment[zh_TW]=編輯文字檔
 Exec=gvim %U
-Icon=gvim.png
 Terminal=false
 Type=Application
+Icon=gvim.png
 Categories=Application;Utility;TextEditor;
 StartupNotify=true
+MimeType=text/plain;