r1076 - in /trunk/packages/vim: debian/README debian/changelog debian/compat debian/control debian/rules debian/tiny/vimrc.tiny.diff debian/vim-runtime.install.in upstream/patches/7.1.147 upstream/patches/7.1.148

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Sun Nov 4 16:23:12 UTC 2007 

Author: jamessan
Date: Sun Nov  4 16:23:12 2007
New Revision: 1076

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1076
Log:
* New upstream patches (139 - 148), see README.gz for details.
* Refreshed patches:
  - vimrc.tiny.diff
* Added patches:
  - sh.vim_syntax.diff, which fixes the syntax highlighting of escaped
    single-quotes.  (Closes: #425443)
* Bump debhelper compat to 5.
* debian/vim-runtime.install:
  - Remove usr/share/consolefonts/* since that's not shipped any more.
* debian/control:
  - Add vim-dbg package to supply debugging symbols for the various vim
    packages.
  - Fix a typo in the long description for the vim package.
  - Make use of multi-line (Build-)Depends support.
* debian/rules:
  - Add binary-arch target for the vim-dbg package.

Added:
    trunk/packages/vim/upstream/patches/7.1.147
    trunk/packages/vim/upstream/patches/7.1.148
Modified:
    trunk/packages/vim/debian/README
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/debian/compat
    trunk/packages/vim/debian/control
    trunk/packages/vim/debian/rules
    trunk/packages/vim/debian/tiny/vimrc.tiny.diff
    trunk/packages/vim/debian/vim-runtime.install.in

Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=1076&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Sun Nov  4 16:23:12 2007
@@ -175,3 +175,5 @@
   1250  7.1.144  after ":diffup" cursor can be in the wrong position
   6160  7.1.145  stay in Insert completion mode depending on the char typed
   2838  7.1.146  VMS: writing fails for rare record organisation
+  2079  7.1.147  (after 7.1.127) freeing memory twice completing user name
+  2557  7.1.148  QNX and some other systems require testing for sys/types.h

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1076&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sun Nov  4 16:23:12 2007
@@ -1,7 +1,7 @@
-vim (1:7.1-146+1) UNRELEASED; urgency=low
+vim (1:7.1-148+1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream patches (139 - 146), see README.gz for details.
+  * New upstream patches (139 - 148), see README.gz for details.
 
   [ James Vega ]
   * ftplugin/debchangelog.vim:
@@ -9,12 +9,25 @@
       entry.  (Closes: #446728)
     - Fix NewVersion() to increment the version of the first changelog entry
       regardless of how 'startofline' is set.
-  * Add sh.vim_syntax.diff, which fixes the syntax highlighting of escaped
-    single-quotes.  (Closes: #425443)
+  * Refreshed patches:
+    - vimrc.tiny.diff
+  * Added patches:
+    - sh.vim_syntax.diff, which fixes the syntax highlighting of escaped
+      single-quotes.  (Closes: #425443)
   * syntax/debcontrol.vim:
     - Add syntax highlighting for Vcs-* control fields.  (Closes: #448543)
-
- -- James Vega <jamessan at debian.org>  Tue, 30 Oct 2007 21:45:20 -0400
+  * Bump debhelper compat to 5.
+  * debian/vim-runtime.install:
+    - Remove usr/share/consolefonts/* since that's not shipped any more.
+  * debian/control:
+    - Add vim-dbg package to supply debugging symbols for the various vim
+      packages.
+    - Fix a typo in the long description for the vim package.
+    - Make use of multi-line (Build-)Depends support.
+  * debian/rules:
+    - Add binary-arch target for the vim-dbg package.
+
+ -- James Vega <jamessan at debian.org>  Sun, 04 Nov 2007 10:50:00 -0500
 
 vim (1:7.1-138+1) unstable; urgency=medium
 

Modified: trunk/packages/vim/debian/compat
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/compat?rev=1076&op=diff
==============================================================================
--- trunk/packages/vim/debian/compat (original)
+++ trunk/packages/vim/debian/compat Sun Nov  4 16:23:12 2007
@@ -1,1 +1,1 @@
-4
+5

Modified: trunk/packages/vim/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/control?rev=1076&op=diff
==============================================================================
--- trunk/packages/vim/debian/control (original)
+++ trunk/packages/vim/debian/control Sun Nov  4 16:23:12 2007
@@ -4,7 +4,11 @@
 Maintainer: Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
 Uploaders: Norbert Tretkowski <nobse at debian.org>, Pierre Habouzit <madcoder at debian.org>, Stefano Zacchiroli <zack at debian.org>, James Vega <jamessan at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4.2.21), bzip2, perl (>= 5.6), libgpmg1-dev [!hurd-i386] | not+linux-gnu, libperl-dev (>= 5.6), tcl8.4-dev, python-dev, libxpm-dev, libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev (>= 2.2), libgnomeui-dev [!hurd-i386], lesstif2-dev, quilt, make (>= 3.80+3.81.b4), docbook-xml, docbook-utils, lynx
+Build-Depends: debhelper (>= 4.2.21), bzip2, perl (>= 5.6),
+ libgpmg1-dev [!hurd-i386] | not+linux-gnu, libperl-dev (>= 5.6), tcl8.4-dev,
+ python-dev, libxpm-dev, libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev (>= 2.2),
+ libgnomeui-dev [!hurd-i386], lesstif2-dev, quilt, make (>= 3.80+3.81.b4),
+ docbook-xml, docbook-utils, lynx
 Build-Conflicts: libperl-dev (= 5.8.4-1)
 Vcs-Svn: svn://svn.debian.org/svn/pkg-vim/trunk/packages/vim
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/
@@ -107,10 +111,26 @@
  highlighting, command line history, on-line help, filename
  completion, block operations, folding, Unicode support, etc.
  .
- This package contain a version of vim compiled with a rather
+ This package contains a version of vim compiled with a rather
  standard set of features.  This package does not provide a GUI
  version of Vim.  See the other vim-* packages if you need more
  (or less).
+
+Package: vim-dbg
+Priority: extra
+Architecture: any
+Depends: vim (= ${binary:Version}) | vim-gtk (= ${binary:Version}) |
+ vim-gnome (= ${binary:Version}) | vim-nox (= ${binary:Version}) |
+ vim-common (= ${binary:Version}) | vim-lesstif (= ${binary:Version}) |
+ vim-tiny (= ${binary:Version})
+Description: Vi IMproved - enhanced vi editor (debugging symbols)
+ Vim is an almost compatible version of the UNIX editor Vi.
+ .
+ Many new features have been added: multi level undo, syntax
+ highlighting, command line history, on-line help, filename
+ completion, block operations, folding, Unicode support, etc.
+ .
+ This package contains gdb debugging symbols for the vim packages.
 
 Package: vim-perl
 Priority: extra

Modified: trunk/packages/vim/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/rules?rev=1076&op=diff
==============================================================================
--- trunk/packages/vim/debian/rules (original)
+++ trunk/packages/vim/debian/rules Sun Nov  4 16:23:12 2007
@@ -389,8 +389,8 @@
 	dh_link
 	
 	 # all excepts vim
-	dh_installchangelogs -Nvim
-	dh_installdocs
+	dh_installchangelogs -Nvim -pvim-dbg
+	dh_installdocs -pvim-dbg
 	dh_installmenu
 	dh_installmime
 	
@@ -457,14 +457,14 @@
 	dh_builddeb
 
 binary-arch: build install
-binary-arch: $(foreach v,$(VARIANTS),binary-arch-$(v))
+binary-arch: $(foreach v,$(VARIANTS),binary-arch-$(v)) binary-arch-vim-dbg
 
 binary-arch-vim-basic: export DH_OPTIONS=-pvim-common -pvim
 binary-arch-vim-basic:
 	dh_testdir
 	dh_testroot
 	dh_desktop
-	dh_strip
+	dh_strip --dbg-package=vim-dbg
 	dh_compress
 	dh_fixperms
 	dh_installdeb
@@ -478,7 +478,7 @@
 	dh_testdir
 	dh_testroot
 	dh_desktop
-	dh_strip
+	dh_strip --dbg-package=vim-dbg
 	dh_compress
 	dh_fixperms
 	dh_installdeb
@@ -486,6 +486,18 @@
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
+
+binary-arch-vim-dbg: export DH_OPTIONS=-pvim-dbg
+binary-arch-vim-dbg:
+	dh_testdir
+	dh_testroot
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
 binary: beginlog binary-indep binary-arch endlog
 .PHONY: extract clean build install uninstall binary-indep binary-arch binary
 

Modified: trunk/packages/vim/debian/tiny/vimrc.tiny.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/tiny/vimrc.tiny.diff?rev=1076&op=diff
==============================================================================
--- trunk/packages/vim/debian/tiny/vimrc.tiny.diff (original)
+++ trunk/packages/vim/debian/tiny/vimrc.tiny.diff Sun Nov  4 16:23:12 2007
@@ -26,7 +26,7 @@
  } mparm_T;
  
  /* Values for edit_type. */
-@@ -1441,6 +1444,8 @@
+@@ -1470,6 +1473,8 @@
      }
      else if (STRNICMP(initstr, "vim", 3) == 0)
  	initstr += 3;
