r508 - in trunk/vim7: debian patches
James Vega
jamessan at costa.debian.org
Wed Mar 1 14:57:13 UTC 2006
Author: jamessan
Date: 2006-03-01 14:57:12 +0000 (Wed, 01 Mar 2006)
New Revision: 508
Removed:
trunk/vim7/patches/160_makehtml.awk.diff
Modified:
trunk/vim7/debian/changelog
trunk/vim7/debian/rules
trunk/vim7/patches/series
Log:
Updated to 210 snapshot. Finished cleaning up debian/rules.
Modified: trunk/vim7/debian/changelog
===================================================================
--- trunk/vim7/debian/changelog 2006-02-27 14:36:32 UTC (rev 507)
+++ trunk/vim7/debian/changelog 2006-03-01 14:57:12 UTC (rev 508)
@@ -1,7 +1,7 @@
-vim (1:6.4+7.0aa.0208-1) UNRELEASED; urgency=low
+vim (1:6.4+7.0aa.0210-1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream snapshot (0208).
+ * New upstream snapshot (0210).
[ James Vega ]
* Sync with the work that's been done on the 6.4 vim package.
@@ -9,7 +9,7 @@
* debian/control:
+ Add Build-Depends on libxpm-dev and unzip.
- -- James Vega <jamessan at debian.org> Mon, 27 Feb 2006 09:34:31 -0500
+ -- James Vega <jamessan at debian.org> Tue, 28 Feb 2006 21:11:34 -0500
vim (1:6.4-007+1) unstable; urgency=low
Modified: trunk/vim7/debian/rules
===================================================================
--- trunk/vim7/debian/rules 2006-02-27 14:36:32 UTC (rev 507)
+++ trunk/vim7/debian/rules 2006-03-01 14:57:12 UTC (rev 508)
@@ -13,6 +13,10 @@
CFLAGS+=-O2
endif
+ifneq (,$(findstring test,$(DEB_BUILD_OPTIONS)))
+ MAKETEST = yes
+endif
+
INSTALL+=install
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL+=-s
@@ -156,7 +160,7 @@
NAME=vim
VERSION=7.0aa
-SNAPSHOT=0208
+SNAPSHOT=0210
DEBVERSION=6.4+$(VERSION).$(SNAPSHOT)
SRCDIR=$(NAME)$(subst .,,$(VERSION))
VIMCUR=$(SRCDIR)
@@ -273,20 +277,28 @@
@echo "*** DEBIAN *** INSTALLING VARIANT vim-basic"
dh_clean -k
dh_installdirs
-
+
# UPSTREAM INSTALLATION
-
+
cp $(SRCDIR)/src/{vim.basic,vim}
- $(MAKE) -C $(SRCDIR)/src DESTDIR=$(DESTDIR) install
-
+ $(MAKE) -C $(SRCDIR)/src DESTDIR=$(DESTDIR) installvimbin \
+ installtutorbin \
+ installruntime \
+ installtools \
+ install-icons \
+ install-languages
+ if [ "X$(MAKETEST)" = "Xyes" ]; then \
+ $(MAKE) -C $(SRCDIR)/src DESTDIR=$(DESTDIR) test; \
+ fi
+
# DEBIAN INSTALLATION
-
+
# disabled, waiting for an update
#cp debian/vim-install $(DESTDIR)/usr/bin
mv $(DESTDIR)/usr/bin/{vim,vim.basic} # use variant name
ln -fs $(VIMCUR) $(DESTDIR)/usr/share/vim/vimcurrent # vimcur symlink
# rm stuff handled by alternatives
- rm -f $(DESTDIR)/usr/bin/{ex,view,rvim,rview,vimdiff}
+ #rm -f $(DESTDIR)/usr/bin/{ex,view,rvim,rview,vimdiff}
@for f in `find $(DESTDIR)/usr/share/man -name view.1 -o -name rview.1 -o -name rvim.1 -o -name ex.1`; do \
rm -f $$f; \
done
@@ -297,7 +309,7 @@
# helpztags manpage
pod2man -c "User Commands" -s 1 -q none -r "vim 7.0aa" \
-d "September 2003" debian/helpztags debian/helpztags.1
-
+
# variant-related installations for package "vim"
# to be kept in sync with those in "install-stamp-%" target
for x in $(PER_VARIANT_FILES) ; do \
@@ -308,7 +320,7 @@
done
sed -e "s:@PKG@:vim:;s:@VARIANT@:basic:" \
debian/lintian/vim-variant > debian/lintian/vim
-
+
dh_installman
dh_install -X.svn --fail-missing
# remove things that are in vim-gui-common
@@ -321,13 +333,13 @@
done
rmdir debian/vim-gui-common/usr/bin
dh_link
-
+
# all excepts vim
dh_installchangelogs -Nvim
dh_installdocs
dh_installmenu
dh_installmime
-
+
touch $@
# the other variants only include the binary
@@ -339,17 +351,17 @@
@echo "*** DEBIAN *** INSTALLING VARIANT $*"
dh_clean -k
dh_installdirs
-
+
# variant-related installations
# to be kept in sync with those in "install-stamp-vim-basic" target
for x in $(PER_VARIANT_FILES) ; do \
if [ "$*" = "vim-tiny" ]; then \
sed -e "s:@PKG@:$*:" -e "s:@VARIANT@:$(patsubst vim-%,%,$*):" \
- -e "s:@DESTDIR@:$(VIMCUR)/src:" -e "s:@COMMON@:vim-common:" \
+ -e "s:@DESTDIR@:$(SRCDIR)/src:" -e "s:@COMMON@:vim-common:" \
debian/vim-variant.$$x > debian/$*.$$x ;\
else \
sed -e "s:@PKG@:$*:" -e "s:@VARIANT@:$(patsubst vim-%,%,$*):" \
- -e "s:@DESTDIR@:$(VIMCUR)/src:" -e "s:@COMMON@:vim-gui-common:" \
+ -e "s:@DESTDIR@:$(SRCDIR)/src:" -e "s:@COMMON@:vim-gui-common:" \
debian/vim-variant.$$x > debian/$*.$$x ;\
fi \
done
@@ -361,7 +373,7 @@
fi
dh_install -X.svn
dh_link
-
+
touch $@
uninstall:
Deleted: trunk/vim7/patches/160_makehtml.awk.diff
===================================================================
--- trunk/vim7/patches/160_makehtml.awk.diff 2006-02-27 14:36:32 UTC (rev 507)
+++ trunk/vim7/patches/160_makehtml.awk.diff 2006-03-01 14:57:12 UTC (rev 508)
@@ -1,13 +0,0 @@
-Index: vim/runtime/doc/makehtml.awk
-===================================================================
---- vim/runtime/doc/makehtml.awk.orig
-+++ vim/runtime/doc/makehtml.awk
-@@ -581,7 +581,7 @@
- ntags=split(atag,blata,"[ ]");
- if ( ntags > 1 ) { return; }
- if ( ( allow_one_char == "no" ) && \
-- ( index("!#$%\&'()+,-./0:;=?@ACINX\\[\\]^_`at\\{\\}~",atag) !=0 ) ) {
-+ ( index("!#$%&'()+,-./0:;=?@ACINX\\[\\]^_`at\\{\\}~",atag) !=0 ) ) {
- return;
- }
- if ( skip_word[atag] == "yes" ) { return; }
Modified: trunk/vim7/patches/series
===================================================================
--- trunk/vim7/patches/series 2006-02-27 14:36:32 UTC (rev 507)
+++ trunk/vim7/patches/series 2006-03-01 14:57:12 UTC (rev 508)
@@ -31,7 +31,6 @@
156_scripts.vim.diff -p0
157_slrnrc.vim.diff -p0
159_netrw.vim.diff -p0
-160_makehtml.awk.diff -p0
201_fr.po.diff -p0
203_zh_TW.UTF8.po.diff -p0
301_xxd.c.diff -p0
More information about the pkg-vim-maintainers
mailing list