r1163 - in /trunk/packages/vim: debian/changelog debian/control debian/lintian/vim-runtime debian/vim-runtime.install.in patches/mve.awk-interpreter.diff patches/pushed-upstream.txt patches/series patches/vimspell.sh-typo.diff

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Thu Jan 17 20:36:41 UTC 2008


Author: jamessan
Date: Thu Jan 17 20:36:39 2008
New Revision: 1163

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1163
Log:
  - Suggest ttf-dejavu instead of ttf-bitstream-vera for the gvim packages.
    (Closes: #461295)
  - Remove dpkg Pre-Depends now that dak is accepting data.tar.bz2.
  - vimspell.sh-typo.diff:
    + Fix a missing end-quote in tools/vimspell.sh.
  - mve.awk-interpreter.diff:
    + Adjust the #! line to use awk instead of nawk.
* Stop removing vimspell, vim132, and maze from the runtime tools/
  directory.  The issues leading to their removal should be addressed
  instead of removing them from the package.
  - vimspell - The tempfile vulnerability (CAN-2005-0069) has been fixed
    upstream for some time now.
  - vim132 - Add lintian overrides for "csh is harmful" and not having a
    Depends/Recommends/Suggests on tcsh | csh.  This is the only file in the
    package that would use the shell and its an example script.
  - maze - maze.c doesn't work properly and its README suggests this may be
    the case on newer compilers and to use mazeansi.c, which does work.

Added:
    trunk/packages/vim/debian/lintian/vim-runtime
    trunk/packages/vim/patches/mve.awk-interpreter.diff
    trunk/packages/vim/patches/vimspell.sh-typo.diff
Modified:
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/debian/control
    trunk/packages/vim/debian/vim-runtime.install.in
    trunk/packages/vim/patches/pushed-upstream.txt
    trunk/packages/vim/patches/series

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1163&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Thu Jan 17 20:36:39 2008
@@ -11,7 +11,9 @@
     - Drop Build-Conflicts on old version of libperl-dev.
     - Drop versioning from Build-Depends that are available in Sarge.
     - Drop unnecessary ruby and perl Build-Depends.
-    - Suggest ttf-dejavu instead of ttf-bitstream-vera.  (Closes: #461295)
+    - Suggest ttf-dejavu instead of ttf-bitstream-vera for the gvim packages.
+      (Closes: #461295)
+    - Remove dpkg Pre-Depends now that dak is accepting data.tar.bz2.
   * runtime/syntax/debchangelog.vim:
     - Adjust the "Closes" syntax highlighting to allow newlines as part of the
       whitespace.  (Closes: #460074)
@@ -32,6 +34,10 @@
     - filetype.vim-udev.d.diff:
       + Detect /etc/udev.d/*.rules files as 'udevrules' instead of 'hog'
         filetype.  (Closes: #437434)
+    - vimspell.sh-typo.diff:
+      + Fix a missing end-quote in tools/vimspell.sh.
+    - mve.awk-interpreter.diff:
+      + Adjust the #! line to use awk instead of nawk.
   * Updated patches:
     - fstab.vim-syntax.diff:
       + Added more sshfs support based on feedback from upstream.
@@ -39,9 +45,18 @@
     - gui_gtk_x11.c_g_thread_init.diff:
       + This patch was initially added to silence a GLib warning (#428854)
         which isn't occurring anymore.
-  *
-
- -- James Vega <jamessan at debian.org>  Thu, 17 Jan 2008 12:14:38 -0500
+  * Stop removing vimspell, vim132, and maze from the runtime tools/
+    directory.  The issues leading to their removal should be addressed
+    instead of removing them from the package.
+    - vimspell - The tempfile vulnerability (CAN-2005-0069) has been fixed
+      upstream for some time now.
+    - vim132 - Add lintian overrides for "csh is harmful" and not having a
+      Depends/Recommends/Suggests on tcsh | csh.  This is the only file in the
+      package that would use the shell and its an example script.
+    - maze - maze.c doesn't work properly and its README suggests this may be
+      the case on newer compilers and to use mazeansi.c, which does work.
+
+ -- James Vega <jamessan at debian.org>  Thu, 17 Jan 2008 13:50:30 -0500
 
 vim (1:7.1-175+2) unstable; urgency=low
 

Modified: trunk/packages/vim/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/control?rev=1163&op=diff
==============================================================================
--- trunk/packages/vim/debian/control (original)
+++ trunk/packages/vim/debian/control Thu Jan 17 20:36:39 2008
@@ -49,7 +49,6 @@
 Priority: optional
 Architecture: all
 Replaces: vim-tiny
-Pre-Depends: dpkg (>= 1.10.24)
 Recommends: vim | vim-gnome | vim-gtk | vim-lesstif | vim-nox | vim-tiny
 Enhances: vim-tiny
 Description: Vi IMproved - Runtime files

Added: trunk/packages/vim/debian/lintian/vim-runtime
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/lintian/vim-runtime?rev=1163&op=file
==============================================================================
--- trunk/packages/vim/debian/lintian/vim-runtime (added)
+++ trunk/packages/vim/debian/lintian/vim-runtime Thu Jan 17 20:36:39 2008
@@ -1,0 +1,2 @@
+vim-runtime binary: missing-dep-for-interpreter csh => tcsh | csh | c-shell (./usr/share/vim/vim71/tools/vim132)
+vim-runtime binary: csh-considered-harmful ./usr/share/vim/vim71/tools/vim132

Modified: trunk/packages/vim/debian/vim-runtime.install.in
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-runtime.install.in?rev=1163&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-runtime.install.in (original)
+++ trunk/packages/vim/debian/vim-runtime.install.in Thu Jan 17 20:36:39 2008
@@ -4,3 +4,4 @@
 debian/vim-registry/*.yaml				usr/share/vim/registry/
 runtime/ftplugin/*					usr/share/vim/@VIMCUR@/ftplugin
 runtime/syntax/*					usr/share/vim/@VIMCUR@/syntax
+debian/lintian/vim-runtime				usr/share/lintian/overrides/

Added: trunk/packages/vim/patches/mve.awk-interpreter.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/mve.awk-interpreter.diff?rev=1163&op=file
==============================================================================
--- trunk/packages/vim/patches/mve.awk-interpreter.diff (added)
+++ trunk/packages/vim/patches/mve.awk-interpreter.diff Thu Jan 17 20:36:39 2008
@@ -1,0 +1,10 @@
+Index: vim/runtime/tools/mve.awk
+===================================================================
+--- vim/runtime/tools/mve.awk.orig
++++ vim/runtime/tools/mve.awk
+@@ -1,4 +1,4 @@
+-#!/usr/bin/nawk -f
++#!/usr/bin/awk -f
+ #
+ # Change "nawk" to "awk" or "gawk" if you get errors.
+ #

Modified: trunk/packages/vim/patches/pushed-upstream.txt
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/pushed-upstream.txt?rev=1163&op=diff
==============================================================================
--- trunk/packages/vim/patches/pushed-upstream.txt (original)
+++ trunk/packages/vim/patches/pushed-upstream.txt Thu Jan 17 20:36:39 2008
@@ -21,3 +21,4 @@
 Makefile_no-strip.diff
 spell.c_getc-eof.diff
 configure-tcl_detection.diff
+mve.awk-interpreter.diff

Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=1163&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Thu Jan 17 20:36:39 2008
@@ -30,3 +30,5 @@
 configure-tcl_detection.diff -p0
 netrwPlugin.vim-bwipe.diff -p0
 filetype.vim-udev.d.diff -p0
+vimspell.sh-typo.diff -p0
+mve.awk-interpreter.diff -p0

Added: trunk/packages/vim/patches/vimspell.sh-typo.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/vimspell.sh-typo.diff?rev=1163&op=file
==============================================================================
--- trunk/packages/vim/patches/vimspell.sh-typo.diff (added)
+++ trunk/packages/vim/patches/vimspell.sh-typo.diff Thu Jan 17 20:36:39 2008
@@ -1,0 +1,13 @@
+Index: vim/runtime/tools/vimspell.sh
+===================================================================
+--- vim/runtime/tools/vimspell.sh.orig
++++ vim/runtime/tools/vimspell.sh
+@@ -22,7 +22,7 @@
+ # create a file in the safest way possible.
+ if test "$OUTFILE" = none; then
+         OUTFILE=$tmp/vimspell$$
+-	[ -e $OUTFILE ] && { echo "Cannot use temporary file $OUTFILE, it already exists!; exit 1 ; } 
++	[ -e $OUTFILE ] && { echo "Cannot use temporary file $OUTFILE, it already exists!"; exit 1 ; } 
+         (umask 077; touch $OUTFILE)
+ fi
+ # Note the copy of vimspell cannot be deleted on exit since it is




More information about the pkg-vim-maintainers mailing list