[SCM] vim-scripts packaging branch, master, updated. v20091011-30-gc476b42
James Vega
jamessan at debian.org
Sun Aug 14 03:27:03 UTC 2011
The following commit has been merged in the master branch:
commit b8650f3c7d4732a9bb50052fe4f70c387285fddc
Author: James Vega <jamessan at debian.org>
Date: Sun Jun 26 13:58:30 2011 -0400
Refresh patches
Signed-off-by: James Vega <jamessan at debian.org>
diff --git a/debian/patches/disabledby-calendar.diff b/debian/patches/disabledby-calendar.diff
index dd02987..e71ea86 100644
--- a/debian/patches/disabledby-calendar.diff
+++ b/debian/patches/disabledby-calendar.diff
@@ -1,19 +1,19 @@
## disabledby-calendar.diff by Stefano Zacchiroli <zack at debian.org>
-Index: vim-scripts/plugin/calendar.vim
+Index: b/plugin/calendar.vim
===================================================================
---- vim-scripts.orig/plugin/calendar.vim
-+++ vim-scripts/plugin/calendar.vim
-@@ -315,10 +315,10 @@
+--- a/plugin/calendar.vim
++++ b/plugin/calendar.vim
+@@ -323,10 +323,10 @@
" :echo calendar_version
" GetLatestVimScripts: 52 1 :AutoInstall: calendar.vim
--let g:calendar_version = "2.0"
+-let g:calendar_version = "2.5"
-if &compatible
+if &compatible || exists("g:calendar_version")
finish
endif
-+let g:calendar_version = "2.0"
++let g:calendar_version = "2.5"
if !exists("g:calendar_action")
let g:calendar_action = "<SID>CalendarDiary"
diff --git a/debian/patches/disabledby-doxygentoolkit.diff b/debian/patches/disabledby-doxygentoolkit.diff
index a5fb238..25740e6 100644
--- a/debian/patches/disabledby-doxygentoolkit.diff
+++ b/debian/patches/disabledby-doxygentoolkit.diff
@@ -2,17 +2,17 @@ Index: vim-scripts/plugin/DoxygenToolkit.vim
===================================================================
--- vim-scripts.orig/plugin/DoxygenToolkit.vim
+++ vim-scripts/plugin/DoxygenToolkit.vim
-@@ -226,10 +226,10 @@
+@@ -259,10 +259,10 @@
" Verify if already loaded
-"if exists("loaded_DoxygenToolkit")
--" echo 'DoxygenToolkit Already Loaded.'
--" finish
+-" echo 'DoxygenToolkit Already Loaded.'
+-" finish
-"endif
+if exists("loaded_DoxygenToolkit")
-+ echo 'DoxygenToolkit Already Loaded.'
-+ finish
++ echo 'DoxygenToolkit Already Loaded.'
++ finish
+endif
let loaded_DoxygenToolkit = 1
"echo 'Loading DoxygenToolkit...'
diff --git a/debian/patches/disabledby-pythonindent.diff b/debian/patches/disabledby-pythonindent.diff
old mode 100755
new mode 100644
diff --git a/debian/patches/disabledby-supertab.diff b/debian/patches/disabledby-supertab.diff
index c2cabc0..8627a85 100644
--- a/debian/patches/disabledby-supertab.diff
+++ b/debian/patches/disabledby-supertab.diff
@@ -1,10 +1,10 @@
## disabledby-supertab.diff by Stefano Zacchiroli <zack at debian.org>
-Index: vim-scripts/plugin/supertab.vim
+Index: b/plugin/supertab.vim
===================================================================
---- vim-scripts.orig/plugin/supertab.vim
-+++ vim-scripts/plugin/supertab.vim
-@@ -59,6 +59,11 @@
+--- a/plugin/supertab.vim
++++ b/plugin/supertab.vim
+@@ -57,6 +57,11 @@
finish
endif
diff --git a/debian/patches/series b/debian/patches/series
index f0c2533..f843589 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,7 @@ disabledby-supertab.diff
disabledby-tetris.diff
disabledby-color_sample_pack.diff
disabledby-whatdomain.diff
+disabledby-pythonindent.diff
sokoboan_path.diff
usagestring-dtd2vim.diff
vimplate_debian-path.diff
--
vim-scripts packaging
More information about the pkg-vim-maintainers
mailing list