r524 - in trunk/vim7: debian patches

[James Vega]

Author: jamessan
Date: 2006-03-25 23:00:20 +0000 (Sat, 25 Mar 2006)
New Revision: 524

Modified:
   trunk/vim7/debian/changelog
   trunk/vim7/patches/133_filetype.vim.diff
   trunk/vim7/patches/135_debsources.vim.diff
   trunk/vim7/patches/153_filetype.vim.diff
   trunk/vim7/patches/301_xxd.c.diff
   trunk/vim7/patches/303_option.c.diff
   trunk/vim7/patches/series
Log:
Patch offsets for the latest snapshot.


Modified: trunk/vim7/debian/changelog
===================================================================
--- trunk/vim7/debian/changelog	2006-03-25 22:58:51 UTC (rev 523)
+++ trunk/vim7/debian/changelog	2006-03-25 23:00:20 UTC (rev 524)
@@ -1,15 +1,23 @@
-vim (1:6.4+7.0aa.0210-1) UNRELEASED; urgency=low
+vim (1:6.4+7.0aa.0232-1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream snapshot (0210).
+  * New upstream snapshot (0232).
 
   [ James Vega ]
   * Sync with the work that's been done on the 6.4 vim package.
   * Add debian/watch.
+  * debian/{rules,vim-{gui-,}common.links,vim-variant.{prerm,postinst}}
+    + Cleanup handling of manpages and alternatives.
   * debian/control:
+    + Remove references to obsolete packages.
+    + Move vim-doc to Section: doc.
+    + Update vim-common to Recommend all the vim variants.
+  * debian/rules: Added support for running upstream's tests during the
+    build process.
+  * debian/control:
     + Add Build-Depends on libxpm-dev and unzip.
 
- -- James Vega <jamessan at debian.org>  Tue, 28 Feb 2006 21:11:34 -0500
+ -- James Vega <jamessan at debian.org>  Sat, 25 Mar 2006 17:59:02 -0500
 
 vim (1:6.4-007+1) unstable; urgency=low
 

Modified: trunk/vim7/patches/133_filetype.vim.diff
===================================================================
--- trunk/vim7/patches/133_filetype.vim.diff	2006-03-25 22:58:51 UTC (rev 523)
+++ trunk/vim7/patches/133_filetype.vim.diff	2006-03-25 23:00:20 UTC (rev 524)
@@ -18,7 +18,7 @@
  
  " Cold Fusion
  au BufNewFile,BufRead *.cfm,*.cfi,*.cfc		setf cf
-@@ -1878,6 +1885,13 @@
+@@ -1898,6 +1905,13 @@
  " Yaml
  au BufNewFile,BufRead *.yaml,*.yml		setf yaml
  

Modified: trunk/vim7/patches/135_debsources.vim.diff
===================================================================
--- trunk/vim7/patches/135_debsources.vim.diff	2006-03-25 22:58:51 UTC (rev 523)
+++ trunk/vim7/patches/135_debsources.vim.diff	2006-03-25 23:00:20 UTC (rev 524)
@@ -2,7 +2,7 @@
 ===================================================================
 --- vim/runtime/filetype.vim.orig
 +++ vim/runtime/filetype.vim
-@@ -1616,6 +1616,9 @@
+@@ -1623,6 +1623,9 @@
  " OpenSSH server configuration
  au BufNewFile,BufRead sshd_config		setf sshdconfig
  

Modified: trunk/vim7/patches/153_filetype.vim.diff
===================================================================
--- trunk/vim7/patches/153_filetype.vim.diff	2006-03-25 22:58:51 UTC (rev 523)
+++ trunk/vim7/patches/153_filetype.vim.diff	2006-03-25 23:00:20 UTC (rev 524)
@@ -2,7 +2,7 @@
 ===================================================================
 --- vim/runtime/filetype.vim.orig
 +++ vim/runtime/filetype.vim
-@@ -1381,7 +1381,7 @@
+@@ -1388,7 +1388,7 @@
  au BufNewFile,BufRead *.sa			setf sather
  
  " Scilab

Modified: trunk/vim7/patches/301_xxd.c.diff
===================================================================
--- trunk/vim7/patches/301_xxd.c.diff	2006-03-25 22:58:51 UTC (rev 523)
+++ trunk/vim7/patches/301_xxd.c.diff	2006-03-25 23:00:20 UTC (rev 524)
@@ -2,7 +2,7 @@
 ===================================================================
 --- vim/src/xxd/xxd.c.orig
 +++ vim/src/xxd/xxd.c
-@@ -268,6 +268,9 @@
+@@ -275,6 +275,9 @@
        if (c == '\r')	/* Doze style input file? */
  	continue;
  

Modified: trunk/vim7/patches/303_option.c.diff
===================================================================
--- trunk/vim7/patches/303_option.c.diff	2006-03-25 22:58:51 UTC (rev 523)
+++ trunk/vim7/patches/303_option.c.diff	2006-03-25 23:00:20 UTC (rev 524)
@@ -2,7 +2,7 @@
 ===================================================================
 --- vim/src/option.c.orig
 +++ vim/src/option.c
-@@ -2807,7 +2807,8 @@
+@@ -2926,7 +2926,8 @@
  # endif
  #endif
  	    )

Modified: trunk/vim7/patches/series
===================================================================
--- trunk/vim7/patches/series	2006-03-25 22:58:51 UTC (rev 523)
+++ trunk/vim7/patches/series	2006-03-25 23:00:20 UTC (rev 524)
@@ -16,21 +16,17 @@
 130_fstab.vim.diff -p0
 133_filetype.vim.diff -p0
 133_resolv.vim.diff -p0
-134_sshconfig.vim.diff -p0
 135_debsources.vim.diff -p0
 136_muttrc.vim.diff -p0
 140_muttrc.vim.diff -p0
 142_filetype.vim.diff -p0
 145_fortran.vim.diff -p0
 148_debchangelog.vim.diff -p0
-149_sshconfig.vim.diff -p0
-150_asterisk.vim.diff -p0
 153_filetype.vim.diff -p0
 154_svn.vim.diff -p0
 155_rst.vim.diff -p0
 156_scripts.vim.diff -p0
 157_slrnrc.vim.diff -p0
-159_netrw.vim.diff -p0
 201_fr.po.diff -p0
 203_zh_TW.UTF8.po.diff -p0
 301_xxd.c.diff -p0