From af3da5b5f004a35bf2917500cacb77ce9141dfd4 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sat, 13 Oct 2012 23:32:37 +0000 Subject: [PATCH] ncurses 5.9 - patch 20121013 + add vte-2012, gnome-2012, making these the defaults for vte/gnome (patch by Christian Persch). --- NEWS | 6 +++++- dist.mk | 4 ++-- misc/terminfo.src | 20 ++++++++++++++++---- package/debian/changelog | 4 ++-- package/ncurses.spec | 2 +- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index 08378843..1763402b 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.1962 2012/10/06 19:48:38 tom Exp $ +-- $Id: NEWS,v 1.1963 2012/10/13 23:19:59 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,10 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20121013 + + add vte-2012, gnome-2012, making these the defaults for vte/gnome + (patch by Christian Persch). + 20121006 + improve CF_GCC_VERSION to work around Debian's customization of gcc --version message. diff --git a/dist.mk b/dist.mk index efdc70e5..993d58ca 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.895 2012/10/06 17:13:57 tom Exp $ +# $Id: dist.mk,v 1.896 2012/10/13 14:37:04 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 5 NCURSES_MINOR = 9 -NCURSES_PATCH = 20121006 +NCURSES_PATCH = 20121013 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/misc/terminfo.src b/misc/terminfo.src index fad20b76..48f9d207 100644 --- a/misc/terminfo.src +++ b/misc/terminfo.src @@ -6,8 +6,8 @@ # Report bugs and new terminal descriptions to # bug-ncurses@gnu.org # -# $Revision: 1.466 $ -# $Date: 2012/08/11 15:27:54 $ +# $Revision: 1.467 $ +# $Date: 2012/10/13 23:17:51 $ # # The original header is preserved below for reference. It is noted that there # is a "newer" version which differs in some cosmetic details (but actually @@ -4042,6 +4042,14 @@ vte-2008|VTE in GNOME Terminal snapshot 2.22.3, gnome-2008|GNOME Terminal snapshot 2.22.3, use=vte-2008, +# GNOME Terminal 3.6.0 (2012) +# VTE 0.34.1 refers to an unreleased version as of 2012-10-13 (0.34.0 was +# released 2012-09-26, 0.34.1 has not been marked in git) -TD +vte-2012|VTE 0.34.1, + ritm=\E[23m, sitm=\E[3m, use=xterm+pcc2, use=gnome-fc5, +gnome-2012|GNOME Terminal 3.6.0, + use=vte-2012, + # GNOME terminal may automatically use the contents of the "xterm" terminfo to # supply key information which is not built into the program. With 2.22.3, # this list is built into the program (which addresses the inadvertant use of @@ -4070,7 +4078,7 @@ gnome+pcfkeys|VTE's variation on xterm+pcfkeys, use=vte+pcfkeys, vte|VTE aka GNOME Terminal, - use=vte-2008, + use=vte-2012, gnome|GNOME Terminal, use=vte, @@ -4087,7 +4095,7 @@ gnome-256color|GNOME Terminal with xterm 256-colors, # Since most of the terminfo-related behavior is due to the VTE library, # the terminfo is the same as gnome-terminal. xfce|Xfce Terminal, - use=vte, + use=vte-2008, #### Other GNOME # Multi-Gnome-Terminal 1.6.2 @@ -22937,4 +22945,8 @@ v3220|LANPAR Vision II model 3220/3221/3222, # * add nsterm-256color, make this the default nsterm -TD # * remove bw from nsterm-bce, per testing with tack -TD # +# 2012-10-12 +# * add vte-2012, gnome-2012, making these the defaults for vte/gnome +# (patch by Christian Persch). +# ######## SHANTIH! SHANTIH! SHANTIH! diff --git a/package/debian/changelog b/package/debian/changelog index 2eb12520..4472e7c8 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20121006) unstable; urgency=low +ncurses6 (5.9-20121013) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 06 Oct 2012 14:53:14 -0400 + -- Thomas E. Dickey Sat, 13 Oct 2012 19:21:12 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/ncurses.spec b/package/ncurses.spec index 4609e863..0f65e387 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Release: 5.9 -Version: 20121006 +Version: 20121013 License: X11 Group: Development/Libraries Source: ncurses-%{release}-%{version}.tgz