r787 - in /trunk/packages/vim: debian/README debian/changelog upstream/patches/7.0.123

zack at users.alioth.debian.org zack at users.alioth.debian.org
Tue Oct 10 10:47:57 UTC 2006


Author: zack
Date: Tue Oct 10 10:47:56 2006
New Revision: 787

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=787
Log:
new unreleased changelog entry
patch 123 (useless for us, but still ...);

Added:
    trunk/packages/vim/upstream/patches/7.0.123
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=787&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Tue Oct 10 10:47:56 2006
@@ -147,3 +147,4 @@
   1780  7.0.120  crash when using getreg('=') in the = register
   1549  7.0.121  GUI: dragging last status line doesn't work with text tabline
   2865  7.0.122  only half of double-wide bold character may be drawn
+  4200  7.0.123  SCO Openserver: configure selects the wrong terminal library

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=787&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue Oct 10 10:47:56 2006
@@ -1,9 +1,12 @@
-vim (1:7.0-122+2) unstable; urgency=low
+vim (1:7.0-123+1) UNRELEASED; urgency=low
+
+  [ Debian Vim Maintainers ]
+  * New upstream patches (123 - XXX), see README.gz for details.
 
   [ James Vega ]
   * Bump vim-common's priority to important to match the override.
 
- -- James Vega <jamessan at debian.org>  Tue, 10 Oct 2006 02:16:03 -0400
+ -- Stefano Zacchiroli <zack at debian.org>  Tue, 10 Oct 2006 12:46:55 +0200
 
 vim (1:7.0-122+1) unstable; urgency=medium
 

Added: trunk/packages/vim/upstream/patches/7.0.123
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.123?rev=787&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.123 (added)
+++ trunk/packages/vim/upstream/patches/7.0.123 Tue Oct 10 10:47:56 2006
@@ -1,0 +1,112 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.123
+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.123
+Problem:    On SCO Openserver configure selects the wrong terminal library.
+Solution:   Put terminfo before the other libraries. (Roger Cornelius)
+	    Also fix a small problem compiling on Mac without Darwin.
+Files:	    src/configure.in, src/auto/configure
+
+
+*** ../vim-7.0.122/src/configure.in	Tue Sep  5 17:30:25 2006
+--- src/configure.in	Thu Oct  5 22:01:13 2006
+***************
+*** 681,687 ****
+  	AC_MSG_CHECKING([if -pthread should be used])
+  	threadsafe_flag=
+  	thread_lib=
+! 	if test "x$MACOSX" != "xyes"; then
+  	  test "$GCC" = yes && threadsafe_flag="-pthread"
+  	  if test "`(uname) 2>/dev/null`" = FreeBSD; then
+  	    threadsafe_flag="-D_THREAD_SAFE"
+--- 681,688 ----
+  	AC_MSG_CHECKING([if -pthread should be used])
+  	threadsafe_flag=
+  	thread_lib=
+! 	dnl if test "x$MACOSX" != "xyes"; then
+!         if test "`(uname) 2>/dev/null`" != Darwin; then
+  	  test "$GCC" = yes && threadsafe_flag="-pthread"
+  	  if test "`(uname) 2>/dev/null`" = FreeBSD; then
+  	    threadsafe_flag="-D_THREAD_SAFE"
+***************
+*** 2151,2158 ****
+    dnl  Newer versions of ncurses are preferred over anything.
+    dnl  Older versions of ncurses have bugs, get a new one!
+    dnl  Digital Unix (OSF1) should use curses (Ronald Schild).
+    case "`uname -s 2>/dev/null`" in
+! 	OSF1)	tlibs="ncurses curses termlib termcap";;
+  	*)	tlibs="ncurses termlib termcap curses";;
+    esac
+    for libname in $tlibs; do
+--- 2152,2160 ----
+    dnl  Newer versions of ncurses are preferred over anything.
+    dnl  Older versions of ncurses have bugs, get a new one!
+    dnl  Digital Unix (OSF1) should use curses (Ronald Schild).
++   dnl  On SCO Openserver should prefer termlib (Roger Cornelius).
+    case "`uname -s 2>/dev/null`" in
+! 	OSF1|SCO_SV)	tlibs="ncurses curses termlib termcap";;
+  	*)	tlibs="ncurses termlib termcap curses";;
+    esac
+    for libname in $tlibs; do
+*** ../vim-7.0.122/src/auto/configure	Tue Sep  5 17:30:25 2006
+--- src/auto/configure	Thu Oct  5 22:02:45 2006
+***************
+*** 4256,4262 ****
+  echo $ECHO_N "checking if -pthread should be used... $ECHO_C" >&6
+  	threadsafe_flag=
+  	thread_lib=
+! 	if test "x$MACOSX" != "xyes"; then
+  	  test "$GCC" = yes && threadsafe_flag="-pthread"
+  	  if test "`(uname) 2>/dev/null`" = FreeBSD; then
+  	    threadsafe_flag="-D_THREAD_SAFE"
+--- 4256,4262 ----
+  echo $ECHO_N "checking if -pthread should be used... $ECHO_C" >&6
+  	threadsafe_flag=
+  	thread_lib=
+! 	        if test "`(uname) 2>/dev/null`" != Darwin; then
+  	  test "$GCC" = yes && threadsafe_flag="-pthread"
+  	  if test "`(uname) 2>/dev/null`" = FreeBSD; then
+  	    threadsafe_flag="-D_THREAD_SAFE"
+***************
+*** 11555,11562 ****
+  else
+    echo "$as_me:$LINENO: result: empty: automatic terminal library selection" >&5
+  echo "${ECHO_T}empty: automatic terminal library selection" >&6
+!             case "`uname -s 2>/dev/null`" in
+! 	OSF1)	tlibs="ncurses curses termlib termcap";;
+  	*)	tlibs="ncurses termlib termcap curses";;
+    esac
+    for libname in $tlibs; do
+--- 11555,11562 ----
+  else
+    echo "$as_me:$LINENO: result: empty: automatic terminal library selection" >&5
+  echo "${ECHO_T}empty: automatic terminal library selection" >&6
+!               case "`uname -s 2>/dev/null`" in
+! 	OSF1|SCO_SV)	tlibs="ncurses curses termlib termcap";;
+  	*)	tlibs="ncurses termlib termcap curses";;
+    esac
+    for libname in $tlibs; do
+*** ../vim-7.0.122/src/version.c	Mon Oct  9 22:11:52 2006
+--- src/version.c	Tue Oct 10 11:37:26 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     123,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+12. Sing along at the opera.
+
+ /// 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