[SCM] vim-scripts packaging branch, master, updated. 94d6931b39bc216e79e1673187150bfec7383e86
James Vega
jamessan at debian.org
Wed Sep 2 03:33:46 UTC 2009
The following commit has been merged in the master branch:
commit 55e7cee661113349d951ad834fa2357b44354666
Author: James Vega <jamessan at debian.org>
Date: Tue Sep 1 20:01:26 2009 -0400
Switch from dpatch to quilt.
diff --git a/debian/changelog b/debian/changelog
index 4f1f811..780db4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
vim-scripts (20090211-2) UNRELEASED; urgency=low
* debian/control: Change Vcs-* fields to point at git repo.
+ * Switch from dpatch to quilt.
-- James Vega <jamessan at debian.org> Mon, 31 Aug 2009 18:14:35 -0400
diff --git a/debian/control b/debian/control
index 9436c24..bad9206 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: editors
Priority: optional
Maintainer: Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
Uploaders: Michael Piefel <piefel at debian.org>, James Vega <jamessan at debian.org>
-Build-Depends: cdbs, debhelper (>> 5.0.0), dpatch
+Build-Depends: cdbs, debhelper (>> 5.0.0), quilt
Build-Depends-Indep: xsltproc, docbook-xsl
Standards-Version: 3.8.2
Homepage: http://www.vim.org/scripts/
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 4edf18b..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,21 +0,0 @@
-disabledby-calendar
-disabledby-closetag
-disabledby-cvsmenu
-disabledby-info
-disabledby-omnicppcomplete
-disabledby-po
-disabledby-securemodelines
-disabledby-supertab
-disabledby-tetris
-disabledby-color_sample_pack
-disabledby-whatdomain
-disabledby-xml
-git-defaults
-sokoboan_path
-usagestring-dtd2vim
-vimplate_debian-path
-detectindent_fix
-lbdbq-inputlist
-closetag-sanity
-lbdbq-query
-lbdbq-detect-lbdbq
diff --git a/debian/patches/closetag-sanity.dpatch b/debian/patches/closetag-sanity.diff
old mode 100755
new mode 100644
similarity index 76%
rename from debian/patches/closetag-sanity.dpatch
rename to debian/patches/closetag-sanity.diff
index 3baafe7..6d3636e
--- a/debian/patches/closetag-sanity.dpatch
+++ b/debian/patches/closetag-sanity.diff
@@ -1,13 +1,11 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## closetag-sanity.dpatch by James Vega <jamessan at debian.org>
+## closetag-sanity.diff by James Vega <jamessan at debian.org>
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Ensure b:unaryTagsStack is defined whenever GetCloseTag is called.
+## Ensure b:unaryTagsStack is defined whenever GetCloseTag is called.
- at DPATCH@
-diff -urNad vim-scripts~/macros/closetag.vim vim-scripts/macros/closetag.vim
---- vim-scripts~/macros/closetag.vim 2008-07-04 21:24:42.000000000 -0400
-+++ vim-scripts/macros/closetag.vim 2008-07-04 20:08:23.000000000 -0400
+Index: vim-scripts/macros/closetag.vim
+===================================================================
+--- vim-scripts.orig/macros/closetag.vim
++++ vim-scripts/macros/closetag.vim
@@ -127,16 +127,6 @@
endif
let loaded_closetag=1
diff --git a/debian/patches/detectindent_fix.dpatch b/debian/patches/detectindent_fix.diff
similarity index 72%
rename from debian/patches/detectindent_fix.dpatch
rename to debian/patches/detectindent_fix.diff
index ca54024..261ffb3 100644
--- a/debian/patches/detectindent_fix.dpatch
+++ b/debian/patches/detectindent_fix.diff
@@ -1,13 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## detectindent_fix.dpatch by Antonio Terceiro <terceiro at softwarelivre.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## detectindent_fix.diff by Antonio Terceiro <terceiro at softwarelivre.org>
- at DPATCH@
-diff -urNad vim-scripts.svn~/plugin/detectindent.vim vim-scripts.svn/plugin/detectindent.vim
---- vim-scripts.svn~/plugin/detectindent.vim 2008-03-20 19:12:27.000000000 -0300
-+++ vim-scripts.svn/plugin/detectindent.vim 2008-03-30 18:34:28.677760572 -0300
+Index: vim-scripts/plugin/detectindent.vim
+===================================================================
+--- vim-scripts.orig/plugin/detectindent.vim
++++ vim-scripts/plugin/detectindent.vim
@@ -86,7 +86,7 @@
if l:has_leading_tabs && ! l:has_leading_spaces
" tabs only, no spaces
diff --git a/debian/patches/disabledby-calendar.diff b/debian/patches/disabledby-calendar.diff
new file mode 100644
index 0000000..4c2fc1b
--- /dev/null
+++ b/debian/patches/disabledby-calendar.diff
@@ -0,0 +1,18 @@
+## disabledby-calendar.diff by Stefano Zacchiroli <zack at debian.org>
+
+Index: vim-scripts/plugin/calendar.vim
+===================================================================
+--- vim-scripts.orig/plugin/calendar.vim
++++ vim-scripts/plugin/calendar.vim
+@@ -303,6 +303,11 @@
+ " :echo calendar_version
+ " GetLatestVimScripts: 52 1 :AutoInstall: calendar.vim
+
++if exists("loaded_calendar")
++ finish
++endif
++let loaded_calendar = 1
++
+ let g:calendar_version = "1.7"
+ if &compatible
+ finish
diff --git a/debian/patches/disabledby-calendar.dpatch b/debian/patches/disabledby-calendar.dpatch
deleted file mode 100755
index c4f663e..0000000
--- a/debian/patches/disabledby-calendar.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disabledby-calendar.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vim-scripts~/plugin/calendar.vim vim-scripts/plugin/calendar.vim
---- vim-scripts~/plugin/calendar.vim
-+++ vim-scripts/plugin/calendar.vim
-@@ -301,6 +301,11 @@
- " :echo calendar_version
- " GetLatestVimScripts: 52 1 :AutoInstall: calendar.vim
-
-+if exists("loaded_calendar")
-+ finish
-+endif
-+let loaded_calendar = 1
-+
- let g:calendar_version = "1.7"
- if &compatible
- finish
diff --git a/debian/patches/disabledby-closetag.dpatch b/debian/patches/disabledby-closetag.diff
old mode 100755
new mode 100644
similarity index 61%
rename from debian/patches/disabledby-closetag.dpatch
rename to debian/patches/disabledby-closetag.diff
index 41837e2..66cbd45
--- a/debian/patches/disabledby-closetag.dpatch
+++ b/debian/patches/disabledby-closetag.diff
@@ -1,13 +1,9 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disabledby-closetag.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## disabledby-closetag.diff by Stefano Zacchiroli <zack at debian.org>
- at DPATCH@
-diff -urNad vim-scripts~/macros/closetag.vim vim-scripts/macros/closetag.vim
---- vim-scripts~/macros/closetag.vim 2007-01-17 16:05:06.000000000 +0100
-+++ vim-scripts/macros/closetag.vim 2007-01-27 09:56:51.000000000 +0100
+Index: vim-scripts/macros/closetag.vim
+===================================================================
+--- vim-scripts.orig/macros/closetag.vim
++++ vim-scripts/macros/closetag.vim
@@ -121,6 +121,12 @@
" User configurable settings
"------------------------------------------------------------------------------
diff --git a/debian/patches/disabledby-color_sample_pack.diff b/debian/patches/disabledby-color_sample_pack.diff
new file mode 100644
index 0000000..3bb516a
--- /dev/null
+++ b/debian/patches/disabledby-color_sample_pack.diff
@@ -0,0 +1,15 @@
+## disabledby-color_sample_pack.diff by Stefano Zacchiroli <zack at debian.org>
+
+Index: vim-scripts/plugin/color_sample_pack.vim
+===================================================================
+--- vim-scripts.orig/plugin/color_sample_pack.vim
++++ vim-scripts/plugin/color_sample_pack.vim
+@@ -1,3 +1,8 @@
++if exists("loaded_color_sample_pack")
++ finish
++endif
++let loaded_color_sample_pack = 1
++
+ " Vim default schemes
+ amenu T&hemes.D&efault.Blue :colo blue<CR>
+ amenu T&hemes.D&efault.DarkBlue :colo darkblue<CR>
diff --git a/debian/patches/disabledby-color_sample_pack.dpatch b/debian/patches/disabledby-color_sample_pack.dpatch
deleted file mode 100755
index f47debf..0000000
--- a/debian/patches/disabledby-color_sample_pack.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disabledby-color_sample_pack.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vim-scripts~/plugin/color_sample_pack.vim vim-scripts/plugin/color_sample_pack.vim
---- vim-scripts~/plugin/color_sample_pack.vim 2007-01-17 16:05:07.000000000 +0100
-+++ vim-scripts/plugin/color_sample_pack.vim 2007-01-27 09:55:17.000000000 +0100
-@@ -1,3 +1,8 @@
-+if exists("loaded_color_sample_pack")
-+ finish
-+endif
-+let loaded_color_sample_pack = 1
-+
- " Vim default schemes
- amenu T&hemes.D&efault.Blue :colo blue<CR>
- amenu T&hemes.D&efault.DarkBlue :colo darkblue<CR>
diff --git a/debian/patches/disabledby-cvsmenu.diff b/debian/patches/disabledby-cvsmenu.diff
new file mode 100644
index 0000000..1928d2e
--- /dev/null
+++ b/debian/patches/disabledby-cvsmenu.diff
@@ -0,0 +1,17 @@
+## disabledby-cvsmenu.diff by Stefano Zacchiroli <zack at debian.org>
+
+Index: vim-scripts/plugin/cvsmenu.vim
+===================================================================
+--- vim-scripts.orig/plugin/cvsmenu.vim
++++ vim-scripts/plugin/cvsmenu.vim
+@@ -14,6 +14,10 @@
+ " TODO: Better support for additional params
+ " TODO: gettag()/getmodule()
+
++if exists("loaded_cvsmenu")
++ finish
++endif
++
+ "#############################################################################
+ " Settings
+ "#############################################################################
diff --git a/debian/patches/disabledby-cvsmenu.dpatch b/debian/patches/disabledby-cvsmenu.dpatch
deleted file mode 100755
index 1555a74..0000000
--- a/debian/patches/disabledby-cvsmenu.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disabledby-cvsmenu.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vim-scripts~/plugin/cvsmenu.vim vim-scripts/plugin/cvsmenu.vim
---- vim-scripts~/plugin/cvsmenu.vim 2007-01-17 16:29:30.000000000 +0100
-+++ vim-scripts/plugin/cvsmenu.vim 2007-01-27 09:42:40.000000000 +0100
-@@ -14,6 +14,10 @@
- " TODO: Better support for additional params
- " TODO: gettag()/getmodule()
-
-+if exists("loaded_cvsmenu")
-+ finish
-+endif
-+
- "#############################################################################
- " Settings
- "#############################################################################
diff --git a/debian/patches/disabledby-info.diff b/debian/patches/disabledby-info.diff
new file mode 100644
index 0000000..a215724
--- /dev/null
+++ b/debian/patches/disabledby-info.diff
@@ -0,0 +1,18 @@
+## disabledby-info.diff by Stefano Zacchiroli <zack at debian.org>
+
+Index: vim-scripts/plugin/info.vim
+===================================================================
+--- vim-scripts.orig/plugin/info.vim
++++ vim-scripts/plugin/info.vim
+@@ -27,6 +27,11 @@
+ "
+ " $Id: info.vim,v 1.7 2002/11/30 21:59:05 rnd Exp $
+
++if exists("loaded_info")
++ finish
++endif
++let loaded_info = 1
++
+ let s:infoCmd = 'info --output=-'
+ if has('win32')
+ let s:infoBufferName = '-Info- '
diff --git a/debian/patches/disabledby-info.dpatch b/debian/patches/disabledby-info.dpatch
deleted file mode 100755
index a4f6e03..0000000
--- a/debian/patches/disabledby-info.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disabledby-info.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vim-scripts~/plugin/info.vim vim-scripts/plugin/info.vim
---- vim-scripts~/plugin/info.vim 2007-01-17 16:05:07.000000000 +0100
-+++ vim-scripts/plugin/info.vim 2007-01-27 09:46:19.000000000 +0100
-@@ -27,6 +27,11 @@
- "
- " $Id: info.vim,v 1.7 2002/11/30 21:59:05 rnd Exp $
-
-+if exists("loaded_info")
-+ finish
-+endif
-+let loaded_info = 1
-+
- let s:infoCmd = 'info --output=-'
- if has('win32')
- let s:infoBufferName = '-Info- '
diff --git a/debian/patches/disabledby-omnicppcomplete.diff b/debian/patches/disabledby-omnicppcomplete.diff
new file mode 100644
index 0000000..c3f1952
--- /dev/null
+++ b/debian/patches/disabledby-omnicppcomplete.diff
@@ -0,0 +1,17 @@
+## disabledby-omnicppcomplete.diff by Stefano Zacchiroli <zack at debian.org>
+
+Index: vim-scripts/autoload/omni/cpp/complete.vim
+===================================================================
+--- vim-scripts.orig/autoload/omni/cpp/complete.vim
++++ vim-scripts/autoload/omni/cpp/complete.vim
+@@ -9,6 +9,10 @@
+ finish
+ endif
+
++if exists("loaded_omnicppcomplete")
++ finish
++endif
++
+ call omni#cpp#settings#Init()
+ let s:OmniCpp_ShowScopeInAbbr = g:OmniCpp_ShowScopeInAbbr
+ let s:OmniCpp_ShowPrototypeInAbbr = g:OmniCpp_ShowPrototypeInAbbr
diff --git a/debian/patches/disabledby-omnicppcomplete.dpatch b/debian/patches/disabledby-omnicppcomplete.dpatch
deleted file mode 100755
index a5026fa..0000000
--- a/debian/patches/disabledby-omnicppcomplete.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disabledby-omnicppcomplete.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vim-scripts~/autoload/omni/cpp/complete.vim vim-scripts/autoload/omni/cpp/complete.vim
---- vim-scripts~/autoload/omni/cpp/complete.vim 2006-06-25 23:03:00.000000000 +0100
-+++ vim-scripts/autoload/omni/cpp/complete.vim 2007-06-21 11:53:31.000000000 +0100
-@@ -9,6 +9,10 @@
- finish
- endif
-
-+if exists("loaded_omnicppcomplete")
-+ finish
-+endif
-+
- call omni#cpp#settings#Init()
- let s:OmniCpp_ShowScopeInAbbr = g:OmniCpp_ShowScopeInAbbr
- let s:OmniCpp_ShowPrototypeInAbbr = g:OmniCpp_ShowPrototypeInAbbr
diff --git a/debian/patches/disabledby-po.diff b/debian/patches/disabledby-po.diff
new file mode 100644
index 0000000..32cbccb
--- /dev/null
+++ b/debian/patches/disabledby-po.diff
@@ -0,0 +1,19 @@
+## disabledby-po.diff by Stefano Zacchiroli <zack at debian.org>
+
+Index: vim-scripts/ftplugin/po.vim
+===================================================================
+--- vim-scripts.orig/ftplugin/po.vim
++++ vim-scripts/ftplugin/po.vim
+@@ -86,10 +86,11 @@
+ " Just delete the bloody file!
+
+ " Only do this when not done yet for this buffer.
+-if exists("b:did_po_mode_ftplugin")
++if exists("b:did_po_mode_ftplugin") || exists("loaded_po_ftplugin")
+ finish
+ endif
+ let b:did_po_mode_ftplugin = 1
++let loaded_po_ftplugin = 1
+
+ setlocal comments=
+ setlocal errorformat=%f:%l:\ %m
diff --git a/debian/patches/disabledby-po.dpatch b/debian/patches/disabledby-po.dpatch
deleted file mode 100755
index 3b2380e..0000000
--- a/debian/patches/disabledby-po.dpatch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disabledby-po.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vim-scripts~/ftplugin/po.vim vim-scripts/ftplugin/po.vim
---- vim-scripts~/ftplugin/po.vim 2007-01-17 16:05:03.000000000 +0100
-+++ vim-scripts/ftplugin/po.vim 2007-01-27 09:50:18.000000000 +0100
-@@ -86,10 +86,11 @@
- " Just delete the bloody file!
-
- " Only do this when not done yet for this buffer.
--if exists("b:did_po_mode_ftplugin")
-+if exists("b:did_po_mode_ftplugin") || exists("loaded_po_ftplugin")
- finish
- endif
- let b:did_po_mode_ftplugin = 1
-+let loaded_po_ftplugin = 1
-
- setlocal comments=
- setlocal errorformat=%f:%l:\ %m
diff --git a/debian/patches/disabledby-pythonindent.dpatch b/debian/patches/disabledby-pythonindent.diff
similarity index 68%
rename from debian/patches/disabledby-pythonindent.dpatch
rename to debian/patches/disabledby-pythonindent.diff
index 890c67b..d9a27e4 100755
--- a/debian/patches/disabledby-pythonindent.dpatch
+++ b/debian/patches/disabledby-pythonindent.diff
@@ -1,10 +1,5 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disabledby-pythonindent.dpatch by James Vega <jamessan at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## disabledby-pythonindent.diff by James Vega <jamessan at debian.org>
- at DPATCH@
diff -urNad vim-scripts-7.1.5~/indent/python.vim vim-scripts-7.1.5/indent/python.vim
--- vim-scripts-7.1.5~/indent/python.vim 2007-12-12 09:15:07.000000000 -0500
+++ vim-scripts-7.1.5/indent/python.vim 2007-12-12 10:37:07.000000000 -0500
diff --git a/debian/patches/disabledby-securemodelines.diff b/debian/patches/disabledby-securemodelines.diff
new file mode 100644
index 0000000..f81c565
--- /dev/null
+++ b/debian/patches/disabledby-securemodelines.diff
@@ -0,0 +1,18 @@
+## disabledby-securemodelines.diff by James Vega <jamessan at debian.org>
+
+Index: vim-scripts/plugin/securemodelines.vim
+===================================================================
+--- vim-scripts.orig/plugin/securemodelines.vim
++++ vim-scripts/plugin/securemodelines.vim
+@@ -11,6 +11,11 @@
+ finish
+ endif
+
++if exists("g:loaded_securemodelines")
++ finish
++endif
++let g:loaded_securemodelines = 1
++
+ if (! exists("g:secure_modelines_allowed_items"))
+ let g:secure_modelines_allowed_items = [
+ \ "textwidth", "tw",
diff --git a/debian/patches/disabledby-securemodelines.dpatch b/debian/patches/disabledby-securemodelines.dpatch
deleted file mode 100755
index d2ae602..0000000
--- a/debian/patches/disabledby-securemodelines.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disabledby-securemodelines.dpatch by James Vega <jamessan at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vim-scripts~/plugin/securemodelines.vim vim-scripts/plugin/securemodelines.vim
---- vim-scripts~/plugin/securemodelines.vim 2008-07-22 19:03:09.000000000 -0400
-+++ vim-scripts/plugin/securemodelines.vim 2008-07-22 19:31:48.000000000 -0400
-@@ -11,6 +11,11 @@
- finish
- endif
-
-+if exists("g:loaded_securemodelines")
-+ finish
-+endif
-+let g:loaded_securemodelines = 1
-+
- if (! exists("g:secure_modelines_allowed_items"))
- let g:secure_modelines_allowed_items = [
- \ "textwidth", "tw",
diff --git a/debian/patches/disabledby-supertab.diff b/debian/patches/disabledby-supertab.diff
new file mode 100644
index 0000000..3522de0
--- /dev/null
+++ b/debian/patches/disabledby-supertab.diff
@@ -0,0 +1,18 @@
+## disabledby-supertab.diff by Stefano Zacchiroli <zack at debian.org>
+
+Index: vim-scripts/plugin/supertab.vim
+===================================================================
+--- vim-scripts.orig/plugin/supertab.vim
++++ vim-scripts/plugin/supertab.vim
+@@ -54,6 +54,11 @@
+ " $ vim -u NONE -U NONE -c "set nocp | runtime plugin/supertab.vim"
+ " }}}
+
++if exists("loaded_supertab")
++ finish
++endif
++let loaded_supertab=1
++
+ if exists('complType') " Integration with other completion functions.
+ finish
+ endif
diff --git a/debian/patches/disabledby-supertab.dpatch b/debian/patches/disabledby-supertab.dpatch
deleted file mode 100755
index 8a6f31b..0000000
--- a/debian/patches/disabledby-supertab.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disabledby-supertab.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vim-scripts~/plugin/supertab.vim vim-scripts/plugin/supertab.vim
---- vim-scripts~/plugin/supertab.vim 2007-11-10 18:33:15.000000000 -0500
-+++ vim-scripts/plugin/supertab.vim 2007-11-13 01:09:31.000000000 -0500
-@@ -54,6 +54,11 @@
- " $ vim -u NONE -U NONE -c "set nocp | runtime plugin/supertab.vim"
- " }}}
-
-+if exists("loaded_supertab")
-+ finish
-+endif
-+let loaded_supertab=1
-+
- if exists('complType') " Integration with other completion functions.
- finish
- endif
diff --git a/debian/patches/disabledby-tetris.diff b/debian/patches/disabledby-tetris.diff
new file mode 100644
index 0000000..871db78
--- /dev/null
+++ b/debian/patches/disabledby-tetris.diff
@@ -0,0 +1,18 @@
+## disabledby-tetris.diff by Stefano Zacchiroli <zack at debian.org>
+
+Index: vim-scripts/plugin/tetris.vim
+===================================================================
+--- vim-scripts.orig/plugin/tetris.vim
++++ vim-scripts/plugin/tetris.vim
+@@ -8,6 +8,11 @@
+ " Dan Sharp Bug reports, improvements
+ " If your name is not here, but should be, drop me a mail
+
++if exists("loaded_tetris")
++ finish
++endif
++let loaded_tetris = 1
++
+ " TODO FocusGained FocusLost Auto calibration during play
+ let s:s='-Tetris_game-'
+ let s:WIDTH=10|let s:NEXTXPOS=16|let s:NEXTYPOS=2
diff --git a/debian/patches/disabledby-tetris.dpatch b/debian/patches/disabledby-tetris.dpatch
deleted file mode 100755
index 2335a3e..0000000
--- a/debian/patches/disabledby-tetris.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disabledby-tetris.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vim-scripts~/plugin/tetris.vim vim-scripts/plugin/tetris.vim
---- vim-scripts~/plugin/tetris.vim 2007-01-17 16:05:04.000000000 +0100
-+++ vim-scripts/plugin/tetris.vim 2007-01-27 09:51:45.000000000 +0100
-@@ -8,6 +8,11 @@
- " Dan Sharp Bug reports, improvements
- " If your name is not here, but should be, drop me a mail
-
-+if exists("loaded_tetris")
-+ finish
-+endif
-+let loaded_tetris = 1
-+
- " TODO FocusGained FocusLost Auto calibration during play
- let s:s='-Tetris_game-'
- let s:WIDTH=10|let s:NEXTXPOS=16|let s:NEXTYPOS=2
diff --git a/debian/patches/disabledby-whatdomain.diff b/debian/patches/disabledby-whatdomain.diff
new file mode 100644
index 0000000..aaeb528
--- /dev/null
+++ b/debian/patches/disabledby-whatdomain.diff
@@ -0,0 +1,18 @@
+## disabledby-whatdomain.diff by Stefano Zacchiroli <zack at debian.org>
+
+Index: vim-scripts/plugin/whatdomain.vim
+===================================================================
+--- vim-scripts.orig/plugin/whatdomain.vim
++++ vim-scripts/plugin/whatdomain.vim
+@@ -3,6 +3,11 @@
+ " Licence: Public Domain
+ " Last Change: 2001 September 19
+
++if exists("loaded_whatdomain")
++ finish
++endif
++let loaded_whatdomain = 1
++
+ " This function returns the meaning of a Top Level Domain
+ " Usage: :call WhatDomain('de') will print 'DE: Germany'
+ function! WhatDomain(...)
diff --git a/debian/patches/disabledby-whatdomain.dpatch b/debian/patches/disabledby-whatdomain.dpatch
deleted file mode 100755
index ee15353..0000000
--- a/debian/patches/disabledby-whatdomain.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disabledby-whatdomain.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vim-scripts~/plugin/whatdomain.vim vim-scripts/plugin/whatdomain.vim
---- vim-scripts~/plugin/whatdomain.vim 2007-01-17 16:05:07.000000000 +0100
-+++ vim-scripts/plugin/whatdomain.vim 2007-01-27 09:28:42.000000000 +0100
-@@ -3,6 +3,11 @@
- " Licence: Public Domain
- " Last Change: 2001 September 19
-
-+if exists("loaded_whatdomain")
-+ finish
-+endif
-+let loaded_whatdomain = 1
-+
- " This function returns the meaning of a Top Level Domain
- " Usage: :call WhatDomain('de') will print 'DE: Germany'
- function! WhatDomain(...)
diff --git a/debian/patches/disabledby-xml.diff b/debian/patches/disabledby-xml.diff
new file mode 100644
index 0000000..a5cb5dd
--- /dev/null
+++ b/debian/patches/disabledby-xml.diff
@@ -0,0 +1,15 @@
+## disabledby-xml.diff by Stefano Zacchiroli <zack at debian.org>
+
+Index: vim-scripts/ftplugin/xml.vim
+===================================================================
+--- vim-scripts.orig/ftplugin/xml.vim
++++ vim-scripts/ftplugin/xml.vim
+@@ -44,7 +44,7 @@
+ "==============================================================================
+
+ " Only do this when not done yet for this buffer
+-if exists("b:did_ftplugin")
++if exists("b:did_ftplugin") || exists("loaded_xml_ftplugin")
+ finish
+ endif
+ " sboles, init these variables so vim doesn't complain on wrap cancel
diff --git a/debian/patches/disabledby-xml.dpatch b/debian/patches/disabledby-xml.dpatch
deleted file mode 100755
index b405d80..0000000
--- a/debian/patches/disabledby-xml.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## disabledby-xml.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vim-scripts~/ftplugin/xml.vim vim-scripts/ftplugin/xml.vim
---- vim-scripts~/ftplugin/xml.vim 2007-01-17 16:05:03.000000000 +0100
-+++ vim-scripts/ftplugin/xml.vim 2007-01-27 09:48:34.000000000 +0100
-@@ -44,7 +44,7 @@
- "==============================================================================
-
- " Only do this when not done yet for this buffer
--if exists("b:did_ftplugin")
-+if exists("b:did_ftplugin") || exists("loaded_xml_ftplugin")
- finish
- endif
- let b:did_ftplugin = 1
diff --git a/debian/patches/git-defaults.diff b/debian/patches/git-defaults.diff
new file mode 100644
index 0000000..8ee92b9
--- /dev/null
+++ b/debian/patches/git-defaults.diff
@@ -0,0 +1,19 @@
+## git-defaults.diff by Stefano Zacchiroli <zack at debian.org>
+##
+## provide a default value for g:git_diff_spawn_mode
+
+Index: vim-scripts/ftplugin/git.vim
+===================================================================
+--- vim-scripts.orig/ftplugin/git.vim
++++ vim-scripts/ftplugin/git.vim
+@@ -32,6 +32,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
+
diff --git a/debian/patches/git-defaults.dpatch b/debian/patches/git-defaults.dpatch
deleted file mode 100755
index 2539cf2..0000000
--- a/debian/patches/git-defaults.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /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
-
diff --git a/debian/patches/lbdbq-detect-lbdbq.dpatch b/debian/patches/lbdbq-detect-lbdbq.diff
old mode 100755
new mode 100644
similarity index 51%
rename from debian/patches/lbdbq-detect-lbdbq.dpatch
rename to debian/patches/lbdbq-detect-lbdbq.diff
index 399563f..c3efd85
--- a/debian/patches/lbdbq-detect-lbdbq.dpatch
+++ b/debian/patches/lbdbq-detect-lbdbq.diff
@@ -1,13 +1,11 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## lbdbq-detect-lbdbq.dpatch by Stefano Zacchiroli <zack at debian.org>
+## lbdbq-detect-lbdbq.diff by Stefano Zacchiroli <zack at debian.org>
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: detect (the absence of) the lbdbq executable
+## detect (the absence of) the lbdbq executable
- at DPATCH@
-diff -urNad vim-scripts~/plugin/lbdbq.vim vim-scripts/plugin/lbdbq.vim
---- vim-scripts~/plugin/lbdbq.vim 2009-02-11 09:34:45.794744601 +0100
-+++ vim-scripts/plugin/lbdbq.vim 2009-02-11 09:35:05.622746011 +0100
+Index: vim-scripts/plugin/lbdbq.vim
+===================================================================
+--- vim-scripts.orig/plugin/lbdbq.vim
++++ vim-scripts/plugin/lbdbq.vim
@@ -14,6 +14,10 @@
" queries lbdb with a query string and return a list of pairs:
" [['full name', 'email'], ['full name', 'email'], ...]
diff --git a/debian/patches/lbdbq-inputlist.dpatch b/debian/patches/lbdbq-inputlist.diff
old mode 100755
new mode 100644
similarity index 70%
rename from debian/patches/lbdbq-inputlist.dpatch
rename to debian/patches/lbdbq-inputlist.diff
index 579c926..0b09733
--- a/debian/patches/lbdbq-inputlist.dpatch
+++ b/debian/patches/lbdbq-inputlist.diff
@@ -1,15 +1,12 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## lbdbq-inputlist.dpatch by James Vega <jamessan at debian.org>
+## lbdbq-inputlist.diff by James Vega <jamessan at debian.org>
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Correct the use of inputlist's results so the user can press Enter to
-## DP: cancel
+## Correct the use of inputlist's results so the user can press Enter to
+## cancel
- at DPATCH@
-Index: plugin/lbdbq.vim
+Index: vim-scripts/plugin/lbdbq.vim
===================================================================
---- a/plugin/lbdbq.vim (revision 1237)
-+++ b/plugin/lbdbq.vim (working copy)
+--- vim-scripts.orig/plugin/lbdbq.vim
++++ vim-scripts/plugin/lbdbq.vim
@@ -47,14 +47,17 @@
if empty(contacts) " no matching (long) contact found
return qstring
diff --git a/debian/patches/lbdbq-query.diff b/debian/patches/lbdbq-query.diff
new file mode 100644
index 0000000..8b7c073
--- /dev/null
+++ b/debian/patches/lbdbq-query.diff
@@ -0,0 +1,19 @@
+## lbdbq-query.diff by James Vega <jamessan at debian.org>
+##
+## Ensure there are enough fields to build the results list.
+
+Index: vim-scripts/plugin/lbdbq.vim
+===================================================================
+--- vim-scripts.orig/plugin/lbdbq.vim
++++ vim-scripts/plugin/lbdbq.vim
+@@ -18,7 +18,9 @@
+ let results = []
+ for line in split(output, "\n")[1:] " skip first line (lbdbq summary)
+ let fields = split(line, "\t")
+- let results += [ [fields[1], fields[0]] ]
++ if len(fields) >= 2
++ let results += [ [fields[1], fields[0]] ]
++ endif
+ endfor
+ return results
+ endfunction
diff --git a/debian/patches/lbdbq-query.dpatch b/debian/patches/lbdbq-query.dpatch
deleted file mode 100755
index 7a3712d..0000000
--- a/debian/patches/lbdbq-query.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## lbdbq-query.dpatch by James Vega <jamessan at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Ensure there are enough fields to build the results list.
-
- at DPATCH@
-diff -urNad vim-scripts~/plugin/lbdbq.vim vim-scripts/plugin/lbdbq.vim
---- vim-scripts~/plugin/lbdbq.vim 2008-07-04 22:17:16.000000000 -0400
-+++ vim-scripts/plugin/lbdbq.vim 2008-07-04 22:18:52.000000000 -0400
-@@ -18,7 +18,9 @@
- let results = []
- for line in split(output, "\n")[1:] " skip first line (lbdbq summary)
- let fields = split(line, "\t")
-- let results += [ [fields[1], fields[0]] ]
-+ if len(fields) >= 2
-+ let results += [ [fields[1], fields[0]] ]
-+ endif
- endfor
- return results
- endfunction
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..cee770e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,21 @@
+disabledby-calendar.diff
+disabledby-closetag.diff
+disabledby-cvsmenu.diff
+disabledby-info.diff
+disabledby-omnicppcomplete.diff
+disabledby-po.diff
+disabledby-securemodelines.diff
+disabledby-supertab.diff
+disabledby-tetris.diff
+disabledby-color_sample_pack.diff
+disabledby-whatdomain.diff
+disabledby-xml.diff
+git-defaults.diff
+sokoboan_path.diff
+usagestring-dtd2vim.diff
+vimplate_debian-path.diff
+detectindent_fix.diff
+lbdbq-inputlist.diff
+closetag-sanity.diff
+lbdbq-query.diff
+lbdbq-detect-lbdbq.diff
diff --git a/debian/patches/sokoboan_path.diff b/debian/patches/sokoboan_path.diff
new file mode 100644
index 0000000..007a348
--- /dev/null
+++ b/debian/patches/sokoboan_path.diff
@@ -0,0 +1,16 @@
+## sokoban_path.diff by <zack at debian.org>
+##
+## set SokobanLevelDirectory so that levels are shared among users
+
+Index: vim-scripts/plugin/sokoban.vim
+===================================================================
+--- vim-scripts.orig/plugin/sokoban.vim
++++ vim-scripts/plugin/sokoban.vim
+@@ -71,6 +71,7 @@
+ finish
+ endif
+ let loaded_VimSokoban = 1
++let g:SokobanLevelDirectory = "/usr/share/vim-scripts/sokoban-levels/"
+
+ " Allow the user to specify the location of the sokoban levels
+ if (!exists("g:SokobanLevelDirectory"))
diff --git a/debian/patches/sokoboan_path.dpatch b/debian/patches/sokoboan_path.dpatch
deleted file mode 100644
index cb92301..0000000
--- a/debian/patches/sokoboan_path.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_sokoban.dpatch by <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: set SokobanLevelDirectory so that levels are shared among users
-
- at DPATCH@
-diff -urNad vim-scripts~/plugin/sokoban.vim vim-scripts/plugin/sokoban.vim
---- vim-scripts~/plugin/sokoban.vim 2005-04-11 23:09:50.000000000 +0200
-+++ vim-script/plugin/sokoban.vim 2005-05-22 10:52:03.996287016 +0200
-@@ -71,6 +71,7 @@
- finish
- endif
- let loaded_VimSokoban = 1
-+let g:SokobanLevelDirectory = "/usr/share/vim-scripts/sokoban-levels/"
-
- " Allow the user to specify the location of the sokoban levels
- if (!exists("g:SokobanLevelDirectory"))
diff --git a/debian/patches/usagestring-dtd2vim.diff b/debian/patches/usagestring-dtd2vim.diff
new file mode 100644
index 0000000..9f2e07e
--- /dev/null
+++ b/debian/patches/usagestring-dtd2vim.diff
@@ -0,0 +1,15 @@
+## usagestring-dtd2vim.diff by Stefano Zacchiroli <zack at debian.org>
+
+Index: vim-scripts/bin/dtd2vim
+===================================================================
+--- vim-scripts.orig/bin/dtd2vim
++++ vim-scripts/bin/dtd2vim
+@@ -76,7 +76,7 @@
+ if ( $#ARGV < 0 ){
+ print "Script generating XML omni completion data file for Vim7\n";
+ print "USAGE:\n";
+- print " dtd2vim.pl <filename> [<dialectname>]\n";
++ print " dtd2vim <filename> [<dialectname>]\n";
+ exit 1;
+ }
+
diff --git a/debian/patches/usagestring-dtd2vim.dpatch b/debian/patches/usagestring-dtd2vim.dpatch
deleted file mode 100755
index 91eebad..0000000
--- a/debian/patches/usagestring-dtd2vim.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## usagestring-dtd2vim.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vim-scripts~/bin/dtd2vim vim-scripts/bin/dtd2vim
---- vim-scripts~/bin/dtd2vim 2007-01-20 13:20:23.000000000 +0100
-+++ vim-scripts/bin/dtd2vim 2007-02-05 09:25:27.000000000 +0100
-@@ -76,7 +76,7 @@
- if ( $#ARGV < 0 ){
- print "Script generating XML omni completion data file for Vim7\n";
- print "USAGE:\n";
-- print " dtd2vim.pl <filename> [<dialectname>]\n";
-+ print " dtd2vim <filename> [<dialectname>]\n";
- exit 1;
- }
-
diff --git a/debian/patches/vimplate_debian-path.diff b/debian/patches/vimplate_debian-path.diff
new file mode 100644
index 0000000..2ab3f52
--- /dev/null
+++ b/debian/patches/vimplate_debian-path.diff
@@ -0,0 +1,17 @@
+## vimplate_debian-path.diff by Stefano Zacchiroli <zack at debian.org>
+
+Index: vim-scripts/plugin/vimplate.vim
+===================================================================
+--- vim-scripts.orig/plugin/vimplate.vim
++++ vim-scripts/plugin/vimplate.vim
+@@ -15,6 +15,10 @@
+ endif
+ let loaded_vimplate = 1
+
++if !exists("Vimplate")
++ " Debian specific path unless overridden by the user
++ let Vimplate = "/usr/bin/vimplate"
++endif
+ let s:vimplate = Vimplate
+
+ function s:RunVimplate(template)
diff --git a/debian/patches/vimplate_debian-path.dpatch b/debian/patches/vimplate_debian-path.dpatch
deleted file mode 100755
index 730bb39..0000000
--- a/debian/patches/vimplate_debian-path.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## vimplate_debian-path.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad vim-scripts~/plugin/vimplate.vim vim-scripts/plugin/vimplate.vim
---- vim-scripts~/plugin/vimplate.vim 2005-08-20 17:25:18.000000000 +0200
-+++ vim-scripts/plugin/vimplate.vim 2007-02-07 12:37:08.000000000 +0100
-@@ -15,6 +15,10 @@
- endif
- let loaded_vimplate = 1
-
-+if !exists("Vimplate")
-+ " Debian specific path unless overridden by the user
-+ let Vimplate = "/usr/bin/vimplate"
-+endif
- let s:vimplate = Vimplate
-
- function s:RunVimplate(template)
diff --git a/debian/rules b/debian/rules
index 66a418f..250fddd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
common-build-indep:: debian/stamp-local-build
debian/stamp-local-build:: copyright registry dtd2vim.1 vimplate.1
--
vim-scripts packaging
More information about the pkg-vim-maintainers
mailing list