r1230 - in /trunk/packages/vim: debian/changelog debian/rules debian/tiny/vimrc.tiny.diff patches/commandline-compatible.diff patches/series patches/vimrc.tiny.diff
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Tue Mar 11 00:28:31 UTC 2008
Author: jamessan
Date: Tue Mar 11 00:28:31 2008
New Revision: 1230
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1230
Log:
* Move debian/tiny/vimrc.tiny.diff into the quilt series and update it to
only be enabled when TINY_VIMRC is defined.
* debian/rules:
- Remove the special-case targets for vim-tiny and add -DTINY_VIMRC to the
CFLAGS used when building vim-tiny.
Added:
trunk/packages/vim/patches/vimrc.tiny.diff
Removed:
trunk/packages/vim/debian/tiny/vimrc.tiny.diff
Modified:
trunk/packages/vim/debian/changelog
trunk/packages/vim/debian/rules
trunk/packages/vim/patches/commandline-compatible.diff
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=1230&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue Mar 11 00:28:31 2008
@@ -10,6 +10,11 @@
expansions. (Closes: #468366)
* Change the debchangelog and debcontrol ftplugins to require enabling of
folding instead of folding by default.
+ * Move debian/tiny/vimrc.tiny.diff into the quilt series and update it to
+ only be enabled when TINY_VIMRC is defined.
+ * debian/rules:
+ - Remove the special-case targets for vim-tiny and add -DTINY_VIMRC to the
+ CFLAGS used when building vim-tiny.
-- James Vega <jamessan at debian.org> Wed, 27 Feb 2008 12:34:27 -0500
Modified: trunk/packages/vim/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/rules?rev=1230&op=diff
==============================================================================
--- trunk/packages/vim/debian/rules (original)
+++ trunk/packages/vim/debian/rules Tue Mar 11 00:28:31 2008
@@ -103,7 +103,7 @@
CFLAGS_vim-basic=$(CFLAGS)
CFGFLAGS_vim-basic=$(CFGFLAGS) $(OPTFLAGS) $(NOXFLAGS) $(NOINTERPFLAGS)
-CFLAGS_vim-tiny=$(CFLAGS)
+CFLAGS_vim-tiny=$(CFLAGS) -DTINY_VIMRC
CFGFLAGS_vim-tiny=$(CFGFLAGS) $(TINYFLAGS)
CFLAGS_vim-gtk=$(CFLAGS)
@@ -144,7 +144,7 @@
DOT_IN_DEPS += debian/runtime/debian.vim
# nothing to do per default
-all:
+all:
get-orig-source: $(ORIG_SOURCE)
@@ -220,16 +220,6 @@
done
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; \
- fi
-
clean-%:
for x in $(PER_VARIANT_FILES) ; do \
rm -f debian/$*.$$x ; \
@@ -246,19 +236,6 @@
# -c "helptags $(SRCDIR)/runtime/doc" -c quit
touch $@
-configure-stamp-vim-tiny:
- dh_testdir
- @echo "*** DEBIAN *** CONFIGURING VARIANT vim-tiny"
- $(MAKE) -C $(SRCDIR) clean
- if [ ! -e patch-stamp-vimrc-tiny ]; then \
- patch -Np0 < debian/tiny/vimrc.tiny.diff; \
- touch patch-stamp-vimrc-tiny; \
- fi
- cd $(SRCDIR) \
- && make distclean \
- && LDFLAGS="-Wl,--as-needed" CFLAGS="$(CFLAGS_vim-tiny)" ./configure $(CFGFLAGS_vim-tiny)
- touch $@
-
configure-stamp-%:
dh_testdir
@echo "*** DEBIAN *** CONFIGURING VARIANT $*"
@@ -266,16 +243,6 @@
cd $(SRCDIR) \
&& make distclean \
&& LDFLAGS="-Wl,--as-needed" CFLAGS="$(CFLAGS_$(*))" ./configure $(CFGFLAGS_$(*))
- touch $@
-
-build-stamp-vim-tiny: CURCFLAGS=$(CFLAGS_vim-tiny)
-build-stamp-vim-tiny: configure-stamp-vim-tiny
- dh_testdir
- @echo "*** DEBIAN *** BUILDING VARIANT vim-tiny"
- $(MAKE) -C $(SRCDIR) CFLAGS="$(CURCFLAGS)"
- patch -Rp0 < debian/tiny/vimrc.tiny.diff && \
- rm -f patch-stamp-vimrc-tiny
- mv $(SRCDIR)/src/vim $(SRCDIR)/src/$(subst -,.,vim-tiny)
touch $@
build-stamp-%: CURCFLAGS=$(CFLAGS_$*)
Modified: trunk/packages/vim/patches/commandline-compatible.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/commandline-compatible.diff?rev=1230&op=diff
==============================================================================
--- trunk/packages/vim/patches/commandline-compatible.diff (original)
+++ trunk/packages/vim/patches/commandline-compatible.diff Tue Mar 11 00:28:31 2008
@@ -12,15 +12,15 @@
/* Struct for various parameters passed between main() and other functions. */
typedef struct
{
-@@ -89,6 +92,7 @@
- #ifdef FEAT_DIFF
- int diff_mode; /* start with 'diff' set */
+@@ -92,6 +95,7 @@
+ #ifdef SYS_TINYRC_FILE
+ int vi_mode; /* started as "vi" */
#endif
+ int option_cp; /* 0, SET_CP, SET_NOCP */
} mparm_T;
/* Values for edit_type. */
-@@ -641,6 +645,13 @@
+@@ -644,6 +648,13 @@
}
#endif
@@ -34,7 +34,7 @@
#ifdef SPAWNO /* special MSDOS swapping library */
init_SPAWNO("", SWAP_ANY);
#endif
-@@ -1751,7 +1762,7 @@
+@@ -1758,7 +1769,7 @@
break;
case 'C': /* "-C" Compatible */
@@ -43,7 +43,7 @@
break;
case 'e': /* "-e" Ex mode */
-@@ -1824,7 +1835,7 @@
+@@ -1831,7 +1842,7 @@
break;
case 'N': /* "-N" Nocompatible */
Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=1230&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Tue Mar 11 00:28:31 2008
@@ -1,3 +1,4 @@
+vimrc.tiny.diff -p0
commandline-compatible.diff -p0
xdefaults.vim.diff -p0
po.vim.diff -p0
Added: trunk/packages/vim/patches/vimrc.tiny.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/vimrc.tiny.diff?rev=1230&op=file
==============================================================================
--- trunk/packages/vim/patches/vimrc.tiny.diff (added)
+++ trunk/packages/vim/patches/vimrc.tiny.diff Tue Mar 11 00:28:31 2008
@@ -1,0 +1,53 @@
+Index: vim/src/main.c
+===================================================================
+--- vim/src/main.c.orig
++++ vim/src/main.c
+@@ -89,6 +89,9 @@
+ #ifdef FEAT_DIFF
+ int diff_mode; /* start with 'diff' set */
+ #endif
++#ifdef SYS_TINYRC_FILE
++ int vi_mode; /* started as "vi" */
++#endif
+ } mparm_T;
+
+ /* Values for edit_type. */
+@@ -1470,6 +1473,10 @@
+ }
+ else if (STRNICMP(initstr, "vim", 3) == 0)
+ initstr += 3;
++#ifdef SYS_TINYRC_FILE
++ else if (STRNICMP(initstr, "vi", 2) == 0)
++ parmp->vi_mode = TRUE;
++#endif
+
+ /* Catch "[r][g]vimdiff" and "[r][g]viewdiff". */
+ if (STRICMP(initstr, "diff") == 0)
+@@ -2739,7 +2746,12 @@
+ * Get system wide defaults, if the file name is defined.
+ */
+ #ifdef SYS_VIMRC_FILE
+- (void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
++# if defined(SYS_TINYRC_FILE) && defined(TINY_VIMRC)
++ if (parmp->vi_mode)
++ (void)do_source((char_u *)SYS_TINYRC_FILE, FALSE, DOSO_NONE);
++ else
++# endif
++ (void)do_source((char_u *)SYS_VIMRC_FILE, FALSE, DOSO_NONE);
+ #endif
+ #ifdef MACOS_X
+ (void)do_source((char_u *)"$VIMRUNTIME/macmap.vim", FALSE, DOSO_NONE);
+Index: vim/src/os_unix.h
+===================================================================
+--- vim/src/os_unix.h.orig
++++ vim/src/os_unix.h
+@@ -237,6 +237,9 @@
+ /*
+ * Unix system-dependent file names
+ */
++#ifndef SYS_TINYRC_FILE
++# define SYS_TINYRC_FILE "$VIM/vimrc.tiny"
++#endif
+ #ifndef SYS_VIMRC_FILE
+ # define SYS_VIMRC_FILE "$VIM/vimrc"
+ #endif
More information about the pkg-vim-maintainers
mailing list