r1153 - in /trunk/packages/vim: debian/changelog patches/filetype.vim-udev.d.diff patches/pushed-upstream.txt patches/series

[jamessan at users.alioth.debian.org]

Author: jamessan
Date: Tue Jan 15 06:48:36 2008
New Revision: 1153

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1153
Log:
Add patches/filetype.vim-udev.d.diff to properly set the filetype for /etc/udev.d/*.rules files.
Update the list of patches and how they've been handled.

Added:
    trunk/packages/vim/patches/filetype.vim-udev.d.diff
Modified:
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/patches/pushed-upstream.txt
    trunk/packages/vim/patches/series

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1153&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue Jan 15 06:48:36 2008
@@ -16,14 +16,18 @@
     to allow newlines as part of the whitespace.  (Closes: #460074)
   * runtime/syntax/debcontrol.vim: Add s390x, sh3, sh3eb, sh4, sh4eb to the
     list of recognized architectures.  (Closes: #455993)
-  * patches/tex.vim-syntax_additions.diff:
-    - Disable spell checking for verbatim sections.  (Closes: #445295)
-  * patches/netrwPlugin.vim-bwipe.diff:
-    - Call bwipe when opening file:// URLs to remove the extra buffers that
-      get created.  Their creation is inevitable but this will clean up the
-      buffer list.  (Closes: #370082)
-
- -- James Vega <jamessan at debian.org>  Tue, 15 Jan 2008 00:03:10 -0500
+  * Added patches:
+    - patches/tex.vim-syntax_additions.diff:
+      + Disable spell checking for verbatim sections.  (Closes: #445295)
+    - patches/netrwPlugin.vim-bwipe.diff:
+      + Call bwipe when opening file:// URLs to remove the extra buffers that
+        get created.  Their creation is inevitable but this will clean up the
+        buffer list.  (Closes: #370082)
+    - patches/filetype.vim-udev.d.diff:
+      + Detect /etc/udev.d/*.rules files as 'udevrules' instead of 'hog'
+        filetype.  (Closes: #437434)
+
+ -- James Vega <jamessan at debian.org>  Tue, 15 Jan 2008 01:43:03 -0500
 
 vim (1:7.1-175+2) unstable; urgency=low
 

Added: trunk/packages/vim/patches/filetype.vim-udev.d.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/filetype.vim-udev.d.diff?rev=1153&op=file
==============================================================================
--- trunk/packages/vim/patches/filetype.vim-udev.d.diff (added)
+++ trunk/packages/vim/patches/filetype.vim-udev.d.diff Tue Jan 15 06:48:36 2008
@@ -1,0 +1,15 @@
+Index: vim/runtime/filetype.vim
+===================================================================
+--- vim/runtime/filetype.vim.orig
++++ vim/runtime/filetype.vim
+@@ -1715,6 +1715,10 @@
+ 
+ let s:ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*'
+ func! s:FTRules()
++  if expand('<amatch>:p') =~ '^/etc/udev.d'
++    setf udevrules
++    return
++  endif
+   try
+     let config_lines = readfile('/etc/udev/udev.conf')
+   catch /^Vim\%((\a\+)\)\=:E484/

Modified: trunk/packages/vim/patches/pushed-upstream.txt
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/pushed-upstream.txt?rev=1153&op=diff
==============================================================================
--- trunk/packages/vim/patches/pushed-upstream.txt (original)
+++ trunk/packages/vim/patches/pushed-upstream.txt Tue Jan 15 06:48:36 2008
@@ -4,6 +4,7 @@
 gnuada.diff
 sh.vim_syntax.diff
 changelog.vim-date_end_entry.diff
+netrwPlugin.vim-bwipe.diff
 
 Patches pushed upstream:
 index.txt.diff
@@ -14,3 +15,4 @@
 filetype.vim-better_tex_vs_plaintex.diff
 Makefile_no-strip.diff
 spell.c_getc-eof.diff
+configure-tcl_detection.diff

Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=1153&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Tue Jan 15 06:48:36 2008
@@ -30,3 +30,4 @@
 spellfile.vim-doc.diff -p0
 configure-tcl_detection.diff -p0
 netrwPlugin.vim-bwipe.diff -p0
+filetype.vim-udev.d.diff -p0