r1072 - in /trunk/packages: vim-latexsuite/debian/ vim/debian/ vim/patches/ vim/runtime/

[jamessan at users.alioth.debian.org]

Author: jamessan
Date: Sun Oct 28 23:14:53 2007
New Revision: 1072

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1072
Log:
Merge Martin's runtime work onto the trunk

Added:
    trunk/packages/vim/runtime/
      - copied from r1071, branches/madduck-debruntime-move/packages/vim/runtime/
Removed:
    trunk/packages/vim/patches/debchangelog-closes_omni.vim.diff
    trunk/packages/vim/patches/debchangelog-ftplugin.vim.diff
    trunk/packages/vim/patches/debcontrol.vim.diff
    trunk/packages/vim/patches/php.vim.diff
    trunk/packages/vim/patches/zh_TW.po-swap_recovery_typo.diff
Modified:
    trunk/packages/vim-latexsuite/debian/watch
    trunk/packages/vim/debian/rules
    trunk/packages/vim/debian/vim-runtime.install.in
    trunk/packages/vim/patches/series

Modified: trunk/packages/vim-latexsuite/debian/watch
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim-latexsuite/debian/watch?rev=1072&op=diff
==============================================================================
--- trunk/packages/vim-latexsuite/debian/watch (original)
+++ trunk/packages/vim-latexsuite/debian/watch Sun Oct 28 23:14:53 2007
@@ -1,2 +1,2 @@
 version=3
-opts="dversionmangle=s/^0\.//" http://vim-latex.sourceforge.net/download/latexSuite(200.*)\.tar\.gz     debian  uupdate
+opts="dversionmangle=s/^0\.//" https://vim-latex.sourceforge.net/download/latexSuite(200.*)\.tar\.gz     debian  uupdate

Modified: trunk/packages/vim/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/rules?rev=1072&op=diff
==============================================================================
--- trunk/packages/vim/debian/rules (original)
+++ trunk/packages/vim/debian/rules Sun Oct 28 23:14:53 2007
@@ -154,6 +154,8 @@
 	  cat upstream/patches/$$f | patch -s -d$(SRCDIR) -p0 ;\
 	done
 	quilt push -a || test $$? = 2
+	echo "replacing upstream po files with our own"
+	cp $(wildcard runtime/lang/po/*) vim/src/po
 	touch $@
 
 extract-stamp-%.bz2:

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=1072&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-runtime.install.in (original)
+++ trunk/packages/vim/debian/vim-runtime.install.in Sun Oct 28 23:14:53 2007
@@ -3,3 +3,5 @@
 debian/tmp/usr/share/vim/				usr/share/
 debian/tmp/usr/share/man/man1/vimtutor.1		usr/share/man/man1/
 debian/vim-registry/*.yaml				usr/share/vim/registry/
+runtime/ftplugin/*					usr/share/vim/@VIMCUR@/ftplugin
+runtime/syntax/*					usr/share/vim/@VIMCUR@/syntax

Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=1072&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Sun Oct 28 23:14:53 2007
@@ -1,21 +1,16 @@
 xdefaults.vim.diff -p0
-debcontrol.vim.diff -p0
 po.vim.diff -p0
 python.vim-ftplugin_include.diff -p0
 mysql.vim-syntax_comment.diff -p0
-debchangelog-ftplugin.vim.diff -p0
 scripts.vim.diff -p0
-php.vim.diff -p0
 filetype.vim-better_tex_vs_plaintex.diff -p0
 perl.vim-ftplugin_perldoc.diff -p0
 ruby.vim-ftplugin_ri.diff -p0
 python.vim-ftplugin_pydoc.diff -p0
 dosini.vim-hash_comment.diff -p0
-zh_TW.po-swap_recovery_typo.diff -p0
 changelog.vim-date_end_entry.diff -p0
 javac_cmdline-vim.diff -p0
 Makefile_no-strip.diff -p0
-debchangelog-closes_omni.vim.diff -p0
 map.vim-syntax.diff -p0
 spell.c_getc-eof.diff -p0
 gui_gtk_x11.c_g_thread_init.diff -p0