r1059 - in /trunk/packages/vim: debian/README debian/changelog debian/lintian/vim debian/lintian/vim-variant debian/rules upstream/patches/7.1.136 upstream/patches/7.1.137 upstream/patches/7.1.138
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Tue Oct 9 16:32:59 UTC 2007
Author: jamessan
Date: Tue Oct 9 16:32:59 2007
New Revision: 1059
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1059
Log:
* New upstream patches (136 - 138), see README.gz for details.
* Fix the lintian override files to match Lintian's output.
* debian/rules
- Remove a useless command from the variant clean target
- Clean vim-tiny's generated debhelper files
- Clean generated vim-policy files
Added:
trunk/packages/vim/upstream/patches/7.1.136
trunk/packages/vim/upstream/patches/7.1.137
trunk/packages/vim/upstream/patches/7.1.138
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
trunk/packages/vim/debian/lintian/vim
trunk/packages/vim/debian/lintian/vim-variant
trunk/packages/vim/debian/rules
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=1059&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Tue Oct 9 16:32:59 2007
@@ -164,3 +164,6 @@
1515 7.1.133 shorten_fname1() linked when it's not needed
10379 7.1.134 (extra) Win32: Can't build with VC8
3337 7.1.135 Win32: ":e c:/tmp/foo" and ":e c:/tmp//foo" create two buffers
+ 1522 7.1.136 memory leak when using Ruby syntax highlighting
+ 1553 7.1.137 build failure when using EXITFREE
+ 1836 7.1.138 Perl: Msg() doesn't stop when "q" is typed at the more prompt
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1059&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue Oct 9 16:32:59 2007
@@ -1,8 +1,16 @@
-vim (1:7.1-135+2) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
-
- -- James Vega <jamessan at debian.org> Sun, 07 Oct 2007 18:42:36 -0400
+vim (1:7.1-138+1) UNRELEASED; urgency=low
+
+ [ Debian Vim Maintainers ]
+ * New upstream patches (136 - 138), see README.gz for details.
+
+ [ James Vega ]
+ * Fix the lintian override files to match Lintian's output.
+ * debian/rules
+ - Remove a useless command from the variant clean target
+ - Clean vim-tiny's generated debhelper files
+ - Clean generated vim-policy files
+
+ -- James Vega <jamessan at debian.org> Tue, 09 Oct 2007 12:27:27 -0400
vim (1:7.1-135+1) unstable; urgency=low
Modified: trunk/packages/vim/debian/lintian/vim
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/lintian/vim?rev=1059&op=diff
==============================================================================
--- trunk/packages/vim/debian/lintian/vim (original)
+++ trunk/packages/vim/debian/lintian/vim Tue Oct 9 16:32:59 2007
@@ -1,1 +1,1 @@
-vim: binary-without-manpage vim.basic
+vim binary: binary-without-manpage usr/bin/vim.basic
Modified: trunk/packages/vim/debian/lintian/vim-variant
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/lintian/vim-variant?rev=1059&op=diff
==============================================================================
--- trunk/packages/vim/debian/lintian/vim-variant (original)
+++ trunk/packages/vim/debian/lintian/vim-variant Tue Oct 9 16:32:59 2007
@@ -1,1 +1,1 @@
- at PKG@: binary-without-manpage vim. at VARIANT@
+ at PKG@ binary: binary-without-manpage usr/bin/vim. at VARIANT@
Modified: trunk/packages/vim/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/rules?rev=1059&op=diff
==============================================================================
--- trunk/packages/vim/debian/rules (original)
+++ trunk/packages/vim/debian/rules Tue Oct 9 16:32:59 2007
@@ -176,6 +176,8 @@
quilt pop -a || test $$? = 2
rm -rf .pc
rm -rf $(SRCDIR)
+ rm -rf debian/policy/vim-policy.html
+ rm -f debian/policy/vim-policy.txt
rm -f vim
dh_clean
@@ -190,6 +192,10 @@
rm -f $(DOT_IN_DEPS)
clean-vim-tiny:
+ for x in $(PER_VARIANT_FILES) ; do \
+ rm -f debian/vim-tiny.$$x ; \
+ done
+ rm -f debian/lintian/vim-tiny
if [ -e patch-stamp-vim-tiny ]; then \
patch -Rp0 < debian/tiny/vimrc.tiny.diff; \
rm -f patch-stamp-vimrc-tiny; \
@@ -199,7 +205,6 @@
for x in $(PER_VARIANT_FILES) ; do \
rm -f debian/$*.$$x ; \
done
- rm -f debian/vim.links
rm -f debian/lintian/$*
build: extract
Added: trunk/packages/vim/upstream/patches/7.1.136
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.136?rev=1059&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.136 (added)
+++ trunk/packages/vim/upstream/patches/7.1.136 Tue Oct 9 16:32:59 2007
@@ -1,0 +1,47 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.136
+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.136
+Problem: Memory leak when using Ruby syntax highlighting. (Dominique Pelle)
+Solution: Free the contained-in list.
+Files: src/syntax.c
+
+
+*** ../vim-7.1.135/src/syntax.c Thu Aug 30 19:36:52 2007
+--- src/syntax.c Sun Oct 7 15:10:54 2007
+***************
+*** 3354,3359 ****
+--- 3354,3360 ----
+ {
+ vim_free(SYN_ITEMS(buf)[i].sp_cont_list);
+ vim_free(SYN_ITEMS(buf)[i].sp_next_list);
++ vim_free(SYN_ITEMS(buf)[i].sp_syn.cont_in_list);
+ }
+ }
+
+*** ../vim-7.1.135/src/version.c Wed Oct 3 14:30:54 2007
+--- src/version.c Sun Oct 7 15:20:22 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 136,
+ /**/
+
+--
+Every engineer dreams about saving the universe and having sex with aliens.
+This is much more glamorous than the real life of an engineer, which consists
+of hiding from the universe and having sex without the participation of other
+life forms. (Scott Adams - The Dilbert principle)
+
+ /// 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.137
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.137?rev=1059&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.137 (added)
+++ trunk/packages/vim/upstream/patches/7.1.137 Tue Oct 9 16:32:59 2007
@@ -1,0 +1,49 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.137
+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.137
+Problem: Build failure when using EXITFREE. (Dominique Pelle)
+Solution: Add an #ifdef around using clip_exclude_prog.
+Files: src/misc2.c
+
+
+*** ../vim-7.1.136/src/misc2.c Sat Sep 29 14:15:00 2007
+--- src/misc2.c Sun Sep 30 18:00:09 2007
+***************
+*** 1037,1043 ****
+--- 1038,1046 ----
+
+ /* Free some global vars. */
+ vim_free(username);
++ # ifdef FEAT_CLIPBOARD
+ vim_free(clip_exclude_prog);
++ # endif
+ vim_free(last_cmdline);
+ vim_free(new_last_cmdline);
+ set_keep_msg(NULL, 0);
+*** ../vim-7.1.136/src/version.c Sun Oct 7 15:21:31 2007
+--- src/version.c Sun Oct 7 15:42:26 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 137,
+ /**/
+
+--
+For society, it's probably a good thing that engineers value function over
+appearance. For example, you wouldn't want engineers to build nuclear power
+plants that only _look_ like they would keep all the radiation inside.
+ (Scott Adams - The Dilbert principle)
+
+ /// 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.138
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.138?rev=1059&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.138 (added)
+++ trunk/packages/vim/upstream/patches/7.1.138 Tue Oct 9 16:32:59 2007
@@ -1,0 +1,66 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.138
+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.138
+Problem: The Perl Msg() function doesn't stop when "q" is typed at the more
+ prompt. (Hari Krishna Dara)
+Solution: Check got_int.
+Files: src/if_perl.xs
+
+
+*** ../vim-7.1.137/src/if_perl.xs Sat Sep 15 14:48:57 2007
+--- src/if_perl.xs Wed Oct 3 17:00:16 2007
+***************
+*** 445,457 ****
+ char *next;
+ char *token = (char *)s;
+
+! while ((next = strchr(token, '\n')))
+ {
+ *next++ = '\0'; /* replace \n with \0 */
+ msg_attr((char_u *)token, attr);
+ token = next;
+ }
+! if (*token)
+ msg_attr((char_u *)token, attr);
+ }
+
+--- 445,457 ----
+ char *next;
+ char *token = (char *)s;
+
+! while ((next = strchr(token, '\n')) && !got_int)
+ {
+ *next++ = '\0'; /* replace \n with \0 */
+ msg_attr((char_u *)token, attr);
+ token = next;
+ }
+! if (*token && !got_int)
+ msg_attr((char_u *)token, attr);
+ }
+
+*** ../vim-7.1.137/src/version.c Sun Oct 7 15:44:28 2007
+--- src/version.c Tue Oct 9 10:45:08 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 138,
+ /**/
+
+--
+A consultant is a person who takes your money and annoys your employees while
+tirelessly searching for the best way to extend the consulting contract.
+ (Scott Adams - The Dilbert principle)
+
+ /// 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