r1004 - in /trunk/packages/vim/debian: changelog rules tiny/features.txt tiny/vimrc.tiny.diff
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Tue Aug 7 17:43:41 UTC 2007
Author: jamessan
Date: Tue Aug 7 17:43:41 2007
New Revision: 1004
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1004
Log:
Fix up our vim-tiny building and prepare for upload.
Removed:
trunk/packages/vim/debian/tiny/features.txt
Modified:
trunk/packages/vim/debian/changelog
trunk/packages/vim/debian/rules
trunk/packages/vim/debian/tiny/vimrc.tiny.diff
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1004&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue Aug 7 17:43:41 2007
@@ -1,7 +1,7 @@
-vim (1:7.1-047+1) UNRELEASED; urgency=low
+vim (1:7.1-055+1) unstable; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (023 - 047), see README.gz for details.
+ * New upstream patches (023 - 055), see README.gz for details.
[ Pierre Habouzit ]
* Make sure reportbug vim/presubj is named that way, without a `vim.` prefix
@@ -20,8 +20,17 @@
* Remove the !hurd-i386 restriction from the tcl8.4-dev Build-Depends now
that the package exists on hurd-i386. This allows building the vim-tcl
package for hurd-i386. (Closes: #434435)
-
- -- James Vega <jamessan at debian.org> Thu, 02 Aug 2007 12:00:17 -0400
+ * Remove the hacks we were doing to try and build vim-tiny with extra
+ features. Simply build vim-tiny using Vim's "small" feature set.
+ * debian/rules:
+ - Separate out {clean,configure,build}-stamp-vim-tiny targets
+ - Move the handling of the vimrc.tiny patch to the new *-vim-tiny targets.
+ - Remove configure-stamp* files in the clean target.
+ * Add ruby.vim_indent.diff, which fixes some improper indenting for Ruby
+ files. (Closes: #431212)
+ * Refresh vimrc.tiny.diff
+
+ -- James Vega <jamessan at debian.org> Tue, 07 Aug 2007 13:42:54 -0400
vim (1:7.1-022+1) unstable; urgency=low
Modified: trunk/packages/vim/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/rules?rev=1004&op=diff
==============================================================================
--- trunk/packages/vim/debian/rules (original)
+++ trunk/packages/vim/debian/rules Tue Aug 7 17:43:41 2007
@@ -32,7 +32,6 @@
# "vim-tiny" features: in addition to those coming from the --with-features=xxx,
# "vim-tiny" is built with those listed in debian/tiny/features.txt
TINYFLAGS+=--with-features=small
-TINYFLAGS+=--disable-syntax
TINYFLAGS+=--disable-gui
TINYFLAGS+=--disable-xsmp
TINYFLAGS+=--disable-xsmp-interact
@@ -41,10 +40,6 @@
TINYFLAGS+=--disable-gpm
TINYFLAGS+=--enable-nls
TINYFLAGS+=--enable-multibyte
-TINYFLAGS+=--enable-multilang
-
-# add -DFEAT_* from debian/tiny/features.txt
-TINYCFLAGS:=$(patsubst %,-D%,$(shell grep ^FEAT_ debian/tiny/features.txt | cut -f 1))
OPTFLAGS+=--enable-gpm
OPTFLAGS+=--enable-cscope
@@ -135,8 +130,8 @@
CFLAGS_vim-basic=$(CFLAGS)
CFGFLAGS_vim-basic=$(CFGFLAGS) $(OPTFLAGS) --without-x --enable-gui=no
-CFLAGS_vim-tiny=$(CFLAGS) $(TINYCFLAGS)
-CFGFLAGS_vim-tiny=$(CFGFLAGS) $(TINYFLAGS)
+CFLAGS_vim-tiny=$(CFLAGS)
+CFGFLAGS_vim-tiny=$(CFGFLAGS)
CFLAGS_vim-perl=$(CFLAGS)
CFGFLAGS_vim-perl=$(CFGFLAGS) $(OPTFLAGS) $(GUIFLAGS) $(PERLFLAGS) $(GTK2FLAGS)
@@ -217,7 +212,7 @@
clean: $(foreach v,$(VARIANTS),clean-$(v))
dh_testdir
dh_testroot
- rm -f extract-stamp* build-stamp* install-stamp*
+ rm -f extract-stamp* build-stamp* install-stamp* configure-stamp*
rm -f debian/helpztags.1
quilt pop -a || test $$? = 2
rm -rf .pc
@@ -234,6 +229,12 @@
rm -f debian/$$x; \
done
rm -f $(DOT_IN_DEPS)
+
+clean-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 \
@@ -252,6 +253,19 @@
# -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 \
+ && CFLAGS="$(CFLAGS_$vim-tiny)" ./configure $(CFGFLAGS_$vim-tiny)
+ touch $@
+
configure-stamp-%:
dh_testdir
@echo "*** DEBIAN *** CONFIGURING VARIANT $*"
@@ -261,17 +275,21 @@
&& 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_$*)
build-stamp-%: configure-stamp-%
dh_testdir
@echo "*** DEBIAN *** BUILDING VARIANT $*"
- if [ "$*" = "vim-tiny" ]; then \
- patch -Np0 < debian/tiny/vimrc.tiny.diff; \
- fi
$(MAKE) -C $(SRCDIR) CFLAGS="$(CURCFLAGS)"
- if [ "$*" = "vim-tiny" ]; then \
- patch -Rp0 < debian/tiny/vimrc.tiny.diff; \
- fi
mv $(SRCDIR)/src/vim $(SRCDIR)/src/$(subst -,.,$*)
touch $@
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=1004&op=diff
==============================================================================
--- trunk/packages/vim/debian/tiny/vimrc.tiny.diff (original)
+++ trunk/packages/vim/debian/tiny/vimrc.tiny.diff Tue Aug 7 17:43:41 2007
@@ -26,7 +26,7 @@
} mparm_T;
/* Values for edit_type. */
-@@ -1442,6 +1445,8 @@
+@@ -1441,6 +1444,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)
-@@ -2692,7 +2697,14 @@
+@@ -2691,7 +2696,14 @@
* Get system wide defaults, if the file name is defined.
*/
#ifdef SYS_VIMRC_FILE
More information about the pkg-vim-maintainers
mailing list