r941 - in /trunk/packages/vim: debian/README debian/changelog upstream/patches/7.1.001 upstream/patches/7.1.002
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Wed May 16 15:51:33 UTC 2007
Author: jamessan
Date: Wed May 16 15:51:33 2007
New Revision: 941
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=941
Log:
Upstream patches 001 - 002
Added:
trunk/packages/vim/upstream/patches/7.1.001
trunk/packages/vim/upstream/patches/7.1.002
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=941&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Wed May 16 15:51:33 2007
@@ -1,4 +1,4 @@
-Patches for Vim - Vi IMproved 7.1b
+Patches for Vim - Vi IMproved 7.1
The files in this directory contain source code changes to fix
problems in released versions of Vim. Each file also contains an
@@ -8,22 +8,22 @@
The best is to apply the patches in sequence. This avoids problems
when a patch depends on a previous patch. If you did not unpack the
extra archive, you may want to skip patches marked with "extra:".
-Similarly for the "lang" archive.
+Similarly for the "lang" archive. Or ignore errors for missing files.
Before patching, change to the top Vim directory, where the "src"
and "runtime" directories are located.
Depending on the version of "patch" that you use, you may have add
an argument to make it patch the right file:
- patch -p < 7.1b.001
- patch -p0 < 7.1b.001
+ patch -p < 7.1.001
+ patch -p0 < 7.1.001
After applying a patch, you need to compile Vim. There are no
patches for binaries.
Checksums for the patch files can be found in the file MD5.
-Individual patches for Vim 7.1b:
+Individual patches for Vim 7.1:
- SIZE NAME FIXES
- 9784 7.1b.001 (extra) random text in gui_w32.c
- 2143 7.1b.002 wrong computations when 'maxmem' is a large number
+ SIZE NAME FIXES
+ 2404 7.1.001 can't build with Gnome GUI
+ 2011 7.1.002 Oracle Pro*C/C++ files are not detected
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=941&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed May 16 15:51:33 2007
@@ -1,10 +1,13 @@
-vim (1:7.1-000+2) UNRELEASED; urgency=low
+vim (1:7.1-002+1) UNRELEASED; urgency=low
+
+ [ Debian Vim Maintainers ]
+ * New upstream patches (001 - 002), see README.gz for details.
[ James Vega ]
* Add changelog.vim-date_end_entry.diff, which fixes a variable name which
is let in changelog.vim. (Closes: #424224)
- -- James Vega <jamessan at debian.org> Wed, 16 May 2007 11:46:23 -0400
+ -- James Vega <jamessan at debian.org> Wed, 16 May 2007 11:50:44 -0400
vim (1:7.1-000+1) unstable; urgency=low
Added: trunk/packages/vim/upstream/patches/7.1.001
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.001?rev=941&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.001 (added)
+++ trunk/packages/vim/upstream/patches/7.1.001 Wed May 16 15:51:33 2007
@@ -1,0 +1,75 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.001
+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.1.001
+Problem: Still can't build with Gnome libraries.
+Solution: Fix typo in bind_textdomain_codeset. (Mike Kelly)
+Files: src/gui_gtk.c, src/gui_gtk_x11.c
+
+
+*** ../vim-7.1.000/src/gui_gtk.c Thu May 10 20:27:29 2007
+--- src/gui_gtk.c Mon May 14 14:40:54 2007
+***************
+*** 53,60 ****
+ # ifdef bindtextdomain
+ # undef bindtextdomain
+ # endif
+! # ifdef bindtextdomain_codeset
+! # undef bindtextdomain_codeset
+ # endif
+ # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS)
+ # define ENABLE_NLS /* so the texts in the dialog boxes are translated */
+--- 53,60 ----
+ # ifdef bindtextdomain
+ # undef bindtextdomain
+ # endif
+! # ifdef bind_textdomain_codeset
+! # undef bind_textdomain_codeset
+ # endif
+ # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS)
+ # define ENABLE_NLS /* so the texts in the dialog boxes are translated */
+*** ../vim-7.1.000/src/gui_gtk_x11.c Thu May 10 21:17:51 2007
+--- src/gui_gtk_x11.c Mon May 14 14:41:06 2007
+***************
+*** 36,43 ****
+ # ifdef bindtextdomain
+ # undef bindtextdomain
+ # endif
+! # ifdef bindtextdomain_codeset
+! # undef bindtextdomain_codeset
+ # endif
+ # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS)
+ # define ENABLE_NLS /* so the texts in the dialog boxes are translated */
+--- 36,43 ----
+ # ifdef bindtextdomain
+ # undef bindtextdomain
+ # endif
+! # ifdef bind_textdomain_codeset
+! # undef bind_textdomain_codeset
+ # endif
+ # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS)
+ # define ENABLE_NLS /* so the texts in the dialog boxes are translated */
+*** ../vim-7.1.000/src/version.c Sat May 12 16:34:15 2007
+--- src/version.c Mon May 14 14:42:19 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 1,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+127. You bring your laptop and cellular phone to church.
+
+ /// 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 ///
Added: trunk/packages/vim/upstream/patches/7.1.002
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.002?rev=941&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.002 (added)
+++ trunk/packages/vim/upstream/patches/7.1.002 Wed May 16 15:51:33 2007
@@ -1,0 +1,69 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.002
+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.1.002
+Problem: Oracle Pro*C/C++ files are not detected.
+Solution: Add the missing star. (Micah J. Cowan)
+Files: runtime/filetype.vim
+
+
+*** ../vim-7.1.001/runtime/filetype.vim Thu May 10 20:42:30 2007
+--- runtime/filetype.vim Tue May 15 09:12:06 2007
+***************
+*** 1,7 ****
+ " Vim support file to detect file types
+ "
+ " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2007 May 10
+
+ " Listen very carefully, I will say this only once
+ if exists("did_load_filetypes")
+--- 1,7 ----
+ " Vim support file to detect file types
+ "
+ " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2007 May 15
+
+ " Listen very carefully, I will say this only once
+ if exists("did_load_filetypes")
+***************
+*** 1286,1292 ****
+ au BufNewFile,BufRead *.it,*.ih setf ppwiz
+
+ " Oracle Pro*C/C++
+! au BufNewFile,BufRead .pc setf proc
+
+ " Privoxy actions file
+ au BufNewFile,BufRead *.action setf privoxy
+--- 1286,1292 ----
+ au BufNewFile,BufRead *.it,*.ih setf ppwiz
+
+ " Oracle Pro*C/C++
+! au BufNewFile,BufRead *.pc setf proc
+
+ " Privoxy actions file
+ au BufNewFile,BufRead *.action setf privoxy
+*** ../vim-7.1.001/src/version.c Mon May 14 19:35:51 2007
+--- src/version.c Tue May 15 09:13:11 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 2,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+132. You come back and check this list every half-hour.
+
+ /// 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