r994 - in /trunk/packages/vim-scripts/debian: changelog patches/00list patches/git-defaults.dpatch

[zack at users.alioth.debian.org]

Author: zack
Date: Sun Jul 22 17:10:51 2007
New Revision: 994

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=994
Log:
  - add git-defaults, provides a default for g:git_diff_spawn_mode to avoid
    git ftplugin complain, patch from Martin Krafft (Closes: #430105)

Added:
    trunk/packages/vim-scripts/debian/patches/git-defaults.dpatch   (with props)
Modified:
    trunk/packages/vim-scripts/debian/changelog
    trunk/packages/vim-scripts/debian/patches/00list

Modified: trunk/packages/vim-scripts/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/changelog?rev=994&op=diff
==============================================================================
--- trunk/packages/vim-scripts/debian/changelog (original)
+++ trunk/packages/vim-scripts/debian/changelog Sun Jul 22 17:10:51 2007
@@ -8,8 +8,10 @@
       avoid dangerous characters like commas (Closes: #431820)
   * debian/patches/
     - add disabledby-supertab, enables blacklisting of supertab
-
- -- Stefano Zacchiroli <zack at debian.org>  Sun, 22 Jul 2007 18:50:05 +0200
+    - add git-defaults, provides a default for g:git_diff_spawn_mode to avoid
+      git ftplugin complain, patch from Martin Krafft (Closes: #430105)
+
+ -- Stefano Zacchiroli <zack at debian.org>  Sun, 22 Jul 2007 19:08:01 +0200
 
 vim-scripts (7.1.2) unstable; urgency=low
 

Modified: trunk/packages/vim-scripts/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/patches/00list?rev=994&op=diff
==============================================================================
--- trunk/packages/vim-scripts/debian/patches/00list (original)
+++ trunk/packages/vim-scripts/debian/patches/00list Sun Jul 22 17:10:51 2007
@@ -9,6 +9,7 @@
 disabledby-themes
 disabledby-whatdomain
 disabledby-xml
+git-defaults
 sokoboan_path
 usagestring-dtd2vim
 vimplate_debian-path

Added: trunk/packages/vim-scripts/debian/patches/git-defaults.dpatch
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-scripts/debian/patches/git-defaults.dpatch?rev=994&op=file
==============================================================================
--- trunk/packages/vim-scripts/debian/patches/git-defaults.dpatch (added)
+++ trunk/packages/vim-scripts/debian/patches/git-defaults.dpatch Sun Jul 22 17:10:51 2007
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## git-defaults.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: provide a default value for g:git_diff_spawn_mode
+
+ at DPATCH@
+diff -urNad vim-scripts~/ftplugin/git.vim vim-scripts/ftplugin/git.vim
+--- vim-scripts~/ftplugin/git.vim	2007-06-21 17:28:39.000000000 +0200
++++ vim-scripts/ftplugin/git.vim	2007-07-22 19:07:28.000000000 +0200
+@@ -4,6 +4,10 @@
+ 
+ let b:did_ftplugin = 1
+ 
++if !exists("g:git_diff_spawn_mode")
++  let g:git_diff_spawn_mode = 2
++endif
++
+ setlocal tw=74
+ setlocal nowarn nowb
+ 

Propchange: trunk/packages/vim-scripts/debian/patches/git-defaults.dpatch
------------------------------------------------------------------------------
    svn:executable = *