xterm: Changes to 'debian-experimental'
debian/changelog | 6 ++++--
debian/control | 2 +-
debian/patches/900_debian_xterm.diff | 35 +++++++++++++++++------------------
debian/patches/902_windowops.diff | 14 ++++++++------
debian/patches/904_fontops.diff | 12 +++++++-----
5 files changed, 37 insertions(+), 32 deletions(-)
New commits:
commit 0a27f6f3557eb0c57046d2832e8f01c6a09859ac
Author: Sven Joachim <svenjoac@gmx.de>
Date: Thu Dec 4 18:51:26 2014 +0100
Upload to experimental
diff --git a/debian/changelog b/debian/changelog
index b37f369..aaf92c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xterm (313-1) UNRELEASED; urgency=low
+xterm (313-1) experimental; urgency=low
* New upstream release.
* Refresh Debian patches.
* Bump Standards-Version to 3.9.6, no changes needed.
- -- Sven Joachim <svenjoac@gmx.de> Sat, 29 Nov 2014 10:37:05 +0100
+ -- Sven Joachim <svenjoac@gmx.de> Thu, 04 Dec 2014 18:51:09 +0100
xterm (312-1) unstable; urgency=medium
commit 58c46d270d93953796bcf44179af3fc0b68a1705
Author: Sven Joachim <svenjoac@gmx.de>
Date: Thu Dec 4 18:45:22 2014 +0100
Bump Standards-Version to 3.9.6
diff --git a/debian/changelog b/debian/changelog
index 6d2292e..b37f369 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xterm (313-1) UNRELEASED; urgency=low
* New upstream release.
* Refresh Debian patches.
+ * Bump Standards-Version to 3.9.6, no changes needed.
-- Sven Joachim <svenjoac@gmx.de> Sat, 29 Nov 2014 10:37:05 +0100
diff --git a/debian/control b/debian/control
index da41d47..f118351 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Sven Joachim <svenjoac@gmx.de>
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-xorg/app/xterm.git
Vcs-Git: git://anonscm.debian.org/pkg-xorg/app/xterm
Homepage: http://invisible-island.net/xterm/xterm.html
commit d557d70a453e18e023eea3db743685197fa5ecbd
Author: Sven Joachim <svenjoac@gmx.de>
Date: Thu Dec 4 18:41:22 2014 +0100
Refresh Debian patches
diff --git a/debian/changelog b/debian/changelog
index 7174cec..6d2292e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xterm (313-1) UNRELEASED; urgency=low
* New upstream release.
+ * Refresh Debian patches.
-- Sven Joachim <svenjoac@gmx.de> Sat, 29 Nov 2014 10:37:05 +0100
diff --git a/debian/patches/900_debian_xterm.diff b/debian/patches/900_debian_xterm.diff
index 2d24da4..afa1da4 100644
--- a/debian/patches/900_debian_xterm.diff
+++ b/debian/patches/900_debian_xterm.diff
@@ -20,10 +20,15 @@ Make Debian-specific tweaks to xterm:
This patch by Branden Robinson.
-Index: xterm/termcap
-===================================================================
---- xterm.orig/termcap
-+++ xterm/termcap
+---
+ XTerm-col.ad | 42 +++++++++++++++++++++++++++---------------
+ XTerm.ad | 3 +++
+ termcap | 4 +++-
+ terminfo | 8 ++++++--
+ 4 files changed, 39 insertions(+), 18 deletions(-)
+
+--- a/termcap
++++ b/termcap
@@ -239,5 +239,7 @@ v0|xterm|X11 terminal emulator:\
# This fragment is for people who cannot agree on what the backspace key
@@ -33,10 +38,8 @@ Index: xterm/termcap
xterm+kbs|fragment for backspace key:\
- :kb=^H:
+ :kb=^?:
-Index: xterm/terminfo
-===================================================================
---- xterm.orig/terminfo
-+++ xterm/terminfo
+--- a/terminfo
++++ b/terminfo
@@ -137,6 +137,8 @@ xterm-new|modern xterm terminal emulator
use=xterm+pcfkeys,
use=xterm+tmux,
@@ -46,7 +49,7 @@ Index: xterm/terminfo
#
# Encode modifiers using parameters (see "Xterm Control Sequences" ctlseqs.ms).
# Note that this is unrelated to PCTERM.
-@@ -1967,11 +1969,13 @@ xterm-r5|xterm R5 version,
+@@ -1970,11 +1972,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.
@@ -62,11 +65,9 @@ Index: xterm/terminfo
xterm+kbs|fragment for backspace key,
- kbs=^H,
+ kbs=\177,
-Index: xterm/XTerm.ad
-===================================================================
---- xterm.orig/XTerm.ad
-+++ xterm/XTerm.ad
-@@ -159,6 +159,9 @@
+--- a/XTerm.ad
++++ b/XTerm.ad
+@@ -161,6 +161,9 @@
*tek4014*font3: 6x13
*tek4014*fontSmall: 6x10
@@ -76,10 +77,8 @@ Index: xterm/XTerm.ad
! If xterm is built with a toolbar, the widget hierarchy looks like this,
! showing widget name / class names. The complete menu hierarchy is built
! at startup because it is needed to make the layout work for the menubar:
-Index: xterm/XTerm-col.ad
-===================================================================
---- xterm.orig/XTerm-col.ad
-+++ xterm/XTerm-col.ad
+--- a/XTerm-col.ad
++++ b/XTerm-col.ad
@@ -37,9 +37,9 @@
*VT100*boldColors: on
*VT100*dynamicColors: on
diff --git a/debian/patches/902_windowops.diff b/debian/patches/902_windowops.diff
index 3a3d57f..630f116 100644
--- a/debian/patches/902_windowops.diff
+++ b/debian/patches/902_windowops.diff
@@ -1,8 +1,10 @@
-Index: xterm/xterm.man
-===================================================================
---- xterm.orig/xterm.man
-+++ xterm/xterm.man
-@@ -2416,8 +2416,9 @@ This is a comma-separated list of names,
+---
+ xterm.man | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/xterm.man
++++ b/xterm.man
+@@ -2543,8 +2543,9 @@ This is a comma-separated list of names,
from \fIdtterm\fP the operation number).
The default value is
.RS
@@ -12,4 +14,4 @@ Index: xterm/xterm.man
+(i.e. no operations are allowed).
.IP
The names are listed below.
- \fI\*n\fP ignores capitalization, but
+ \fI\*N\fP ignores capitalization, but
diff --git a/debian/patches/904_fontops.diff b/debian/patches/904_fontops.diff
index 5af2db9..4a0b58c 100644
--- a/debian/patches/904_fontops.diff
+++ b/debian/patches/904_fontops.diff
@@ -1,8 +1,10 @@
-Index: xterm/xterm.man
-===================================================================
---- xterm.orig/xterm.man
-+++ xterm/xterm.man
-@@ -1707,7 +1707,7 @@ The default is \*(``true\*(''.
+---
+ xterm.man | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/xterm.man
++++ b/xterm.man
+@@ -1814,7 +1814,7 @@ The default is \*(``true\*(''.
.TP
.B "allowFontOps (\fPclass\fB AllowFontOps)"
Specifies whether control sequences that set/query the font should be allowed.
Reply to: