r534 - in trunk/vim7: debian patches

[Stefano Zacchiroli]

Author: zack
Date: 2006-03-26 17:01:51 +0000 (Sun, 26 Mar 2006)
New Revision: 534

Removed:
   trunk/vim7/patches/303_option.c.diff
Modified:
   trunk/vim7/debian/changelog
   trunk/vim7/patches/series
Log:
- removed no longer needed patch for coping with empty $SHELL variable
  (vim7 automatically checks for empty variable values providing defaults)
- documented some of the recent work in debian/changelog


Modified: trunk/vim7/debian/changelog
===================================================================
--- trunk/vim7/debian/changelog	2006-03-26 16:49:28 UTC (rev 533)
+++ trunk/vim7/debian/changelog	2006-03-26 17:01:51 UTC (rev 534)
@@ -1,7 +1,7 @@
 vim (1:6.4+7.0b01-1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream snapshot (01).
+  * New upstream version (7.0 beta) and its snapshot (01).
 
   [ James Vega ]
   * Sync with the work that's been done on the 6.4 vim package.
@@ -17,6 +17,11 @@
   * debian/control:
     + Add Build-Depends on libxpm-dev and unzip.
 
+  [ Stefano Zacchiroli ]
+  * Screening of patches no longer needed with vim7 & pushing upstream
+    of as many debian-specific patches as possible. Results:
+    + removed patches: 303_option.c.diff, 305_term.c.diff
+
  -- James Vega <jamessan at debian.org>  Sat, 25 Mar 2006 18:57:21 -0500
 
 vim (1:6.4-007+1) unstable; urgency=low

Deleted: trunk/vim7/patches/303_option.c.diff
===================================================================
--- trunk/vim7/patches/303_option.c.diff	2006-03-26 16:49:28 UTC (rev 533)
+++ trunk/vim7/patches/303_option.c.diff	2006-03-26 17:01:51 UTC (rev 534)
@@ -1,14 +0,0 @@
-Index: vim/src/option.c
-===================================================================
---- vim/src/option.c.orig
-+++ vim/src/option.c
-@@ -2931,7 +2931,8 @@
- # endif
- #endif
- 	    )
--	set_string_default("sh", p);
-+	if (strlen(p) != 0)
-+	    set_string_default("sh", p);
- 
- #ifdef FEAT_WILDIGN
-     /*

Modified: trunk/vim7/patches/series
===================================================================
--- trunk/vim7/patches/series	2006-03-26 16:49:28 UTC (rev 533)
+++ trunk/vim7/patches/series	2006-03-26 17:01:51 UTC (rev 534)
@@ -30,4 +30,3 @@
 201_fr.po.diff -p0
 203_zh_TW.UTF8.po.diff -p0
 301_xxd.c.diff -p0
-303_option.c.diff -p0