r628 - in /trunk/packages/vim-latexsuite/debian: changelog control patches/00list patches/04_fname_outline.dpatch

[fp-guest at users.alioth.debian.org]

Author: fp-guest
Date: Fri Apr 28 12:28:17 2006
New Revision: 628

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=628
Log:
vim-latexsuite: new patch & standards-version bump

Added:
    trunk/packages/vim-latexsuite/debian/patches/04_fname_outline.dpatch   (with props)
Modified:
    trunk/packages/vim-latexsuite/debian/changelog
    trunk/packages/vim-latexsuite/debian/control
    trunk/packages/vim-latexsuite/debian/patches/00list

Modified: trunk/packages/vim-latexsuite/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-latexsuite/debian/changelog?rev=628&op=diff
==============================================================================
--- trunk/packages/vim-latexsuite/debian/changelog (original)
+++ trunk/packages/vim-latexsuite/debian/changelog Fri Apr 28 12:28:17 2006
@@ -2,9 +2,12 @@
 
   * Fixed mapping InsertItemOnThisLine by preventing it to reenter insert
     mode, see 03_insertitem.dpatch (Closes: #350021)
+  * Fixed adding extension twice in ftplugin/latex-suite/outline.py, see
+    04_fname_outline.dpatch (Closes: #365152)
   * debian/rules: Removed useless debhelper calls
+  * Bumped standards-version to 3.7.0.0, no changes necessary
 
- -- Franz Pletz <fpletz at franz-pletz.org>  Tue, 25 Apr 2006 01:12:20 +0200
+ -- Franz Pletz <fpletz at franz-pletz.org>  Fri, 28 Apr 2006 13:59:15 +0200
 
 vim-latexsuite (20060325-1) unstable; urgency=medium
 

Modified: trunk/packages/vim-latexsuite/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-latexsuite/debian/control?rev=628&op=diff
==============================================================================
--- trunk/packages/vim-latexsuite/debian/control (original)
+++ trunk/packages/vim-latexsuite/debian/control Fri Apr 28 12:28:17 2006
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Franz Pletz <fpletz at franz-pletz.org>
 Build-Depends-Indep: debhelper (>> 5), dpatch
-Standards-Version: 3.6.2
+Standards-Version: 3.7.0.0
 
 Package: vim-latexsuite
 Architecture: all

Modified: trunk/packages/vim-latexsuite/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-latexsuite/debian/patches/00list?rev=628&op=diff
==============================================================================
--- trunk/packages/vim-latexsuite/debian/patches/00list (original)
+++ trunk/packages/vim-latexsuite/debian/patches/00list Fri Apr 28 12:28:17 2006
@@ -1,4 +1,5 @@
 # Add here the patches you want to apply
-01_foldingfix.dpatch
-02_changelog.dpatch
-03_insertitem.dpatch
+01_foldingfix
+02_changelog
+03_insertitem
+04_fname_outline

Added: trunk/packages/vim-latexsuite/debian/patches/04_fname_outline.dpatch
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-latexsuite/debian/patches/04_fname_outline.dpatch?rev=628&op=file
==============================================================================
--- trunk/packages/vim-latexsuite/debian/patches/04_fname_outline.dpatch (added)
+++ trunk/packages/vim-latexsuite/debian/patches/04_fname_outline.dpatch Fri Apr 28 12:28:17 2006
@@ -1,0 +1,55 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_fname_outline.dpatch by  <fpletz at franz-pletz.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes adding extension twice in outlining
+
+ at DPATCH@
+
+--- vim-latexsuite_20060325.orig/ftplugin/latex-suite/outline.py	2006-03-21 20:29:35.000000000 +0100
++++ vim-latexsuite/ftplugin/latex-suite/outline.py	2006-04-28 13:30:03.000000000 +0200
+@@ -11,20 +11,28 @@
+ import sys
+ import StringIO
+ 
+-# getFileContents {{{
+-def getFileContents(argin, ext=''):
+-    if type(argin) is str:
+-        fname = argin + ext
++# includeFile {{{
++def includeFile(fname):
++    if type(fname) is not str:
++        fname = fname.group(3)
++
++    (root, ext) = os.path.splitext(fname)
++
++    if not ext:
++        return getFileContents(fname + '.tex')
+     else:
+-            fname = argin.group(3) + ext
++        return getFileContents(fname)
+ 
++# }}}
++# getFileContents {{{
++def getFileContents(fname):
+     # This longish thing is to make sure that all files are converted into
+     # \n seperated lines.
+     contents = '\n'.join(open(fname).read().splitlines())
+ 
+     # TODO what are all the ways in which a tex file can include another?
+     pat = re.compile(r'^\\(@?)(include|input){(.*?)}', re.M)
+-    contents = re.sub(pat, lambda input: getFileContents(input, ext), contents)
++    contents = re.sub(pat, includeFile, contents)
+ 
+     return ('%%==== FILENAME: %s' % fname) + '\n' + contents
+ 
+@@ -166,8 +174,7 @@
+     if head:
+         os.chdir(head)
+ 
+-    [root, ext] = os.path.splitext(tail)
+-    contents = getFileContents(root, ext)
++    contents = getFileContents(fname)
+     nonempty = stripComments(contents)
+     lineinfo = addFileNameAndNumber(nonempty)
+ 

Propchange: trunk/packages/vim-latexsuite/debian/patches/04_fname_outline.dpatch
------------------------------------------------------------------------------
    svn:executable = *