xterm: Changes to 'debian-unstable'
debian/changelog | 6 ++++++
debian/patches/900_debian_xterm.diff | 13 ++++++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 1f83b7be6e4a87d302aef83ee3179c38807dae83
Author: Sven Joachim <svenjoac@gmx.de>
Date: Mon Dec 12 16:11:44 2011 +0100
Disable rmm and smm features in xterm-new rather than xterm
Otherwise they become enabled in other popular entries based on
xterm-new like xterm-256color, which is not what we want.
diff --git a/debian/changelog b/debian/changelog
index 86d3abd..9c24076 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
xterm (276-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Pass -DFOO in CPPFLAGS, not CFLAGS.
* Update copyright year in debian/copyright.
* Bump Standards-Version to 3.9.2, no changes needed.
* Remove David Nusinow from Uploaders.
+ [ Sven Joachim ]
+ * Update 900_debian_xterm.diff:
+ - Disable rmm and smm features in xterm-new rather than xterm, so
+ that they do not become enabled in e.g. xterm-256color.
+
-- Julien Cristau <jcristau@debian.org> Sat, 15 Oct 2011 20:54:36 +0200
xterm (276-1) unstable; urgency=low
diff --git a/debian/patches/900_debian_xterm.diff b/debian/patches/900_debian_xterm.diff
index c433806..6e42884 100644
--- a/debian/patches/900_debian_xterm.diff
+++ b/debian/patches/900_debian_xterm.diff
@@ -38,14 +38,21 @@ Index: xterm/terminfo
===================================================================
--- xterm.orig/terminfo
+++ xterm/terminfo
-@@ -1963,11 +1963,15 @@ xterm-r5|xterm R5 version,
+@@ -139,6 +139,8 @@ xterm-new|modern xterm terminal emulator
+ use=xterm+pcfkeys,
+ use=xterm+tmux,
+ use=xterm-basic,
++ rmm@,
++ smm@,
+ #
+ # Encode modifiers using parameters (see "Xterm Control Sequences" ctlseqs.ms).
+ # Note that this is unrelated to PCTERM.
+@@ -1963,11 +1965,13 @@ xterm-r5|xterm R5 version,
# This is the only entry which you should have to customize, since "xterm"
# is widely used for a variety of incompatible terminal emulations including
# color_xterm and rxvt.
-xterm|X11 terminal emulator,
+xterm|xterm-debian|X11 terminal emulator,
-+ rmm@,
-+ smm@,
use=xterm-new,
# use=xterm-r6,
Reply to: