r654 - in /trunk/packages/vim/debian: changelog rules
vim-common.install.in vim-runtime.install.in
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Wed May 10 22:04:52 UTC 2006
Author: zack
Date: Wed May 10 22:04:51 2006
New Revision: 654
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=654
Log:
- handle .in files as autoconf files, instantiating the @VIMCUR@ placeholder
- got rit of the /usr/share/vim/vimcurrent symlink (no longer needed)
Modified:
trunk/packages/vim/debian/changelog
trunk/packages/vim/debian/rules
trunk/packages/vim/debian/vim-common.install.in
trunk/packages/vim/debian/vim-runtime.install.in
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=654&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed May 10 22:04:51 2006
@@ -18,7 +18,13 @@
+ Update debian/rules to use the src/lang/extra tarballs instead of one
zip file.
- -- James Vega <jamessan at debian.org> Wed, 10 May 2006 12:50:35 -0400
+ [ Stefano Zacchiroli ]
+ * handle debian/*.in files as autoconf files filling the @VIMCUR@
+ placeholder with the appropriate vim<version> string
+ * got rid of the /usr/share/vim/vimcurrent symlink, no longer needed now we
+ source debian.vim
+
+ -- James Vega <jamessan at debian.org> Wed, 10 May 2006 17:03:28 -0500
vim (1:6.4+7.0g01-1) experimental; urgency=low
Modified: trunk/packages/vim/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/rules?rev=654&op=diff
==============================================================================
--- trunk/packages/vim/debian/rules (original)
+++ trunk/packages/vim/debian/rules Wed May 10 22:04:51 2006
@@ -178,6 +178,13 @@
LANGS += pl pl.ISO8859-2 pl.UTF-8
LANGS += ru.KOI8-R ru.UTF-8
+DOT_IN_DEPS = debian/vim-runtime.install
+DOT_IN_DEPS += debian/vim-runtime.install
+DOT_IN_DEPS += debian/vim-common.install
+DOT_IN_DEPS += debian/vim-gui-common.install
+DOT_IN_DEPS += debian/vim-common.links
+DOT_IN_DEPS += debian/vim-gui-common.links
+
# nothing to do per default
all:
@@ -261,6 +268,7 @@
vim-runtime.install; do \
rm -f debian/$$x; \
done
+ rm -f $(DOT_IN_DEPS)
clean-%:
for x in $(PER_VARIANT_FILES) ; do \
@@ -304,7 +312,7 @@
install-stamp-vim-basic: export DH_OPTIONS=-pvim-runtime -pvim-common -pvim-gui-common -pvim -pvim-doc
install-stamp-vim-basic: DESTDIR=$(CURDIR)/debian/tmp
-install-stamp-vim-basic: build-stamp-vim-basic
+install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS)
dh_testdir
dh_testroot
@echo "*** DEBIAN *** INSTALLING VARIANT vim-basic"
@@ -329,7 +337,6 @@
# 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}
@for f in `find $(DESTDIR)/usr/share/man -name view.1 -o -name ex.1`; do \
@@ -361,19 +368,16 @@
# Generate language-specific sections of
# vim-{runtime,common,gui-common}.install files
- cp debian/vim-runtime.install{.in,}
@for L in $(LANGS); do \
echo debian/tmp/usr/share/man/$$L/man1/vimtutor.1 \
usr/share/man/$$L/man1/ >>debian/vim-runtime.install; \
done
- cp debian/vim-common.install{.in,}
@for L in $(LANGS); do \
echo debian/tmp/usr/share/man/$$L/man1/\* \
usr/share/man/$$L/man1/ >>debian/vim-common.install; \
done
- cp debian/vim-gui-common.install{.in,}
@for L in $(LANGS); do \
echo debian/tmp/usr/share/man/$$L/man1/evim.1 \
usr/share/man/$$L/man1/ >>debian/vim-gui-common.install; \
@@ -402,7 +406,6 @@
rmdir debian/vim-gui-common/usr/bin
# Generate language-specific sections of
# vim-{common,gui-common}.links files
- cp debian/vim-common.links{.in,}
@for L in $(LANGS); do \
for p in rvim rview; do \
echo usr/share/man/$$L/man1/vim.1 \
@@ -410,7 +413,6 @@
done; \
done
- cp debian/vim-gui-common.links{.in,}
@for L in $(LANGS); do \
for p in gview rgvim rgview; do \
echo usr/share/man/$$L/man1/gvim.1 \
@@ -474,6 +476,9 @@
rm -f install-stamp*
dh_clean
+%: %.in
+ cat $< | sed 's/@VIMCUR@/$(VIMCUR)/' > $@
+
binary-indep: export DH_OPTIONS=-i
binary-indep: build install
dh_testdir
Modified: trunk/packages/vim/debian/vim-common.install.in
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-common.install.in?rev=654&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-common.install.in (original)
+++ trunk/packages/vim/debian/vim-common.install.in Wed May 10 22:04:51 2006
@@ -1,6 +1,6 @@
debian/tmp/usr/bin/xxd usr/bin/
debian/helpztags usr/bin/
debian/runtime/vimrc etc/vim/
-debian/runtime/debian.vim usr/share/vim/vimcurrent/
+debian/runtime/debian.vim usr/share/vim/@VIMCUR@/
debian/vim.presubj usr/share/bug/vim/
debian/tmp/usr/share/man/man1/* usr/share/man/man1/
Modified: trunk/packages/vim/debian/vim-runtime.install.in
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-runtime.install.in?rev=654&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-runtime.install.in (original)
+++ trunk/packages/vim/debian/vim-runtime.install.in Wed May 10 22:04:51 2006
@@ -1,5 +1,5 @@
debian/tmp/usr/bin/vimtutor usr/bin/
debian/tmp/usr/share/consolefonts/* usr/share/consolefonts/
debian/tmp/usr/share/vim/ usr/share/
-debian/updates/*.vim usr/share/vim/vimcurrent/syntax/
+debian/updates/*.vim usr/share/vim/@VIMCUR@/syntax/
debian/tmp/usr/share/man/man1/vimtutor.1 usr/share/man/man1/
More information about the pkg-vim-maintainers
mailing list