@@ -35,7 +35,7 @@
  
      /* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
      if (STRICMP(initstr, "diff") == 0)
-@@ -2691,7 +2696,14 @@
+@@ -2737,7 +2742,14 @@
  	 * Get system wide defaults, if the file name is defined.
  	 */
  #ifdef SYS_VIMRC_FILE

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=1076&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-runtime.install.in (original)
+++ trunk/packages/vim/debian/vim-runtime.install.in Sun Nov  4 16:23:12 2007
@@ -1,5 +1,4 @@
 debian/tmp/usr/bin/vimtutor				usr/bin/
-debian/tmp/usr/share/consolefonts/*			usr/share/consolefonts/
 debian/tmp/usr/share/vim/				usr/share/
 debian/tmp/usr/share/man/man1/vimtutor.1		usr/share/man/man1/
 debian/vim-registry/*.yaml				usr/share/vim/registry/

Added: trunk/packages/vim/upstream/patches/7.1.147
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.147?rev=1076&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.147 (added)
+++ trunk/packages/vim/upstream/patches/7.1.147 Sun Nov  4 16:23:12 2007
@@ -1,0 +1,75 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.147
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.147 (after 7.1.127)
+Problem:    Freeing memory already freed when completing user name. (Meino
+	    Cramer)
+Solution:   Use a flag to remember if "orig" needs to be freed.
+Files:	    src/ex_getln.c
+
+
+*** ../vim-7.1.146/src/ex_getln.c	Sun Sep 30 22:10:45 2007
+--- src/ex_getln.c	Tue Oct 30 17:13:33 2007
+***************
+*** 3353,3358 ****
+--- 3353,3359 ----
+      char_u	*ss = NULL;
+      static int	findex;
+      static char_u *orig_save = NULL;	/* kept value of orig */
++     int		orig_saved = FALSE;
+      int		i;
+      long_u	len;
+      int		non_suf_match;		/* number without matching suffix */
+***************
+*** 3421,3426 ****
+--- 3422,3428 ----
+      {
+  	vim_free(orig_save);
+  	orig_save = orig;
++ 	orig_saved = TRUE;
+  
+  	/*
+  	 * Do the expansion.
+***************
+*** 3546,3552 ****
+  	ExpandCleanup(xp);
+  
+      /* Free "orig" if it wasn't stored in "orig_save". */
+!     if (orig != orig_save)
+  	vim_free(orig);
+  
+      return ss;
+--- 3548,3554 ----
+  	ExpandCleanup(xp);
+  
+      /* Free "orig" if it wasn't stored in "orig_save". */
+!     if (!orig_saved)
+  	vim_free(orig);
+  
+      return ss;
+*** ../vim-7.1.146/src/version.c	Mon Oct 29 22:37:57 2007
+--- src/version.c	Tue Oct 30 17:30:35 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     147,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+59. Your wife says communication is important in a marriage...so you buy
+    another computer and install a second phone line so the two of you can
+    chat.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

Added: trunk/packages/vim/upstream/patches/7.1.148
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.148?rev=1076&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.148 (added)
+++ trunk/packages/vim/upstream/patches/7.1.148 Sun Nov  4 16:23:12 2007
@@ -1,0 +1,73 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.148
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.148
+Problem:    Some types are not found by configure.
+Solution:   Test for the sys/types.h header file. (Sean Boudreau)
+Files:	    src/configure.in, src/auto/configure
+
+
+*** ../vim-7.1.147/src/configure.in	Thu Jun 28 13:02:22 2007
+--- src/configure.in	Sat Oct 27 15:52:16 2007
+***************
+*** 2026,2032 ****
+  fi
+  
+  AC_CHECK_HEADERS(stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \
+! 	termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h \
+  	iconv.h langinfo.h unistd.h stropts.h errno.h \
+  	sys/resource.h sys/systeminfo.h locale.h \
+  	sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \
+--- 2026,2032 ----
+  fi
+  
+  AC_CHECK_HEADERS(stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \
+! 	termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h sys/types.h termio.h \
+  	iconv.h langinfo.h unistd.h stropts.h errno.h \
+  	sys/resource.h sys/systeminfo.h locale.h \
+  	sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \
+*** ../vim-7.1.147/src/auto/configure	Thu Jun 28 13:02:22 2007
+--- src/auto/configure	Sun Nov  4 15:34:14 2007
+***************
+*** 10265,10272 ****
+  
+  
+  
+  for ac_header in stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \
+! 	termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h \
+  	iconv.h langinfo.h unistd.h stropts.h errno.h \
+  	sys/resource.h sys/systeminfo.h locale.h \
+  	sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \
+--- 10265,10273 ----
+  
+  
+  
++ 
+  for ac_header in stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \
+! 	termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h sys/types.h termio.h \
+  	iconv.h langinfo.h unistd.h stropts.h errno.h \
+  	sys/resource.h sys/systeminfo.h locale.h \
+  	sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \
+*** ../vim-7.1.147/src/version.c	Tue Oct 30 17:36:31 2007
+--- src/version.c	Sun Nov  4 15:34:26 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     148,
+  /**/
+
+-- 
+If your nose runs, and your feet smell, you might be upside down.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

More information about the pkg-vim-maintainers mailing list