r720 - in /trunk/packages/vim: debian/README debian/changelog
debian/control upstream/patches/7.0.018
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Mon Jun 19 15:02:29 UTC 2006
Author: jamessan
Date: Mon Jun 19 15:02:27 2006
New Revision: 720
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=720
Log:
New upstream patch (018).
Make the Vim package binNMUable:
+ Remove vim-common Depends from vim-gui-common
+ Add 'dpkg-dev (>= 1.13.19)' Build-Depends
+ Update dependencies on 'Arch: all' Vim packages to use (= {source:Version})
+ Any packages which Depend on vim-gui-common now also Depend on vim-common (= {binary:Version}) for the vim-common Depends
Added:
trunk/packages/vim/upstream/patches/7.0.018
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
trunk/packages/vim/debian/control
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=720&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Mon Jun 19 15:02:27 2006
@@ -42,3 +42,4 @@
4485 7.0.015 Athena: type casts for lvalues
1810 7.0.016 recognize encodings "mac-roman", "dec-mcs" and "hp-roman8"
2302 7.0.017 (after 7.0.014) Motif: doesn't link with Motif 1.2 and earlier
+ 1649 7.0.018 VMS: plugins are not loaded on startup
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=720&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Mon Jun 19 15:02:27 2006
@@ -1,3 +1,13 @@
+vim (1:7.0-017+9) unstable; urgency=low
+
+ [ Debian Vim Maintainers ]
+ * New upstream patch (018), see README.gz for details.
+
+ [ James Vega ]
+ * debian/control: Make Vim binNMUable.
+
+ -- James Vega <jamessan at debian.org> Mon, 19 Jun 2006 10:55:13 -0400
+
vim (1:7.0-017+8) unstable; urgency=medium
* Rebuild with fixed libruby1.8. Urgency medium since vim-full and vim-ruby
Modified: trunk/packages/vim/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/control?rev=720&op=diff
==============================================================================
--- trunk/packages/vim/debian/control (original)
+++ trunk/packages/vim/debian/control Mon Jun 19 15:02:27 2006
@@ -4,7 +4,7 @@
Maintainer: Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
Uploaders: Norbert Tretkowski <nobse at debian.org>, Pierre Habouzit <madcoder at debian.org>, Matthijs Mohlmann <matthijs at cacholong.nl>, Stefano Zacchiroli <zack at debian.org>, Alexis Sukrieh <sukria at sukria.net>, Pepijn de Langen <pepijn at ce.et.tudelft.nl>, James Vega <jamessan at debian.org>
Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4.2.21), dpkg (>> 1.7.0), bzip2, perl (>= 5.6), libgpmg1-dev [!hurd-i386] | not+linux-gnu, libperl-dev (>= 5.6), tcl8.4-dev [!hurd-i386], python-dev, libxpm-dev, libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev (>= 2.2), libgnomeui-dev [!hurd-i386], lesstif2-dev, quilt, make (>= 3.80+3.81.b4)
+Build-Depends: debhelper (>= 4.2.21), dpkg (>> 1.7.0), dpkg-dev (>= 1.13.19), bzip2, perl (>= 5.6), libgpmg1-dev [!hurd-i386] | not+linux-gnu, libperl-dev (>= 5.6), tcl8.4-dev [!hurd-i386], python-dev, libxpm-dev, libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev (>= 2.2), libgnomeui-dev [!hurd-i386], lesstif2-dev, quilt, make (>= 3.80+3.81.b4)
Build-Conflicts: libperl-dev (= 5.8.4-1)
Package: vim-common
@@ -29,7 +29,6 @@
Package: vim-gui-common
Priority: optional
Architecture: all
-Depends: vim-common (= ${Source-Version})
Conflicts: vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-full (<< 1:6.4-001+3)
Replaces: manpages-pl (<=20060331-1), vim (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-full (<< 1:6.4-001+3)
Recommends: vim-gnome | vim-gtk | vim-lesstif | vim-perl | vim-python | vim-ruby | vim-tcl | vim-full
@@ -82,7 +81,7 @@
Package: vim-tiny
Priority: important
Architecture: any
-Depends: vim-common (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-common (= ${binary:Version}), ${shlibs:Depends}
Provides: editor
Description: Vi IMproved - enhanced vi editor - compact version
Vim is an almost compatible version of the UNIX editor Vi.
@@ -100,7 +99,7 @@
Package: vim
Priority: optional
Architecture: any
-Depends: vim-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: ctags, vim-doc, vim-scripts
Provides: editor
Conflicts: vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
@@ -119,7 +118,7 @@
Package: vim-perl
Priority: extra
Architecture: any
-Depends: vim-gui-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera
Provides: gvim
Conflicts: vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
@@ -137,7 +136,7 @@
Package: vim-python
Priority: extra
Architecture: any
-Depends: vim-gui-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera
Provides: gvim
Conflicts: vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
@@ -155,7 +154,7 @@
Package: vim-ruby
Priority: extra
Architecture: any
-Depends: vim-gui-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera
Provides: gvim
Conflicts: vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
@@ -173,7 +172,7 @@
Package: vim-tcl
Priority: extra
Architecture: any
-Depends: vim-gui-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera
Provides: gvim
Conflicts: vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
@@ -191,7 +190,7 @@
Package: vim-gtk
Priority: extra
Architecture: any
-Depends: vim-gui-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera
Provides: gvim
Conflicts: vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
@@ -209,7 +208,7 @@
Package: vim-lesstif
Priority: extra
Architecture: any
-Depends: vim-gui-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera
Provides: gvim
Conflicts: vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
@@ -227,7 +226,7 @@
Package: vim-gnome
Priority: extra
Architecture: any
-Depends: vim-gui-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera
Provides: gvim
Conflicts: vim-full (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
@@ -245,7 +244,7 @@
Package: vim-full
Priority: extra
Architecture: any
-Depends: vim-gui-common (= ${Source-Version}), vim-runtime (= ${Source-Version}), ${shlibs:Depends}
+Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera
Provides: gvim
Conflicts: vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
Added: trunk/packages/vim/upstream/patches/7.0.018
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.018?rev=720&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.018 (added)
+++ trunk/packages/vim/upstream/patches/7.0.018 Mon Jun 19 15:02:27 2006
@@ -1,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.018
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.018
+Problem: VMS: plugins are not loaded on startup.
+Solution: Remove "**" from the path. (Zoltan Arpadffy)
+Files: src/main.c
+
+
+*** ../vim-7.0.017/src/main.c Wed May 3 23:28:15 2006
+--- src/main.c Mon Jun 19 10:54:40 2006
+***************
+*** 564,570 ****
+--- 564,574 ----
+ */
+ if (p_lpl)
+ {
++ # ifdef VMS /* Somehow VMS doesn't handle the "**". */
++ source_runtime((char_u *)"plugin/*.vim", TRUE);
++ # else
+ source_runtime((char_u *)"plugin/**/*.vim", TRUE);
++ # endif
+ TIME_MSG("loading plugins");
+ }
+ #endif
+*** ../vim-7.0.017/src/version.c Sat May 13 17:26:10 2006
+--- src/version.c Mon Jun 19 10:55:29 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 18,
+ /**/
+
+--
+BLACK KNIGHT: Come on you pansy!
+ [hah] [parry thrust]
+ [ARTHUR chops the BLACK KNIGHT's right arm off]
+ARTHUR: Victory is mine! [kneeling]
+ We thank thee Lord, that in thy merc-
+ [Black Knight kicks Arthur in the head while he is praying]
+ The Quest for the Holy Grail (Monty Python)
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
More information about the pkg-vim-maintainers
mailing list