xterm: Changes to 'debian-unstable'

2018-01-04 Thread Sven Joachim 
 debian/changelog |6 --
 debian/control   |4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 39cba4340e0f6519eb39343ee3f25538029d97c5
Author: Sven Joachim 
Date:   Thu Jan 4 18:06:19 2018 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 85ac070..322f2f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (331-1) UNRELEASED; urgency=medium
+xterm (331-1) unstable; urgency=medium
 
   * New upstream release.
 - Add workaround for improper grayscale adjustments made in FreeType
@@ -18,7 +18,7 @@ xterm (331-1) UNRELEASED; urgency=medium
   * Use https in the Homepage field.
   * Bump Standards-Version to 4.1.3, no changes needed.
 
- -- Sven Joachim   Sun, 31 Dec 2017 09:22:07 +0100
+ -- Sven Joachim   Thu, 04 Jan 2018 18:06:06 +0100
 
 xterm (330-2) unstable; urgency=medium
 

commit b4202389ea196e2e689813d77bfe3b2619fa1d6d
Author: Sven Joachim 
Date:   Thu Jan 4 17:56:21 2018 +0100

Bump Standards-Version to 4.1.3

diff --git a/debian/changelog b/debian/changelog
index 516bf50..85ac070 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ xterm (331-1) UNRELEASED; urgency=medium
   Closes: #869248).
   * Refresh Debian patches.
   * Use https in the Homepage field.
+  * Bump Standards-Version to 4.1.3, no changes needed.
 
  -- Sven Joachim   Sun, 31 Dec 2017 09:22:07 +0100
 
diff --git a/debian/control b/debian/control
index 3e9c6cd..711d5d9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: Sven Joachim 
-Standards-Version: 4.1.2
+Standards-Version: 4.1.3
 Rules-Requires-Root: no
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xterm.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/xterm.git

commit 526de7f24641c0373956096d4eb5a9a9eaa6e44b
Author: Sven Joachim 
Date:   Thu Jan 4 17:55:05 2018 +0100

Use https in the Homepage field

diff --git a/debian/changelog b/debian/changelog
index 26af065..516bf50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ xterm (331-1) UNRELEASED; urgency=medium
 - Fix typography in xterm.man (patch by Bjarni Ingi Gislason,
   Closes: #869248).
   * Refresh Debian patches.
+  * Use https in the Homepage field.
 
  -- Sven Joachim   Sun, 31 Dec 2017 09:22:07 +0100
 
diff --git a/debian/control b/debian/control
index 4bd0666..3e9c6cd 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 4.1.2
 Rules-Requires-Root: no
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xterm.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/xterm.git
-Homepage: http://invisible-island.net/xterm/xterm.html
+Homepage: https://invisible-island.net/xterm/xterm.html
 Build-Depends:
  libncurses5-dev | libncurses-dev,
  libxft-dev (>> 2.1.2), libxrender-dev (>> 1:0.9.0),

xterm: Changes to 'debian-unstable'

2017-12-31 Thread Sven Joachim 
 INSTALL  |   71 
 MANIFEST |3 
 Makefile.in  |4 
 NEWS |  149 +
 VTPrsTbl.c   |   12 
 aclocal.m4   |  107 
 button.c |   14 
 charproc.c   |  251 +-
 charsets.c   |   50 
 config.guess |  101 
 config.sub   |   46 
 configure| 3884 +++
 configure.in |   87 
 ctlseqs.ms   |  109 
 ctlseqs.txt  |  268 +-
 data.c   |   11 
 data.h   |4 
 debian/changelog |   20 
 debian/patches/900_debian_xterm.diff |   22 
 debian/patches/902_windowops.diff|   10 
 debian/patches/904_fontops.diff  |2 
 error.h  |   30 
 fontutils.c  |  414 +++
 fontutils.h  |3 
 graphics_regis.c |   27 
 html.c   |   38 
 linedata.c   |   95 
 main.c   |  328 +-
 menu.c   |   45 
 misc.c   |  318 ++
 package/debian/changelog |6 
 package/debian/copyright |   24 
 package/debian/rules |3 
 package/debian/watch |2 
 package/freebsd/Makefile |8 
 package/xterm.spec   |9 
 print.c  |   69 
 ptyx.h   |  145 +
 resize.man   |7 
 screen.c |   22 
 scrollbar.c  |   34 
 svg.c|   41 
 termcap  |   11 
 terminfo |  108 
 trace.c  |   29 
 trace.h  |8 
 util.c   |   99 
 version.h|6 
 vttests/query-status.pl  |   18 
 xcharmouse.h |3 
 xstrings.c   |4 
 xterm.h  |   38 
 xterm.log.html   |  243 ++
 xterm.man|  564 +++--
 xtermcfg.hin |5 
 55 files changed, 4998 insertions(+), 3031 deletions(-)

New commits:
commit 28ae50f27bda28e857006212620de614c175079c
Author: Sven Joachim 
Date:   Sun Dec 31 10:48:26 2017 +0100

Close bugs fixed in the new upstream release

diff --git a/debian/changelog b/debian/changelog
index 37f6151..26af065 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,20 @@
 xterm (331-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+- Add workaround for improper grayscale adjustments made in FreeType
+  library, exposed by changes to rounding in 2.8.1, which shows up as
+  a gap in line-drawing characters (Closes: #880407).
+- Replace constant 10msec delay for next X event with new resource
+  nextEventDelay, and reduce that to 1msec to accommodate faster machines
+  than used when -hold was implemented in 1999 (Closes: #877628).
+- Add scroll-to action, which simplifies binding a key to scroll to
+  the beginning or end of the saved-lines (Closes: #880120).
+- Improve workaround for #542434 by using the font's maximum width
+  when no ISO-8859-1 glyphs are provided (Closes: #879936).
+- Additional manpage macro cleanup (Branden Robinson, Closes: #880551).
+- Fix typography in xterm.man (patch by Bjarni Ingi Gislason,
+  Closes: #869248).
+  * Refresh Debian patches.
 
  -- Sven Joachim   Sun, 31 Dec 2017 09:22:07 +0100
 

commit f89c9ef19c062a1e52676492ec2cdabe051600ac
Author: Sven Joachim 
Date:   Sun Dec 31 10:11:44 2017 +0100

Refresh Debian patches

Both 900_debian_xterm.diff and 902_windowops.diff failed to apply.

diff --git a/debian/patches/900_debian_xterm.diff 
b/debian/patches/900_debian_xterm.diff
index 93ebedb..20c7a32 100644
--- a/debian/patches/900_debian_xterm.diff
+++ b/debian/patches/900_debian_xterm.diff
@@ -23,13 +23,13 @@ This patch by Branden Robinson.
 ---
  XTerm-col.ad |   42 +++---
  XTerm.ad |3 +++
- termcap  |4 +++-
+ termcap  |6 --
  terminfo |6 --
- 4 files changed, 37 insertions(+), 18 deletions(-)
+ 4 files changed, 38 insertions(+), 19 deletions(-)
 
 --- a/termcap
 +++ b/termcap
-@@ -239,5 +239,7 @@ v0|xterm|X11 terminal emulator:\
+@@ -243,6 +243,8 @@ v0|xterm|X11 terminal emulator:\
  
  # This fragment is for people who cannot agree on

xterm: Changes to 'debian-unstable'

2017-12-16 Thread Sven Joachim 
 debian/changelog|9 
 debian/control  |6 
 debian/local/xterm.faq.html |  680 ++--
 debian/rules|4 
 4 files changed, 675 insertions(+), 24 deletions(-)

New commits:
commit 93fa5b89065dc12dea3c307f532a1c0dd07eb4e4
Author: Sven Joachim 
Date:   Sat Dec 16 10:13:56 2017 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 01eef93..1f1fc8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (330-2) UNRELEASED; urgency=medium
+xterm (330-2) unstable; urgency=medium
 
   * Add two simple autopkg smoke tests.
   * Drop autotools-dev from Build-Depends, it is redundant now.
@@ -10,7 +10,7 @@ xterm (330-2) UNRELEASED; urgency=medium
   * Bump Standards-Version to 4.1.2, no changes needed.
   * Update copy of XTerm FAQ to revision 1.353 (dated 2017/11/11).
 
- -- Sven Joachim   Wed, 05 Jul 2017 22:58:37 +0200
+ -- Sven Joachim   Sat, 16 Dec 2017 10:13:24 +0100
 
 xterm (330-1) unstable; urgency=medium
 

commit 84534c677be0fa6ae9cc724e76b5696ba74e560b
Author: Sven Joachim 
Date:   Sat Dec 16 10:06:31 2017 +0100

Bump Standards-Version to 4.1.2

diff --git a/debian/changelog b/debian/changelog
index 5678639..01eef93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,7 @@ xterm (330-2) UNRELEASED; urgency=medium
   * Switch from "dh_install --fail-missing" to "dh_missing --fail-missing".
   * Look for tarballs on ftp.invisible-island.net in debian/watch.
   * Set Rules-Requires-Root to no.
-  * Bump Standards-Version to 4.1.1, no changes needed.
+  * Bump Standards-Version to 4.1.2, no changes needed.
   * Update copy of XTerm FAQ to revision 1.353 (dated 2017/11/11).
 
  -- Sven Joachim   Wed, 05 Jul 2017 22:58:37 +0200
diff --git a/debian/control b/debian/control
index 37c9c38..4bd0666 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: Sven Joachim 
-Standards-Version: 4.1.1
+Standards-Version: 4.1.2
 Rules-Requires-Root: no
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xterm.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/xterm.git

commit 580ccf9ec567f85fb5c569c094675544493c728f
Author: Sven Joachim 
Date:   Sat Dec 16 10:04:05 2017 +0100

Update copy of XTerm FAQ to revision 1.353 (dated 2017/11/11)

diff --git a/debian/changelog b/debian/changelog
index 14e2ece..5678639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xterm (330-2) UNRELEASED; urgency=medium
   * Look for tarballs on ftp.invisible-island.net in debian/watch.
   * Set Rules-Requires-Root to no.
   * Bump Standards-Version to 4.1.1, no changes needed.
+  * Update copy of XTerm FAQ to revision 1.353 (dated 2017/11/11).
 
  -- Sven Joachim   Wed, 05 Jul 2017 22:58:37 +0200
 
diff --git a/debian/local/xterm.faq.html b/debian/local/xterm.faq.html
index e31810d..82b86b9 100644
--- a/debian/local/xterm.faq.html
+++ b/debian/local/xterm.faq.html
@@ -1,6 +1,6 @@
 
 
 
@@ -402,8 +402,8 @@
   "what_platforms">What platforms does it run on?
 
   XTerm runs in all of the implementations of
-  X11. I've built and run these since I started working on
-  xterm:
+  X11. As of 2000, I had built and run these since I started
+  working on xterm in 1996:
 
   
 AIX 3.2.5, 4.1, 4.3 (cc)
@@ -427,9 +427,12 @@
 
   The older configurations have X11R5 libraries. Only minor
   changes are needed to make xterm work on those systems. However,
-  with X11R6 you can obtain better locale support, as well as new
-  features such as the active icon. X11R7... not much to say
-  there.
+  X11R6 provided better locale support, as well as new features
+  such as the active icon. X11R7... not much to say there.
+
+  Since 2000, there have been a many changes (including new
+  platforms such as MacOS, NetBSD, OpenBSD, etc., as well as QNX,
+  Cygwin, and Minix).
 
   What is the latest version?
@@ -439,8 +442,8 @@
 
   
 ftp://invisible-island.net/xterm/xterm.tar.gz;>current source
-(ftp)
+"ftp://ftp.invisible-island.net/xterm/xterm.tar.gz;>current
+source (ftp)
 
 current source
 (http)
@@ -2612,6 +2615,9 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut 
-d= -f2)
 Can I improve the
 scrollbars?
 
+Can I improve the scrolling
+speed?
+
 Why can't my program read the
 window title?
 
@@ -2968,9 +2974,10 @@ setenv COLUMNS 80
   "xterm.log.html#xterm_175">patch 175 to add an option
   (-k8) and corresponding resource settings to allow
   them to customize their environment. Here is a ftp://invisible-island.net/xterm/koi8-term;>sample script
-  and ftp://invisible-island.net/xterm/KOI8Term;>resource
-  file which I use for testing this

xterm: Changes to 'debian-unstable'

2017-11-16 Thread Sven Joachim 
 debian/changelog |2 ++
 debian/control   |3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit ad1496e12259cd806fd35307b183ede42c259696
Author: Sven Joachim 
Date:   Thu Nov 16 19:44:43 2017 +0100

Bump Standards-Version to 4.1.1

diff --git a/debian/changelog b/debian/changelog
index 5d7e7d9..44a7502 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xterm (330-2) UNRELEASED; urgency=medium
   * Stop passing --parallel to dh, already default in compat level 10.
   * Look for tarballs on ftp.invisible-island.net in debian/watch.
   * Set Rules-Requires-Root to no.
+  * Bump Standards-Version to 4.1.1, no changes needed.
 
  -- Sven Joachim   Wed, 05 Jul 2017 22:58:37 +0200
 
diff --git a/debian/control b/debian/control
index 36ad5fa..a9e0519 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: Sven Joachim 
-Standards-Version: 4.0.0
+Standards-Version: 4.1.1
 Rules-Requires-Root: no
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xterm.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/xterm.git

commit e5826fa70135c41f33182b6f9a7707272e7289af
Author: Sven Joachim 
Date:   Thu Nov 16 19:42:19 2017 +0100

Set Rules-Requires-Root to no

Test rebuilds with and without this field produced identical binary
packages.

diff --git a/debian/changelog b/debian/changelog
index 7e26685..5d7e7d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xterm (330-2) UNRELEASED; urgency=medium
   * Drop autotools-dev from Build-Depends, it is redundant now.
   * Stop passing --parallel to dh, already default in compat level 10.
   * Look for tarballs on ftp.invisible-island.net in debian/watch.
+  * Set Rules-Requires-Root to no.
 
  -- Sven Joachim   Wed, 05 Jul 2017 22:58:37 +0200
 
diff --git a/debian/control b/debian/control
index 578dfa6..36ad5fa 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: Sven Joachim 
 Standards-Version: 4.0.0
+Rules-Requires-Root: no
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xterm.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/xterm.git
 Homepage: http://invisible-island.net/xterm/xterm.html

xterm: Changes to 'debian-unstable'

2017-08-09 Thread Sven Joachim 
 debian/changelog |1 +
 debian/watch |3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit dff28205dc584c93990c79225ff888d2cf7e626a
Author: Sven Joachim 
Date:   Wed Aug 9 19:24:38 2017 +0200

Look for tarballs on ftp.invisible-island.net in debian/watch

The location has changed according to
https://lists.gnu.org/archive/html/bug-ncurses/2017-08/msg7.html.

diff --git a/debian/changelog b/debian/changelog
index c37a995..7e26685 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xterm (330-2) UNRELEASED; urgency=medium
   * Add two simple autopkg smoke tests.
   * Drop autotools-dev from Build-Depends, it is redundant now.
   * Stop passing --parallel to dh, already default in compat level 10.
+  * Look for tarballs on ftp.invisible-island.net in debian/watch.
 
  -- Sven Joachim   Wed, 05 Jul 2017 22:58:37 +0200
 
diff --git a/debian/watch b/debian/watch
index e7640d9..782a7c4 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
 version=3
-opts=pasv,pgpsigurlmangle=s/$/.asc/ ftp://invisible-island.net/xterm/ 
xterm-(.*).tgz
+opts=pasv,pgpsigurlmangle=s/$/.asc/ \
+ ftp://ftp.invisible-island.net/xterm/ xterm-(.*).tgz

xterm: Changes to 'debian-unstable'

2017-07-24 Thread Sven Joachim 
 debian/changelog |2 ++
 debian/control   |2 --
 debian/rules |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 838787b8cbfa46d54b41a4dd409085b6802199f5
Author: Sven Joachim 
Date:   Mon Jul 24 19:16:02 2017 +0200

Stop passing --parallel to dh

In compat level 10 and higher, dh already defaults to parallel builds.

diff --git a/debian/changelog b/debian/changelog
index 3e2683c..c37a995 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xterm (330-2) UNRELEASED; urgency=medium
 
   * Add two simple autopkg smoke tests.
   * Drop autotools-dev from Build-Depends, it is redundant now.
+  * Stop passing --parallel to dh, already default in compat level 10.
 
  -- Sven Joachim   Wed, 05 Jul 2017 22:58:37 +0200
 
diff --git a/debian/rules b/debian/rules
index 32f7346..e5d36b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,7 @@ override_dh_install:
dh_install --fail-missing
 
 %:
-   dh $@ --builddirectory=build/ --parallel
+   dh $@ --builddirectory=build/
 
 debian/local/xterm.faq.html:
wget -O $@ http://invisible-island.net/xterm/xterm.faq.html

commit 00566391ee2c9a4f8d2cec6327e5d170bd1d477e
Author: Sven Joachim 
Date:   Mon Jul 24 19:03:20 2017 +0200

Drop autotools-dev from Build-Depends

There is no point in running the autotools_dev dh addon sequence, the
dh_update_autotools_config tool does the same since debhelper
9.20160114.  In fact, config.{sub,guess} had been backed up and
restored twice.

diff --git a/debian/changelog b/debian/changelog
index 4ae266c..3e2683c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xterm (330-2) UNRELEASED; urgency=medium
 
   * Add two simple autopkg smoke tests.
+  * Drop autotools-dev from Build-Depends, it is redundant now.
 
  -- Sven Joachim   Wed, 05 Jul 2017 22:58:37 +0200
 
diff --git a/debian/control b/debian/control
index 6219324..578dfa6 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends:
  libxcursor-dev,
  libxinerama-dev,
  debhelper (>= 10),
- autotools-dev,
  autoconf-dickey (>= 2.52+20170501),
  lynx | lynx-cur,
  xorg-docs-core,
@@ -106,7 +105,6 @@ Build-Depends:
 #   xorg-docs-core  provides X(7) which minstall.sh tries to
 #   detect
 #   debhelper (>= 10)   debian/compat = 10
-#   autotools-dev   update config.guess, config.sub
 #   autoconf-dickey regenerate configure
 #   lynx | lynx-cur generates plain-text version of xterm faq
 #   desktop-file-utils  for installing xterm.desktop
diff --git a/debian/rules b/debian/rules
index 521becf..32f7346 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,7 +73,7 @@ override_dh_install:
dh_install --fail-missing
 
 %:
-   dh $@ --with autotools_dev --builddirectory=build/ --parallel
+   dh $@ --builddirectory=build/ --parallel
 
 debian/local/xterm.faq.html:
wget -O $@ http://invisible-island.net/xterm/xterm.faq.html

xterm: Changes to 'debian-unstable'

2017-07-05 Thread Sven Joachim 
 debian/changelog |6 ++
 debian/tests/control |5 +
 2 files changed, 11 insertions(+)

New commits:
commit 7eaa76b1b846555deda26b48c659058f060eba42
Author: Sven Joachim 
Date:   Wed Jul 5 23:02:10 2017 +0200

Add two simple autopkg smoke tests

These tests don't guarantee that the package is not totally broken,
but if they fail, it most probably is.

diff --git a/debian/changelog b/debian/changelog
index d965b86..4ae266c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (330-2) UNRELEASED; urgency=medium
+
+  * Add two simple autopkg smoke tests.
+
+ -- Sven Joachim   Wed, 05 Jul 2017 22:58:37 +0200
+
 xterm (330-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 000..7a00550
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,5 @@
+Test-Command: adequate xterm >&2
+Depends: xterm, adequate
+
+Test-Command: xvfb-run xterm -version
+Depends: xterm, xvfb, xauth

xterm: Changes to 'debian-unstable'

2017-06-23 Thread Sven Joachim 
 debian/changelog|5 
 debian/local/xterm.faq.html |  424 +++-
 2 files changed, 386 insertions(+), 43 deletions(-)

New commits:
commit 66188953f116c7e6decb7c17aea8662862eb5e6a
Author: Sven Joachim 
Date:   Fri Jun 23 18:27:46 2017 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 3ed1e17..d965b86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (330-1) UNRELEASED; urgency=medium
+xterm (330-1) unstable; urgency=medium
 
   * New upstream release.
 - Add special case for displaying soft-hyphen if it happens to fall
@@ -17,7 +17,7 @@ xterm (330-1) UNRELEASED; urgency=medium
   * Bump Standards-Version to 4.0.0, no changes needed.
   * Update copy of XTerm FAQ to revision 1.338 (dated 2017/04/08).
 
- -- Sven Joachim   Fri, 09 Jun 2017 16:42:01 +0200
+ -- Sven Joachim   Fri, 23 Jun 2017 18:27:27 +0200
 
 xterm (327-2) unstable; urgency=medium
 

commit d94915e6fd1be7f3f4cd6fbba9091dc6c31534b8
Author: Sven Joachim 
Date:   Fri Jun 23 18:26:12 2017 +0200

Update copy of XTerm FAQ to revision 1.338 (dated 2017/04/08)

diff --git a/debian/changelog b/debian/changelog
index 39f12a6..3ed1e17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ xterm (330-1) UNRELEASED; urgency=medium
 (Closes: #780176).
   * Update years in debian/copyright.
   * Bump Standards-Version to 4.0.0, no changes needed.
+  * Update copy of XTerm FAQ to revision 1.338 (dated 2017/04/08).
 
  -- Sven Joachim   Fri, 09 Jun 2017 16:42:01 +0200
 
diff --git a/debian/local/xterm.faq.html b/debian/local/xterm.faq.html
index da164d1..e31810d 100644
--- a/debian/local/xterm.faq.html
+++ b/debian/local/xterm.faq.html
@@ -19,7 +19,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   *
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.*
  *
-  $XTermId: xterm.faq.html,v 1.332 2016/10/23 13:57:26 tom Exp $
+  $XTermId: xterm.faq.html,v 1.338 2017/04/08 14:00:16 tom Exp $
   -->
 
 
@@ -54,7 +54,7 @@
 
   http://invisible-island.net/xterm/
-  Copyright  1997-2015,2016 by Thomas E. Dickey
+  Copyright  1997-2016,2017 by Thomas E. Dickey
   
 
   
 
-  Some people recommend using xtermc. That is
-  installed on Solaris. However, it does not match any xterm in
-  current use. (Apparently it was written for an obsolete version
-  on Unixware). The colors work, true, but the mouse will not, nor
-  will the function keys.
+  Some people recommend using xtermc.
+  That is installed on Solaris. However, it does not match any
+  xterm in current use. (Apparently it was written for an obsolete
+  version on Unixware). The colors work, true, but the mouse will
+  not, nor will the function keys.
 
   Reverse video is not reset
@@ -7178,23 +7179,27 @@ configure --help
   code
 
   
-XTerm change log
+
+  XTerm change log
 
-The XTerm Manual
+  
+The XTerm Manual
 
-XTerm Control Sequences
+XTerm Control Sequences
 
-resize  set TERMCAP and
-terminal settings to current xterm window size
+resize  set TERMCAP
+and terminal settings to current xterm window size
 
-uxterm  a UTF-8 wrapper
-for XTerm
+uxterm  a UTF-8
+wrapper for XTerm
 
-koi8rxterm  a KOI8-R
-wrapper for XTerm
+koi8rxterm  a
+KOI8-R wrapper for XTerm
 
-luit  Locale and ISO 2022
-support for Unicode terminals
+luit  Locale and ISO
+2022 support for Unicode terminals
+  
+
 
 Other Sites
 
@@ -7202,8 +7207,8 @@ configure --help
 misleading
   
 
-  The
-  XTerm Manual
+  The
+  XTerm Manual
 
   The command-line options, X resources and similar configurable
   options of xterm are documented in the manual page.
@@ -7214,8 +7219,8 @@ configure --help
   "/xterm/manpage/xterm.ps">ps and text.
 
-  Xterm
-  Control Sequences
+  Xterm
+  Control Sequences
 
   Control sequences, i.e., programming information are in the
   ctlseqs.ms file which I bundle with the ps and text.
 
-  resize  set TERMCAP and terminal settings to
-  current xterm window size
+  current xterm window size
 
   resize is useful by itself, but is maintained for
   historical reasons as part of xterm. ps and text.
 
-  uxterm  a UTF-8 wrapper for xterm
+  uxterm  a UTF-8 wrapper for xterm
 
   XTerm does not automatically set your locale. It can
   be told to use your locale settings. This is a shell
@@ -7282,9 +7287,9 @@ tbl ctlseqs.ms | groff -ms ctlseqs.ps
   
"http://www.ibiblio.org/pub/packages/ccic/software/x-win/uxterm/uxterm.README;>
   ibiblio.org (no Linux executables, no source, however).
 
-  koi8rxterm  a KOI8-R wrapper for
-  xterm
+  xterm
 
   As a special case, this wrapper is packaged with xterm to

xterm: Changes to 'debian-unstable'

2017-06-22 Thread Sven Joachim 
 MANIFEST |2 
 NEWS |  161 +---
 charproc.c   |  185 -
 ctlseqs.ms   |   50 ++
 ctlseqs.txt  |   40 +-
 debian/changelog |7 
 debian/control   |2 
 debian/copyright |2 
 fontutils.c  |  169 ++---
 fontutils.h  |9 
 graphics.c   |   18 
 graphics_regis.c |  870 +++
 main.c   |2 
 misc.c   |4 
 package/debian/changelog |   12 
 package/freebsd/Makefile |2 
 package/xterm.spec   |4 
 print.c  |4 
 ptydata.c|6 
 trace.c  |4 
 util.c   |   32 -
 version.h|6 
 wcwidth.c|  628 ++---
 wcwidth.h|   33 +
 xstrings.c   |   20 -
 xterm.log.html   |  148 +++
 xterm.man|7 
 27 files changed, 1704 insertions(+), 723 deletions(-)

New commits:
commit 8fd2939c9d8def5bab06184bac4fb8454211099c
Author: Sven Joachim 
Date:   Thu Jun 22 19:55:36 2017 +0200

Bump Standards-Version to 4.0.0

diff --git a/debian/changelog b/debian/changelog
index 770537f..39f12a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ xterm (330-1) UNRELEASED; urgency=medium
   * Configure "--with-desktop-category=System,TerminalEmulator,"
 (Closes: #780176).
   * Update years in debian/copyright.
+  * Bump Standards-Version to 4.0.0, no changes needed.
 
  -- Sven Joachim   Fri, 09 Jun 2017 16:42:01 +0200
 
diff --git a/debian/control b/debian/control
index 7512e67..6219324 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: Sven Joachim 
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xterm.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/xterm.git
 Homepage: http://invisible-island.net/xterm/xterm.html

commit 12fff487bd8bedf0668e8cd79c35f9f5ca5a315b
Author: Sven Joachim 
Date:   Thu Jun 22 19:28:56 2017 +0200

Update years in debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 7ee2579..770537f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xterm (330-1) UNRELEASED; urgency=medium
 configure.in.
   * Configure "--with-desktop-category=System,TerminalEmulator,"
 (Closes: #780176).
+  * Update years in debian/copyright.
 
  -- Sven Joachim   Fri, 09 Jun 2017 16:42:01 +0200
 
diff --git a/debian/copyright b/debian/copyright
index a6a2f02..f0f3c61 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ This package was debianized by first time by David Martinez 
Moreno
 
 Upstream sources: http://invisible-island.net/xterm/xterm.html
 
-Copyright 1997-2016 by Thomas E. Dickey
+Copyright 1997-2017 by Thomas E. Dickey
 Copyright 1999-2000 by Steve Wall
 Copyright 2013,2014 by Ross Combs
 

commit c1cabf80c9e2a9a23030b12522bbaeaa2b37fe70
Author: Sven Joachim 
Date:   Thu Jun 22 19:26:51 2017 +0200

Close bug #858304

diff --git a/debian/changelog b/debian/changelog
index e4ce94b..7ee2579 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ xterm (330-1) UNRELEASED; urgency=medium
   at the right margin, and omitting similar case such as the BIDI
   markers, where a zero-width character is neither a control character
   nor a combining character (Closes: #844325).
+- Fix a special case in HideCursor which assigned a bold font to the
+  slot used for normal font in changes for italics in xterm 307
+  (Closes: #858304).
   * Refresh Debian patches.
   * Bump autoconf-dickey build dependency to (>= 2.52+20170501), as per
 configure.in.

commit 9917f67d0d0d2133647cb6a4ebab2221677cb41a
Author: Sven Joachim 
Date:   Thu Jun 22 19:24:05 2017 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 8339eed..e4ce94b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (328-1) UNRELEASED; urgency=medium
+xterm (330-1) UNRELEASED; urgency=medium
 
   * New upstream release.
 - Add special case for displaying soft-hyphen if it happens to fall

commit 44287d929208662c177f7b123b7af447669252f9
Author: Sven Joachim 
Date:   Thu Jun 22 19:11:05 2017 +0200

Imported Upstream version 330

diff --git a/MANIFEST b/MANIFEST
index e3ef41e..d4d4430 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-329, version xterm-329
+MANIFEST for xterm-330, version xterm-330
 

 MANIFEST

xterm: Changes to 'debian-unstable'

2017-06-09 Thread Sven Joachim 
 INSTALL  |   13 
 MANIFEST |2 
 Makefile.in  |6 
 NEWS |  147 -
 THANKS   |9 
 Tekproc.c|  514 ++-
 XTerm.ad |3 
 aclocal.m4   |   87 
 button.c |  359 +-
 cachedGCs.c  |   12 
 charclass.c  |  101 
 charclass.h  |6 
 charproc.c   |  949 +++---
 config.guess |  133 
 config.sub   |   47 
 configure| 5139 ---
 configure.in |   20 
 ctlseqs.ms   |  111 
 ctlseqs.txt  |   96 
 cursor.c |9 
 data.h   |9 
 debian/changelog |   15 
 debian/control   |2 
 debian/patches/900_debian_xterm.diff |6 
 debian/patches/902_windowops.diff|2 
 debian/patches/904_fontops.diff  |8 
 debian/rules |1 
 doublechr.c  |   23 
 fontutils.c  | 1424 +++--
 fontutils.h  |   46 
 graphics_regis.c |  222 +
 html.c   |6 
 input.c  |6 
 main.c   |  129 
 main.h   |   12 
 menu.c   |   52 
 menu.h   |5 
 minstall.in  |5 
 misc.c   |   84 
 package/debian/changelog |6 
 package/debian/control   |2 
 package/debian/copyright |2 
 package/debian/rules |7 
 package/debian/xterm-dev.docs|1 
 package/debian/xterm-dev.menu|4 
 package/freebsd/Makefile |2 
 package/xterm.spec   |4 
 print.c  |   52 
 ptyx.h   |  147 -
 resize.c |   19 
 screen.c |   36 
 terminfo |  512 +++
 trace.c  |   26 
 trace.h  |6 
 util.c   |  143 
 version.c|4 
 version.h|8 
 vttests/256colors.pl |   25 
 vttests/256colors2.pl|  197 -
 vttests/88colors.pl  |   24 
 vttests/88colors2.pl |  200 -
 vttests/closest-rgb.pl   |  230 +
 vttests/dynamic.pl   |  132 
 vttests/query-color.pl   |   94 
 vttests/query-status.pl  |  169 +
 vttests/resize.pl|  154 -
 vttests/tcapquery.pl |  472 +--
 xstrings.c   |   47 
 xstrings.h   |5 
 xterm.h  |   81 
 xterm.log.html   |  259 +
 xterm.man|  681 +++-
 xterm_io.h   |   51 
 xtermcfg.hin |5 
 xutf8.c  |   18 
 75 files changed, 8922 insertions(+), 4723 deletions(-)

New commits:
commit badfc56d6f4ef43f1e6e05119ed17d2b24a2e6ea
Author: Sven Joachim 
Date:   Fri Jun 9 19:51:04 2017 +0200

Close bug #844325

diff --git a/debian/changelog b/debian/changelog
index 32c93cd..8339eed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 xterm (328-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+- Add special case for displaying soft-hyphen if it happens to fall
+  at the right margin, and omitting similar case such as the BIDI
+  markers, where a zero-width character is neither a control character
+  nor a combining character (Closes: #844325).
   * Refresh Debian patches.
   * Bump autoconf-dickey build dependency to (>= 2.52+20170501), as per
 configure.in.

commit 3791765bcdb0537c912dc7c6579bf261609b6b63
Author: Sven Joachim 
Date:   Fri Jun 9 19:43:15 2017 +0200

Configure "--with-desktop-category=System,TerminalEmulator,"

This is actually the default now, but depending on what other
applications are installed on the build system "Utility" might still
be added.  So add the configure option for deterministic results.

diff --git a/debian/changelog b/debian/changelog
index 8477e89..32c93cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xterm (328-1) UNRELEASED; urgency=medium
   * Refresh Debian patches.
   * Bump autoconf-dickey

xterm: Changes to 'debian-unstable'

2016-12-17 Thread Sven Joachim 
 debian/changelog|5 ++-
 debian/local/xterm.faq.html |   65 +++-
 2 files changed, 43 insertions(+), 27 deletions(-)

New commits:
commit 825897efe9f035b19b67449d954cac57647c0316
Author: Sven Joachim 
Date:   Sat Dec 17 14:03:13 2016 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index fd56a32..236f53e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (327-2) UNRELEASED; urgency=medium
+xterm (327-2) unstable; urgency=medium
 
   * Bump debhelper compatibility level to 10.
 - Add autoconf-dickey to Build-Depends and an override for
@@ -7,7 +7,7 @@ xterm (327-2) UNRELEASED; urgency=medium
 - Drop quilt from Build-Depends and delete debian/README.source.
   * Update copy of XTerm FAQ to revision 1.332 (dated 2016/10/23).
 
- -- Sven Joachim   Sat, 12 Nov 2016 19:19:33 +0100
+ -- Sven Joachim   Sat, 17 Dec 2016 14:02:49 +0100
 
 xterm (327-1) unstable; urgency=medium
 

commit a26c7e2f29ffbf96d47f68f0435d79553e636349
Author: Sven Joachim 
Date:   Sat Dec 17 13:46:01 2016 +0100

Update copy of XTerm FAQ to revision 1.332 (dated 2016/10/23)

diff --git a/debian/changelog b/debian/changelog
index ae26e2e..fd56a32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xterm (327-2) UNRELEASED; urgency=medium
   dh_autoreconf to debian/rules.
   * Switch to format 3.0 (quilt).
 - Drop quilt from Build-Depends and delete debian/README.source.
+  * Update copy of XTerm FAQ to revision 1.332 (dated 2016/10/23).
 
  -- Sven Joachim   Sat, 12 Nov 2016 19:19:33 +0100
 
diff --git a/debian/local/xterm.faq.html b/debian/local/xterm.faq.html
index 8df4856..da164d1 100644
--- a/debian/local/xterm.faq.html
+++ b/debian/local/xterm.faq.html
@@ -19,7 +19,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   *
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.*
  *
-  $XTermId: xterm.faq.html,v 1.329 2016/09/16 09:19:01 tom Exp $
+  $XTermId: xterm.faq.html,v 1.332 2016/10/23 13:57:26 tom Exp $
   -->
 
 
@@ -523,10 +523,12 @@
   the same as xterm. For example,
 
   
-PuTTY does this. But its wrapping behavior is incompatible
-with xterm (and any vt100 emulator). You can see this in the
-first menu entry for vttest.
+PuTTY does this (see its FAQ http://www.chiark.greenend.org.uk/~sgtatham/putty/faq.html#faq-term;>
+A.5.1 What terminal type does PuTTY use?). But its
+wrapping behavior is incompatible with xterm (and any vt100
+emulator). You can see this in the first menu entry for
+vttest.
 
 VTE does this. But consider the list of problems with
 .
 
 Konsole does this as wellintentionally as shown in
-https://bugs.kde.org/show_bug.cgi?id=145977;>KDE
-#145977. The reasoning expressed there is that Konsole
-"should" match xterm. Incidentally, one of the comments (about
-xterm's support for mouse) cited as proof a http://www.linuxjournal.com/article/1136;>page about Gpm
-from Linux Journal which was more than 12 years old.
+https://bugs.kde.org/show_bug.cgi?id=145977;>KDE
+#145977  Konsole has a terminfo entry of its own; please
+change default $TERM. The reasoning expressed there is
+that Konsole "should" match xterm. Incidentally, one of the
+comments (about xterm's support for mouse) cited as proof a
+http://www.linuxjournal.com/article/1136;>page about
+Gpm from Linux Journal which was more than 12 years
+old.
   
 
   Each of the programs noted here which are well-established and
@@ -553,21 +557,30 @@
   programs. These include
 
   
-Eterm
+Eterm
+
+gnome
+(obsolete)
 
-gnome (obsolete)
+konsole
 
-konsole
+mlterm
 
-mlterm
+mrxvt
 
-mrxvt
+putty
 
-putty
+rxvt
 
-rxvt
+st
 
-vte (preferred)
+vte
+(preferred)
   
 
   What $TERM should I use?
 
   XTerm provides in its sources both terminfo and termcap files. They are designed
-  to allow scripting to override the most common choices, e.g., the
+  "terminfo.html">terminfo and termcap files. They are designed to allow
+  scripting to override the most common choices, e.g., the
   backspace key.
 
   The xterm-color value for $TERM is a bad choice
@@ -6592,9 +6606,9 @@ larry.mcrcim.mcgill.edu (132.206.1.1) in
 
   The toolkit-style configurability glibly referenced is the
   ability to redefine keys on the keyboard without recompiling the
-  program, i.e., the translations resource. It also is
-  the way mouse events and other actions are passed to xterm.
+  program, i.e., the translations
+  resource. It also is the way mouse events and other actions are
+  passed to xterm.
 
   The toolkit-style configurability accounts for about 300kb,

xterm: Changes to 'debian-unstable'

2016-11-12 Thread Sven Joachim 
 debian/README.source|   49 
 debian/changelog|   10 
 debian/compat   |2 -
 debian/control  |8 +++
 debian/rules|5 +++-
 debian/source/format|1 
 debian/source/local-options |1 
 7 files changed, 21 insertions(+), 55 deletions(-)

New commits:
commit 6c59baaac7f8e16814a6f9189d3f164c209a06c3
Author: Sven Joachim 
Date:   Sat Nov 12 19:53:42 2016 +0100

Keep the Debian patches unapplied in git

This retains the existing packaging workflow, merging new upstream
releases with the patches applied is not so easy.

diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 000..4aceb10
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+unapply-patches

commit 3ea7e457e20c1860eed417ce6e57e71aa4cb05ef
Author: Sven Joachim 
Date:   Sat Nov 12 19:43:52 2016 +0100

Switch to format 3.0 (quilt)

It has happened several times to me that I merged a new upstream
release without bumping debian/changelog or vice versa and only
noticed this problem when I ran lintian.  In the 3.0 (quilt) format,
dpkg-source catches this mistake early.

The only advantage of the 1.0 format is that it is easier to
cherry-pick changes from upstream if they also use git, which is not
the case with xterm.

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 4ecd5e6..000
--- a/debian/README.source
+++ /dev/null
@@ -1,49 +0,0 @@
---
-Quick Guide To Patching This Package For The Impatient
---
-
-1. Make sure you have quilt installed
-2. Unpack the package as usual with "dpkg-source -x"
-3. Run the "patch" target in debian/rules
-4. Create a new patch with "quilt new" (see quilt(1))
-5. Edit all the files you want to include in the patch with "quilt edit" 
-   (see quilt(1)).
-6. Write the patch with "quilt refresh" (see quilt(1))
-7. Run the "clean" target in debian/rules
-
-Alternatively, instead of using quilt directly, you can drop the patch in to 
-debian/patches and add the name of the patch to debian/patches/series.
-
-
-Guide To The X Strike Force Packages
-
-
-The X Strike Force team maintains X packages in git repositories on
-git.debian.org in the pkg-xorg subdirectory. Most upstream packages
-are actually maintained in git repositories as well, so they often
-just need to be pulled into git.debian.org in a "upstream-*" branch.
-Otherwise, the upstream sources are manually installed in the Debian
-git repository.
-
-The .orig.tar.gz upstream source file could be generated using this
-"upstream-*" branch in the Debian git repository but it is actually
-copied from upstream tarballs directly.
-
-Due to X.org being highly modular, packaging all X.org applications
-as their own independent packages would have created too many Debian
-packages. For this reason, some X.org applications have been grouped
-into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
-x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
-Most packages, including the X.org server itself and all libraries
-and drivers are, however maintained independently.
-
-The Debian packaging is added by creating the "debian-*" git branch
-which contains the aforementioned "upstream-*" branch plus the debian/
-repository files.
-When a patch has to be applied to the Debian package, two solutions
-are involved:
-* If the patch is available in one of the upstream branches, it
-  may be git'cherry-picked into the Debian repository. In this
-  case, it appears directly in the .diff.gz.
-* Otherwise, the patch is added to debian/patches/ which is managed
-  with quilt as documented in /usr/share/doc/quilt/README.source.
diff --git a/debian/changelog b/debian/changelog
index 22e2c6f..ae26e2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xterm (327-2) UNRELEASED; urgency=medium
   * Bump debhelper compatibility level to 10.
 - Add autoconf-dickey to Build-Depends and an override for
   dh_autoreconf to debian/rules.
+  * Switch to format 3.0 (quilt).
+- Drop quilt from Build-Depends and delete debian/README.source.
 
  -- Sven Joachim   Sat, 12 Nov 2016 19:19:33 +0100
 
diff --git a/debian/control b/debian/control
index 8359ac7..430f6a6 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends:
  libxcursor-dev,
  libxinerama-dev,
  debhelper (>= 10),
- quilt,
  autotools-dev,
  autoconf-dickey,
  lynx | lynx-cur,
@@ -107,7 +106,6 @@ Build-Depends:
 #   xorg-docs-core  provides X(7) which minstall.sh tries to
 #   detect
 #   debhelper (>= 10)

xterm: Changes to 'debian-unstable'

2016-10-09 Thread Sven Joachim 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b3ff197f5012b720b90ecbaa841a816cff34d8c9
Author: Sven Joachim 
Date:   Sun Oct 9 11:26:08 2016 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index e36b4f6..3373d03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (327-1) UNRELEASED; urgency=medium
+xterm (327-1) unstable; urgency=medium
 
   * New upstream release.
 - Add a check in the function which handles end-of-line wrapping
@@ -7,7 +7,7 @@ xterm (327-1) UNRELEASED; urgency=medium
 - Modify allowC1Printable to disallow codes 160-254 as being equivalent
   to codes 32-126 when parsing escape sequences (Closes: #839220).
 
- -- Sven Joachim   Sat, 08 Oct 2016 08:51:23 +0200
+ -- Sven Joachim   Sun, 09 Oct 2016 11:25:56 +0200
 
 xterm (326-1) unstable; urgency=medium

xterm: Changes to 'debian-unstable'

2016-10-08 Thread Sven Joachim 
 Imakefile|   20 +++-
 MANIFEST |2 
 Makefile.in  |   26 --
 NEWS |   22 +
 Tekparse.h   |   90 +
 VTparse.h|  200 ---
 charproc.c   |   17 ++-
 ctlseqs.ms   |8 -
 ctlseqs.txt  |6 -
 debian/changelog |   11 ++
 main.c   |  169 +++
 misc.c   |8 -
 package/debian/changelog |6 +
 package/freebsd/Makefile |2 
 package/xterm.spec   |4 
 ptyx.h   |9 +-
 trace.c  |   42 +
 trace.h  |4 
 util.c   |8 -
 version.h|6 -
 xterm.log.html   |   36 
 xterm.man|8 +
 22 files changed, 385 insertions(+), 319 deletions(-)

New commits:
commit 9c00508294020eff014a4238559bc07903fb5d4f
Author: Sven Joachim 
Date:   Sat Oct 8 09:58:44 2016 +0200

Close bug #839220

diff --git a/debian/changelog b/debian/changelog
index cf593af..e36b4f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xterm (327-1) UNRELEASED; urgency=medium
 - Add a check in the function which handles end-of-line wrapping
   to ensure that C1 controls are allocated one column when
   allowC1Printable is set (Closes: #738794).
+- Modify allowC1Printable to disallow codes 160-254 as being equivalent
+  to codes 32-126 when parsing escape sequences (Closes: #839220).
 
  -- Sven Joachim   Sat, 08 Oct 2016 08:51:23 +0200
 

commit d88e5d61af219547e7a5f4f6e27baeca9efcb236
Author: Sven Joachim 
Date:   Sat Oct 8 09:58:29 2016 +0200

Close bug #738794 again

Third time's a charm.

diff --git a/debian/changelog b/debian/changelog
index cf01d9d..cf593af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 xterm (327-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+- Add a check in the function which handles end-of-line wrapping
+  to ensure that C1 controls are allocated one column when
+  allowC1Printable is set (Closes: #738794).
 
  -- Sven Joachim   Sat, 08 Oct 2016 08:51:23 +0200
 

commit 5b9246ef325f4425bcba142b1ce759cd2419b8af
Author: Sven Joachim 
Date:   Sat Oct 8 08:52:15 2016 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index d86e48e..cf01d9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (327-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Sven Joachim   Sat, 08 Oct 2016 08:51:23 +0200
+
 xterm (326-1) unstable; urgency=medium
 
   * New upstream release.

commit 1a027e1ec651c4298f19f92a8fdef55225e4049c
Author: Sven Joachim 
Date:   Sat Oct 8 08:40:13 2016 +0200

Imported Upstream version 327

diff --git a/Imakefile b/Imakefile
index bbe389a..daf250e 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.112 2016/01/28 01:56:53 Jens.Schweikhardt Exp $
+XCOMM $XTermId: Imakefile,v 1.113 2016/10/06 00:56:32 tom Exp $
 XCOMM
 XCOMM Attention xterm porters
 XCOMM
@@ -244,11 +244,21 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
 
 AllTarget($(PROGRAMS))
 
+VTPARSE_H = VTparse.h VTparse.hin
+TEKPARSE_H = Tekparse.h Tekparse.hin
+
+.SUFFIXES : .def .hin
+.def.hin :
+   awk '/^CASE_/{printf "#define %s %d\n", $$1, n++}' < $< >$@
+
 SpecialCObjectRule(main,$(_NOOP_),$(MAIN_DEFINES))
 SpecialCObjectRule(menu,$(_NOOP_),$(MISC_DEFINES))
-SpecialCObjectRule(misc,$(_NOOP_),$(MISC_DEFINES))
-SpecialCObjectRule(charproc,$(_NOOP_),$(MISC_DEFINES))
+SpecialCObjectRule(misc,$(VTPARSE_H),$(MISC_DEFINES))
+SpecialCObjectRule(VTPrsTbl,$(VTPARSE_H),$(MISC_DEFINES))
+SpecialCObjectRule(charproc,$(VTPARSE_H),$(MISC_DEFINES))
 SpecialCObjectRule(data,$(_NOOP_),$(MISC_DEFINES))
+SpecialCObjectRule(TekPrsTbl,$(TEKPARSE_H),$(MISC_DEFINES))
+SpecialCObjectRule(TekProc,$(TEKPARSE_H),$(MISC_DEFINES))
 
 #if InstallXtermSetUID
 SetUIDProgramTarget(xterm,$(OBJS1),$(DEPLIBS1),$(XRFLIBS) XkbClientLibs 
XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
@@ -319,4 +329,8 @@ InstallAppDefaults(UXTerm)
 InstallAppDefaultsLong(XTerm-col,XTerm-color)
 InstallManPage(xterm,$(MANDIR))
 InstallManPage(resize,$(MANDIR))
+
+cleandir::
+   $(RM) *parse.hin
+
 DependTarget()
diff --git a/MANIFEST b/MANIFEST
index 9f99009..bd690d0 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-326, version xterm-326
+MANIFEST for xterm-327, version xterm-327
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index

xterm: Changes to 'debian-unstable'

2016-09-27 Thread Sven Joachim 
 debian/changelog |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 48c63ab85ee49e781b225d8afec70c50f519e28b
Author: Sven Joachim 
Date:   Tue Sep 27 20:47:02 2016 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index c16dcdb..d86e48e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (326-1) UNRELEASED; urgency=medium
+xterm (326-1) unstable; urgency=medium
 
   * New upstream release.
 - Add examples of setting the icon title with/without the window
@@ -9,7 +9,7 @@ xterm (326-1) UNRELEASED; urgency=medium
   * Refresh Debian patches.
   * Update copy of XTerm FAQ to revision 1.329 (dated 2016/09/16).
 
- -- Sven Joachim   Mon, 26 Sep 2016 17:48:50 +0200
+ -- Sven Joachim   Tue, 27 Sep 2016 20:46:07 +0200
 
 xterm (325-1) unstable; urgency=medium
 

commit ff2908a2ace6742c588b22e65bc685ec4add705b
Author: Sven Joachim 
Date:   Tue Sep 27 20:45:53 2016 +0200

Close bug #738794

Upstream claims it is fixed, let's hope the submitter agrees.

diff --git a/debian/changelog b/debian/changelog
index d7cc711..c16dcdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ xterm (326-1) UNRELEASED; urgency=medium
   title in the manual (Closes: #833984).
 - Amend fix for #738794 to restore a check for missing characters
   which are not combining characters.  Also fill in a corresponding
-  special case for TrueType fonts (Closes: #827905).
+  special case for TrueType fonts (Closes: #827905, #738794).
   * Refresh Debian patches.
   * Update copy of XTerm FAQ to revision 1.329 (dated 2016/09/16).

xterm: Changes to 'debian-unstable'

2016-09-26 Thread Sven Joachim 
 INSTALL   |5 
 MANIFEST  |2 
 charproc.c|5 
 ctlseqs.ms|   13 
 ctlseqs.txt   |7 
 debian/changelog  |   13 
 debian/local/xterm.faq.html   |  463 +-
 debian/patches/902_windowops.diff |6 
 debian/patches/904_fontops.diff   |6 
 misc.c|3 
 package/debian/changelog  |6 
 package/freebsd/Makefile  |2 
 package/xterm.spec|4 
 resize.man|6 
 termcap   |6 
 util.c|   27 
 version.h |6 
 xterm.appdata.xml |   56 -
 xterm.log.html|   46 
 xterm.man | 1757 +++---
 20 files changed, 1515 insertions(+), 924 deletions(-)

New commits:
commit 3d9192a390340063a103cb8457a313173aae6247
Author: Sven Joachim 
Date:   Mon Sep 26 19:10:27 2016 +0200

Update copy of XTerm FAQ to revision 1.329 (dated 2016/09/16)

diff --git a/debian/changelog b/debian/changelog
index 0101ec9..d7cc711 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xterm (326-1) UNRELEASED; urgency=medium
   which are not combining characters.  Also fill in a corresponding
   special case for TrueType fonts (Closes: #827905).
   * Refresh Debian patches.
+  * Update copy of XTerm FAQ to revision 1.329 (dated 2016/09/16).
 
  -- Sven Joachim   Mon, 26 Sep 2016 17:48:50 +0200
 
diff --git a/debian/local/xterm.faq.html b/debian/local/xterm.faq.html
index 1a41fe5..8df4856 100644
--- a/debian/local/xterm.faq.html
+++ b/debian/local/xterm.faq.html
@@ -19,7 +19,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   *
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.*
  *
-  $XTermId: xterm.faq.html,v 1.317 2016/03/21 00:56:33 tom Exp $
+  $XTermId: xterm.faq.html,v 1.329 2016/09/16 09:19:01 tom Exp $
   -->
 
 
@@ -2572,9 +2572,12 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut 
-d= -f2)
   Odd behavior
 
   
-Why can't I cut/paste in
+Why can't I select/paste in
 xterm?
 
+Why can't I
+select/paste to/from other programs?
+
 Why can't I select tab-characters
 in xterm?
 
@@ -2607,6 +2610,9 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut 
-d= -f2)
   
 
 
+Sample .Xdefaults Color-Settings
+for XTerm
+
 What is this warning
 message?
   
@@ -4850,14 +4856,155 @@ XFree86 3.1.2a (23 September 1995)
   "problems_weird">Odd behavior
 
   Why can't I cut/paste in xterm?
+  "xterm_paste">Why can't I select/paste in xterm?
+
+  When an application sets xterm to any of its mouse tracking
+  modes, it reserves the unshifted mouse button clicks
+  for the application's use. Unless you have modified the treatment
+  of the shifted mouse button events (e.g., with your window
+  manager), you can always do select/paste by pressing the
+  shift key while clicking with the mouse.
+
+  This is all done using the translations resource (see
+  the Default Key
+  Bindings section in the manual page).
+
+  Why can't I select/paste to/from other
+  programs?
+
+  Whether you select text in xterm and paste into another
+  window, or the reverse, the X client in which you have
+  selected text may provide the data in different
+  formats and different containers:
+
+  
+
+  formats
+
+  
+Originally (and by default) xterm made the selected data
+available with ISO-8859-1 encoding (Latin-1). Since
+patch #101 (1999),
+it has provided it also in UTF-8.
+
+Regarding the type of data:
+
+
+  X11R4's ICCM documented "string" selection data with
+  ISO-8859-1, while
+
+  X11R6 documented "compound text" (another name for
+  multibyte encoding, without specifying what
+  encoding).
+
+  Selection data using UTF-8 was an extension by
+  XFree86.
+
+
+The client holding the selection advertises the formats
+that it can provide, and other client(s) ask for it using
+one of those formats.
+
+Xterm can ask for UTF-8 even if it is not configured to
+use UTF-8. In that case, it converts (a small number of)
+useful characters to their ASCII or VT100 line-graphics
+equivalents, and uses a "#" character for those which
+cannot be converted.
+  
+
+  containers
+
+  
+By default, xterm follows the https://tronche.com/gui/x/icccm/;>Inter-Client
+Communication Conventions Manual (ICCM). That
+dates back to X11R4 in 1989, with minor updates in

xterm: Changes to 'debian-unstable'

2016-06-08 Thread Sven Joachim 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7bd37d05be89bb7671e9d11d398a26da2b2897bd
Author: Sven Joachim 
Date:   Wed Jun 8 17:39:50 2016 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 945d330..3d08997 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xterm (325-1) UNRELEASED; urgency=medium
+xterm (325-1) unstable; urgency=medium
 
   * New upstream release.
 - Further improve fix for #545220 in xterm 248, to avoid conflict
   with combining characters (Closes: #738794).
   * Refresh Debian patches.
 
- -- Sven Joachim   Mon, 06 Jun 2016 17:28:47 +0200
+ -- Sven Joachim   Wed, 08 Jun 2016 17:39:36 +0200
 
 xterm (324-2) unstable; urgency=medium

xterm: Changes to 'debian-unstable'

2016-06-06 Thread Sven Joachim 
 INSTALL  |   11 
 MANIFEST |2 
 Makefile.in  |9 
 Tekproc.c|   42 
 aclocal.m4   |   38 
 button.c |  113 -
 cachedGCs.c  |   25 
 charproc.c   |   94 
 config.guess |   15 
 config.sub   |   16 
 configure| 3862 +--
 configure.in |7 
 cursor.c |   32 
 data.c   |6 
 data.h   |8 
 debian/changelog |9 
 debian/patches/900_debian_xterm.diff |   11 
 debian/patches/902_windowops.diff|2 
 debian/patches/904_fontops.diff  |2 
 doublechr.c  |   13 
 fontutils.c  |   49 
 graphics.c   |   29 
 graphics.h   |   42 
 graphics_regis.c |  146 -
 graphics_regis.h |8 
 graphics_sixel.c |  187 -
 graphics_sixel.h |8 
 input.c  |   31 
 keysym2ucs.c |6 
 main.c   |   23 
 menu.c   |6 
 misc.c   |  152 -
 package/debian/changelog |6 
 package/freebsd/Makefile |2 
 package/xterm.spec   |4 
 precompose.c |8 
 print.c  |   26 
 ptydata.c|7 
 ptyx.h   |8 
 scrollback.c |9 
 scrollbar.c  |   17 
 svg.c|8 
 termcap  |   14 
 terminfo |9 
 trace.c  |   49 
 trace.h  |   12 
 unicode/README   |   13 
 unicode/convmap.pl   |9 
 unicode/keysym.map   |3 
 unicode/precompose.c.tail|6 
 util.c   |  214 +
 version.c|9 
 version.h|6 
 wcwidth.c|   22 
 xstrings.c   |   24 
 xterm.h  |3 
 xterm.log.html   |  103 
 xterm.man|   94 
 xtermcap.c   |   24 
 xtermcfg.hin |   19 
 60 files changed, 3046 insertions(+), 2686 deletions(-)

New commits:
commit 7839c581096745ef3762ededccacae9dfe21521f
Author: Sven Joachim 
Date:   Mon Jun 6 17:58:39 2016 +0200

Close bug #738794

diff --git a/debian/changelog b/debian/changelog
index 3822bbc..945d330 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xterm (325-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+- Further improve fix for #545220 in xterm 248, to avoid conflict
+  with combining characters (Closes: #738794).
   * Refresh Debian patches.
 
  -- Sven Joachim   Mon, 06 Jun 2016 17:28:47 +0200

commit 42909c82b37e7ac1b9e4c5efa54a92f9128bb2e6
Author: Sven Joachim 
Date:   Mon Jun 6 17:46:45 2016 +0200

Refresh Debian patches

The patch 900_debian_xterm.diff failed to apply.

diff --git a/debian/changelog b/debian/changelog
index b64c3f4..3822bbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xterm (325-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh Debian patches.
 
  -- Sven Joachim   Mon, 06 Jun 2016 17:28:47 +0200
 
diff --git a/debian/patches/900_debian_xterm.diff 
b/debian/patches/900_debian_xterm.diff
index afa1da4..5023b46 100644
--- a/debian/patches/900_debian_xterm.diff
+++ b/debian/patches/900_debian_xterm.diff
@@ -24,8 +24,8 @@ This patch by Branden Robinson.
  XTerm-col.ad |   42 +++---
  XTerm.ad |3 +++
  termcap  |4 +++-
- terminfo |8 ++--
- 4 files changed, 39 insertions(+), 18 deletions(-)
+ terminfo |6 --
+ 4 files changed, 37 insertions(+), 18 deletions(-)
 
 --- a/termcap
 +++ b/termcap
@@ -49,7 +49,7 @@ This patch by Branden Robinson.
  #
  # Encode modifiers using parameters (see "Xterm Control Sequences" 
ctlseqs.ms).
  # Note that this is unrelated to PCTERM.
-@@ -1970,11 +1972,13 @@ xterm-r5|xterm R5 version,
+@@ -1972,12 +1974,12 @@ 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
  #

xterm: Changes to 'debian-unstable'

2016-05-08 Thread Sven Joachim 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8e026a8cf50dea2dc4a8b887bb0657cb33dde64d
Author: Sven Joachim 
Date:   Sun May 8 08:33:04 2016 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index d7c10ff..982405a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (324-2) UNRELEASED; urgency=medium
+xterm (324-2) unstable; urgency=medium
 
   * Enable all hardening options.
   * Remove the menu file (see #741573).
@@ -6,7 +6,7 @@ xterm (324-2) UNRELEASED; urgency=medium
   * Update copy of XTerm FAQ to revision 1.317 (dated 2016/03/21).
   * Bump Standards-Version to 3.9.8.
 
- -- Sven Joachim   Thu, 05 May 2016 09:02:14 +0200
+ -- Sven Joachim   Sun, 08 May 2016 08:32:18 +0200
 
 xterm (324-1) unstable; urgency=medium

xterm: Changes to 'debian-unstable'

2016-05-05 Thread Sven Joachim 
 debian/changelog|   10 
 debian/control  |7 
 debian/local/xterm.faq.html |  615 +++-
 debian/rules|2 
 debian/xterm.menu   |   14 -
 5 files changed, 629 insertions(+), 19 deletions(-)

New commits:
commit c6541b8873b461c30cc706a2b14423c249ec3af2
Author: Sven Joachim 
Date:   Thu May 5 09:59:51 2016 +0200

Add libxinerama-dev to Build-Depends

Since version 3.15 xterm supports a Xinerama screen specification in
the -geometry option, provided that libxinerama is found on the build
system.

diff --git a/debian/changelog b/debian/changelog
index 4f346fe..d7c10ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xterm (324-2) UNRELEASED; urgency=medium
 
   * Enable all hardening options.
   * Remove the menu file (see #741573).
+  * Add libxinerama-dev to Build-Depends.
   * Update copy of XTerm FAQ to revision 1.317 (dated 2016/03/21).
   * Bump Standards-Version to 3.9.8.
 
diff --git a/debian/control b/debian/control
index 9774f93..cad9cef 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends:
  libxkbfile-dev,
  libutempter-dev,
  libxcursor-dev,
+ libxinerama-dev,
  debhelper (>= 9),
  quilt,
  autotools-dev,
@@ -100,6 +101,8 @@ Build-Depends:
 #   main.c:#include 
 #   libxcursor-dev
 #   misc.c:#ifdev HAVE_LIB_XCURSOR
+#   libxinerama-dev
+#   util.c:#ifdef HAVE_X11_EXTENSIONS_XINERAMA_H
 #   xorg-docs-core  provides X(7) which minstall.sh tries to
 #   detect
 #   debhelper (>= 9)debian/compat = 9

commit a36d12854d951acc8cb9334626d03a26a2fbb04e
Author: Sven Joachim 
Date:   Thu May 5 09:26:56 2016 +0200

Update comment about lynx in debian/control

Missed in commit 878eb38f6fd539a6bb7e48eda8457012b536a9d3.

diff --git a/debian/control b/debian/control
index 2079342..9774f93 100644
--- a/debian/control
+++ b/debian/control
@@ -105,7 +105,7 @@ Build-Depends:
 #   debhelper (>= 9)debian/compat = 9
 #   quilt   patch management system
 #   autotools-dev   update config.guess, config.sub
-#   lynx-cur | lynx generates plain-text version of xterm faq
+#   lynx | lynx-cur generates plain-text version of xterm faq
 #   desktop-file-utils  for installing xterm.desktop
 
 Package: xterm

commit 8b34b0fbd3ea9cee5779923488cafb69d91c02c9
Author: Sven Joachim 
Date:   Thu May 5 09:25:50 2016 +0200

Bump Standards-Version to 3.9.8

diff --git a/debian/changelog b/debian/changelog
index 61fa7c9..4f346fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xterm (324-2) UNRELEASED; urgency=medium
   * Enable all hardening options.
   * Remove the menu file (see #741573).
   * Update copy of XTerm FAQ to revision 1.317 (dated 2016/03/21).
+  * Bump Standards-Version to 3.9.8.
 
  -- Sven Joachim   Thu, 05 May 2016 09:02:14 +0200
 
diff --git a/debian/control b/debian/control
index 450bcaa..2079342 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: Sven Joachim 
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xterm.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/xterm.git
 Homepage: http://invisible-island.net/xterm/xterm.html

commit 98873ffbee5905a6c39c091cb0e2a2a3bb6aba02
Author: Sven Joachim 
Date:   Thu May 5 09:23:36 2016 +0200

Update copy of XTerm FAQ to revision 1.317 (dated 2016/03/21)

diff --git a/debian/changelog b/debian/changelog
index 57510af..61fa7c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xterm (324-2) UNRELEASED; urgency=medium
 
   * Enable all hardening options.
   * Remove the menu file (see #741573).
+  * Update copy of XTerm FAQ to revision 1.317 (dated 2016/03/21).
 
  -- Sven Joachim   Thu, 05 May 2016 09:02:14 +0200
 
diff --git a/debian/local/xterm.faq.html b/debian/local/xterm.faq.html
index 8e91dbb..1a41fe5 100644
--- a/debian/local/xterm.faq.html
+++ b/debian/local/xterm.faq.html
@@ -1,6 +1,6 @@
 
 
 
@@ -54,7 +54,7 @@
 
   http://invisible-island.net/xterm/
-  Copyright  1997-2014,2015 by Thomas E. Dickey
+  Copyright  1997-2015,2016 by Thomas E. Dickey
   
 
   Aren't bright colors the
 same as bold?
 
+Can I set a color by its
+number?
+
 I don't like that shade of
 blue
 
@@ -2590,6 +2593,9 @@ current_title=$(xprop -id $WINDOWID | grep WM_NAME | cut 
-d= -f2)
 Why doesn't the scrollbar
 work?
 
+Can I improve the
+scrollbars?
+
 Why can't my program read the
 window title?
 
@@ -3995,6

xterm: Changes to 'debian-unstable'

2016-03-11 Thread Sven Joachim 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 47c5f7550c5111e0430f93cea336a58a0b4a08dc
Author: Sven Joachim 
Date:   Sat Mar 12 08:36:08 2016 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index e470e37..14c2fd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xterm (324-1) UNRELEASED; urgency=medium
+xterm (324-1) unstable; urgency=medium
 
   * New upstream release.
 
- -- Sven Joachim   Fri, 11 Mar 2016 18:06:51 +0100
+ -- Sven Joachim   Sat, 12 Mar 2016 08:35:48 +0100
 
 xterm (323-1) unstable; urgency=medium

xterm: Changes to 'debian-unstable'

2016-03-11 Thread Sven Joachim 
 MANIFEST |2 
 aclocal.m4   |   37 
 configure| 3389 ---
 debian/changelog |6 
 main.c   |4 
 package/debian/changelog |6 
 package/freebsd/Makefile |2 
 package/xterm.spec   |4 
 version.h|6 
 xterm.log.html   |   21 
 10 files changed, 1812 insertions(+), 1665 deletions(-)

New commits:
commit 0a28f555f89637cca68bf0bf11c448985169cbc0
Author: Sven Joachim 
Date:   Fri Mar 11 18:06:56 2016 +0100

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 8f03416..e470e37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (324-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Sven Joachim   Fri, 11 Mar 2016 18:06:51 +0100
+
 xterm (323-1) unstable; urgency=medium
 
   * New upstream release.

commit 3471bdbb26bd5c9f4450c3f57b46d1affef90393
Author: Sven Joachim 
Date:   Fri Mar 11 18:03:42 2016 +0100

Imported Upstream version 324

diff --git a/MANIFEST b/MANIFEST
index 067c42e..818655f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-323, version xterm-323
+MANIFEST for xterm-324, version xterm-324
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/aclocal.m4 b/aclocal.m4
index ef41c84..9ac69df 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.406 2016/03/07 01:30:21 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.408 2016/03/11 00:54:28 tom Exp $
 dnl
 dnl ---
 dnl
@@ -1377,7 +1377,7 @@ AC_TRY_COMPILE([
 test $cf_cv_path_lastlog != no && AC_DEFINE(USE_LASTLOG,1,[Define to 1 if we 
can define lastlog pathname])
 ])dnl
 dnl ---
-dnl CF_LD_RPATH_OPT version: 6 updated: 2015/04/12 15:39:00
+dnl CF_LD_RPATH_OPT version: 7 updated: 2016/02/20 18:01:19
 dnl ---
 dnl For the given system and compiler, find the compiler flags to pass to the
 dnl loader to use the "rpath" feature.
@@ -1395,13 +1395,13 @@ case $cf_cv_system_name in
LD_RPATH_OPT="-rpath "
fi
;;
-(linux*|gnu*|k*bsd*-gnu)
+(linux*|gnu*|k*bsd*-gnu|freebsd*)
LD_RPATH_OPT="-Wl,-rpath,"
;;
 (openbsd[[2-9]].*|mirbsd*)
LD_RPATH_OPT="-Wl,-rpath,"
;;
-(dragonfly*|freebsd*)
+(dragonfly*)
LD_RPATH_OPT="-rpath "
;;
 (netbsd*)
@@ -1723,18 +1723,26 @@ AC_CACHE_CHECK(if we should define 
_POSIX_C_SOURCE,cf_cv_posix_c_source,[
 make an error
 #endif],
[cf_cv_posix_c_source=no],
-   [case .$cf_POSIX_C_SOURCE in
-(.[[12]]??*|.2)
+   [cf_want_posix_source=no
+case .$cf_POSIX_C_SOURCE in
+(.[[12]]??*)
cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
;;
+(.2)
+   cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE"
+   cf_want_posix_source=yes
+   ;;
 (.*)
+   cf_want_posix_source=yes
;;
 esac
-   AC_TRY_COMPILE([#include ],[
+if test "$cf_want_posix_source" = yes ; then
+   AC_TRY_COMPILE([#include ],[
 #ifdef _POSIX_SOURCE
 make an error
 #endif],[],
cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE")
+fi
 CF_MSG_LOG(ifdef from value $cf_POSIX_C_SOURCE)
 CFLAGS="$cf_trim_CFLAGS"
 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
@@ -1755,17 +1763,6 @@ if test "$cf_cv_posix_c_source" != no ; then
CF_ADD_CFLAGS($cf_cv_posix_c_source)
 fi
 
-AC_CACHE_CHECK(if we should define _POSIX_SOURCE,cf_cv_posix_source,[
-   AC_TRY_COMPILE([#include ],[
-#ifdef _POSIX_SOURCE
-make an error
-#endif],[cf_cv_posix_source=yes],
-   [cf_cv_posix_source=no])
-])
-
-if test "$cf_cv_posix_source" != no ; then
-   CF_ADD_CFLAGS(-D_POSIX_SOURCE)
-fi
 ])dnl
 dnl ---
 dnl CF_POSIX_SAVED_IDS version: 8 updated: 2012/10/04 20:12:20
@@ -3985,6 +3982,7 @@ case $host_os in
 (mirbsd*)
# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks  and 
other headers which use u_int / u_short types
cf_XOPEN_SOURCE=
+   CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
;;
 (netbsd*)
cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 
for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw
@@ -4019,11 +4017,10 @@ case $host_os in
;;
 (*)
CF_TRY_XOPEN_SOURCE
+   CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
;;
 esac
 
-CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
-
 if test -n

xterm: Changes to 'debian-unstable'

2016-03-10 Thread Sven Joachim 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e4f7b4839dda522993474bb4fc1d6f5aa3edafa3
Author: Sven Joachim 
Date:   Thu Mar 10 18:02:39 2016 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index eb9a5e4..8f03416 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xterm (323-1) UNRELEASED; urgency=medium
+xterm (323-1) unstable; urgency=medium
 
   * New upstream release.
   * Use https for Vcs-* fields.
   * Prefer lynx over lynx-cur in Build-Depends.
   * Bump Standards-Version to 3.9.7, no changes needed.
 
- -- Sven Joachim   Wed, 09 Mar 2016 17:30:44 +0100
+ -- Sven Joachim   Thu, 10 Mar 2016 18:02:21 +0100
 
 xterm (322-1) unstable; urgency=medium

xterm: Changes to 'debian-unstable'

2016-03-09 Thread Sven Joachim 
 debian/changelog |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6efaeb69a0e7c6ac62d2c55f685aff546233c0bd
Author: Sven Joachim 
Date:   Wed Mar 9 18:39:08 2016 +0100

Delete trailing whitespace from debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 11d9160..eb9a5e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,14 +4,14 @@ xterm (323-1) UNRELEASED; urgency=medium
   * Use https for Vcs-* fields.
   * Prefer lynx over lynx-cur in Build-Depends.
   * Bump Standards-Version to 3.9.7, no changes needed.
-  
+
  -- Sven Joachim   Wed, 09 Mar 2016 17:30:44 +0100
 
 xterm (322-1) unstable; urgency=medium
 
   * New upstream release.
 - Fix regression due to incorrect fix for compiler warning when
-  allocating storage for /etc/shells (Closes: #809646). 
+  allocating storage for /etc/shells (Closes: #809646).
   * Update years in debian/copyright.
 
  -- Sven Joachim   Sat, 02 Jan 2016 16:17:27 +0100
@@ -1024,7 +1024,7 @@ xterm (210-1) unstable; urgency=low
* Merge duplicate Provides fields
 
  -- David Nusinow   Mon, 13 Mar 2006 22:12:41 -0500
- 
+
 xterm (208-3.1) unstable; urgency=low
 
   * Emergency NMU to fix queue/accepted breakage: s/Provides/Replaces/

xterm: Changes to 'debian-unstable'

2016-03-09 Thread Sven Joachim 
 Imakefile|   15 
 MANIFEST |2 
 XTerm.ad |6 
 aclocal.m4   |   33 
 button.c |   19 
 charproc.c   |   12 
 configure| 3743 ++-
 configure.in |   16 
 ctlseqs.ms   |   16 
 ctlseqs.txt  |   10 
 debian/changelog |9 
 debian/control   |8 
 html.c   |  304 +++
 menu.c   |   50 
 menu.h   |   10 
 misc.c   |   64 
 package/debian/changelog |6 
 package/debian/rules |1 
 package/freebsd/Makefile |2 
 package/xterm.spec   |8 
 print.c  |   12 
 ptyx.h   |8 
 svg.c|  288 +++
 uxterm.desktop   |5 
 version.h|6 
 xterm.appdata.xml|   10 
 xterm.dat|2 
 xterm.desktop|5 
 xterm.h  |   21 
 xterm.log.html   |   33 
 xterm.man|  119 +
 xtermcfg.hin |5 
 32 files changed, 2832 insertions(+), 2016 deletions(-)

New commits:
commit 3a51bfc76925cce913c02faea4feaa722c5a2019
Author: Sven Joachim 
Date:   Wed Mar 9 18:02:39 2016 +0100

Bump Standards-Version to 3.9.7

diff --git a/debian/changelog b/debian/changelog
index 2d89ff0..11d9160 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ xterm (323-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Use https for Vcs-* fields.
   * Prefer lynx over lynx-cur in Build-Depends.
-
+  * Bump Standards-Version to 3.9.7, no changes needed.
+  
  -- Sven Joachim   Wed, 09 Mar 2016 17:30:44 +0100
 
 xterm (322-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 2ae5ed3..450bcaa 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: Sven Joachim 
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xterm.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/xterm.git
 Homepage: http://invisible-island.net/xterm/xterm.html

commit 878eb38f6fd539a6bb7e48eda8457012b536a9d3
Author: Sven Joachim 
Date:   Wed Mar 9 18:00:11 2016 +0100

Prefer lynx over lynx-cur in Build-Depends

The lynx package used to be a transitional package for lynx-cur, but
recently their roles have been reversed.

diff --git a/debian/changelog b/debian/changelog
index d1d284b..2d89ff0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xterm (323-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Use https for Vcs-* fields.
+  * Prefer lynx over lynx-cur in Build-Depends.
 
  -- Sven Joachim   Wed, 09 Mar 2016 17:30:44 +0100
 
diff --git a/debian/control b/debian/control
index 2dee3b3..2ae5ed3 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
  debhelper (>= 9),
  quilt,
  autotools-dev,
- lynx-cur | lynx,
+ lynx | lynx-cur,
  xorg-docs-core,
  desktop-file-utils,
 

commit 7492dbd12d2110a0b7c91dc55e036297fb231bd3
Author: Sven Joachim 
Date:   Wed Mar 9 17:55:34 2016 +0100

Use https for Vcs-* fields

Prefer cgit over gitweb in the Vcs-Browser URL.

diff --git a/debian/changelog b/debian/changelog
index 7110df4..d1d284b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xterm (323-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Use https for Vcs-* fields.
 
  -- Sven Joachim   Wed, 09 Mar 2016 17:30:44 +0100
 
diff --git a/debian/control b/debian/control
index f118351..2dee3b3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Debian X Strike Force 
 Uploaders: Sven Joachim 
 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
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xterm.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/app/xterm.git
 Homepage: http://invisible-island.net/xterm/xterm.html
 Build-Depends:
  libncurses5-dev | libncurses-dev,

commit d91e59d6d326654db351e2c83f9191522a480848
Author: Sven Joachim 
Date:   Wed Mar 9 17:30:51 2016 +0100

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 8b3e577..7110df4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (323-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Sven Joachim   Wed, 09 Mar 2016 17:30:44 +0100
+
 xterm (322-1) unstable; urgency=medium
 
   * New upstream release.

commit

xterm: Changes to 'debian-unstable'

2016-01-02 Thread Sven Joachim 
 MANIFEST |2 +-
 debian/changelog |9 +
 debian/copyright |2 +-
 main.c   |8 
 package/debian/changelog |6 ++
 package/debian/copyright |2 +-
 package/freebsd/Makefile |2 +-
 package/xterm.spec   |4 ++--
 version.h|8 
 xterm.log.html   |   15 +--
 10 files changed, 42 insertions(+), 16 deletions(-)

New commits:
commit 0e672e9c2a3b6d2c4b871a43dd5e4a12db1c1d82
Author: Sven Joachim 
Date:   Sat Jan 2 16:17:42 2016 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index d94b0c4..8b3e577 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xterm (322-1) UNRELEASED; urgency=medium
+xterm (322-1) unstable; urgency=medium
 
   * New upstream release.
 - Fix regression due to incorrect fix for compiler warning when
   allocating storage for /etc/shells (Closes: #809646). 
   * Update years in debian/copyright.
 
- -- Sven Joachim   Sat, 02 Jan 2016 16:10:35 +0100
+ -- Sven Joachim   Sat, 02 Jan 2016 16:17:27 +0100
 
 xterm (321-1) unstable; urgency=medium
 

commit 25542cacd2d6baab70d7b508d9882527c20ddb49
Author: Sven Joachim 
Date:   Sat Jan 2 16:13:20 2016 +0100

Update years in debian/copyright

diff --git a/debian/changelog b/debian/changelog
index 3367a4e..d94b0c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xterm (322-1) UNRELEASED; urgency=medium
   * New upstream release.
 - Fix regression due to incorrect fix for compiler warning when
   allocating storage for /etc/shells (Closes: #809646). 
+  * Update years in debian/copyright.
 
  -- Sven Joachim   Sat, 02 Jan 2016 16:10:35 +0100
 
diff --git a/debian/copyright b/debian/copyright
index fdaebdc..a6a2f02 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ This package was debianized by first time by David Martinez 
Moreno
 
 Upstream sources: http://invisible-island.net/xterm/xterm.html
 
-Copyright 1997-2015 by Thomas E. Dickey
+Copyright 1997-2016 by Thomas E. Dickey
 Copyright 1999-2000 by Steve Wall
 Copyright 2013,2014 by Ross Combs
 

commit 40534aa3045cbcea355fe547cacc40590642ce44
Author: Sven Joachim 
Date:   Sat Jan 2 16:11:58 2016 +0100

New upstream release, closing bug #809646

diff --git a/debian/changelog b/debian/changelog
index d0ac8d7..3367a4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xterm (322-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+- Fix regression due to incorrect fix for compiler warning when
+  allocating storage for /etc/shells (Closes: #809646). 
+
+ -- Sven Joachim   Sat, 02 Jan 2016 16:10:35 +0100
+
 xterm (321-1) unstable; urgency=medium
 
   * New upstream release.

commit 7bfca55d7cd7433af575284dfbbed6d81409eb85
Author: Sven Joachim 
Date:   Sat Jan 2 16:06:31 2016 +0100

Imported Upstream version 322

diff --git a/MANIFEST b/MANIFEST
index 74cd987..1009b48 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-321, version xterm-321
+MANIFEST for xterm-322, version xterm-322
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/main.c b/main.c
index 27120b3..2e68a44 100644
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
-/* $XTermId: main.c,v 1.776 2015/12/29 15:19:35 tom Exp $ */
+/* $XTermId: main.c,v 1.777 2016/01/02 14:12:19 tom Exp $ */
 
 /*
- * Copyright 2002-2014,2015 by Thomas E. Dickey
+ * Copyright 2002-2015,2016 by Thomas E. Dickey
  *
  * All Rights Reserved
  *
@@ -3248,8 +3248,8 @@ validShell(const char *pathname)
 if (validProgram(pathname)
&& stat(ok_shells, ) == 0
&& (sb.st_mode & S_IFMT) == S_IFREG
-   && (sb.st_size != 0)
-   && (sb.st_size < (off_t) (((size_t) ~0) - 2))
+   && ((size_t) sb.st_size > 0)
+   && ((size_t) sb.st_size < (((size_t) ~0) - 2))
&& (blob = calloc((size_t) sb.st_size + 2, sizeof(char))) != 0) {
if ((fp = fopen(ok_shells, "r")) != 0) {
rc = fread(blob, sizeof(char), (size_t) sb.st_size, fp);
diff --git a/package/debian/changelog b/package/debian/changelog
index a8592c8..1d0ce23 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+xterm-dev (322) unstable; urgency=low
+
+  * maintenance updates
+
+ -- Thomas E. Dickey   Sat, 02 Jan 2016 08:42:56 
-0500
+
 xterm-dev (321) unstable; urgency=low
 
   * maintenance updates
diff --git a/package/debian/copyright b/package/debian/copyright
index 0a69d30..1280a8c 100644
--- a/package/debian/copyright
+++ b/package/debian/copyright
@@ -35,7 +35,7 @@ authorization.
 Files: *

xterm: Changes to 'debian-unstable'

2016-01-01 Thread Sven Joachim 
 debian/changelog|5 +++--
 debian/local/xterm.faq.html |   17 +
 2 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 05e31d28bc54de182ee06597a358f56ad9247043
Author: Sven Joachim 
Date:   Fri Jan 1 17:27:18 2016 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index c4aae15..d0ac8d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xterm (321-1) UNRELEASED; urgency=medium
+xterm (321-1) unstable; urgency=medium
 
   * New upstream release.
   * Run lynx with the -display_charset=utf-8 option when dumping the text
 version of the XTerm FAQ, making the build reproducible.
   * Update copy of XTerm FAQ to revision 1.307 (dated 2015/12/28).
 
- -- Sven Joachim   Sun, 20 Dec 2015 12:09:26 +0100
+ -- Sven Joachim   Fri, 01 Jan 2016 17:27:01 +0100
 
 xterm (320-1) unstable; urgency=medium
 

commit e92b527be043e4c54e9661538508da7fc4101ef0
Author: Sven Joachim 
Date:   Fri Jan 1 17:20:09 2016 +0100

Update copy of XTerm FAQ to revision 1.307 (dated 2015/12/28)

diff --git a/debian/changelog b/debian/changelog
index cd5b087..c4aae15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xterm (321-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Run lynx with the -display_charset=utf-8 option when dumping the text
 version of the XTerm FAQ, making the build reproducible.
+  * Update copy of XTerm FAQ to revision 1.307 (dated 2015/12/28).
 
  -- Sven Joachim   Sun, 20 Dec 2015 12:09:26 +0100
 
diff --git a/debian/local/xterm.faq.html b/debian/local/xterm.faq.html
index 006e57e..8e91dbb 100644
--- a/debian/local/xterm.faq.html
+++ b/debian/local/xterm.faq.html
@@ -19,7 +19,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   *
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.*
  *
-  $XTermId: xterm.faq.html,v 1.305 2015/05/01 07:43:40 tom Exp $
+  $XTermId: xterm.faq.html,v 1.307 2015/12/28 00:45:27 tom Exp $
   -->
 
 
@@ -759,9 +759,9 @@
   
 
   Modern xterm implements 188 primary controls. In this table,
-  konsole ranks last because it does not support vt52 emulation.
-  This is not unusual, since the rxvt-based emulators do not,
-  either. However, all vt100's provide this feature; programs
+  vte ranks lower than PuTTY because it does not support vt52
+  emulation. This is not unusual, since the rxvt-based emulators do
+  not, either. However, all vt100's provide this feature; programs
   lacking this are not really a vt100 emulator. On the other hand,
   PuTTY (which is not a vt100 emulator due to its incompatible
   wrapping behavior) supports this feature.
@@ -3141,10 +3141,11 @@ isig -icanon -iexten -echo -echoe -echok -echonl 
-noflsh -xcase -tostop -echoprt
   keyboard mapping tables that are independent of the
   environment.
 
-  Modern xterm (since patch
-  #83 in 1998) provides a resource toggle backarrowKey
-  (and an escape sequence from VT320) that changes this key between
-  the two styles (backspace or delete).
+  Modern xterm (since patch #83 in 1998) provides
+  a resource toggle backarrowKey (and an escape sequence
+  from VT320) that changes this key between the two styles
+  (backspace or delete).
 
   With modern xterm patch 95 (also in the stable

xterm: Changes to 'debian-unstable'

2015-12-20 Thread Sven Joachim 
 debian/changelog |7 +++
 debian/rules |2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 615000bf271e6d497d4f9a669f620f1fb6089026
Author: Sven Joachim 
Date:   Sun Dec 20 12:15:11 2015 +0100

Run lynx with the -display_charset=utf-8 option

Lynx' default charset for output is locale dependent, making the build
not reproducible.

diff --git a/debian/changelog b/debian/changelog
index 4b7f409..4629bb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xterm (320-2) UNRELEASED; urgency=medium
+
+  * Run lynx with the -display_charset=utf-8 option when dumping the text
+version of the XTerm FAQ, making the build reproducible.
+
+ -- Sven Joachim   Sun, 20 Dec 2015 12:09:26 +0100
+
 xterm (320-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index e0d4995..2070316 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ CFLAGS += -Wall
 LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
 
-HTML2TEXT:=lynx -dump -nolist
+HTML2TEXT:=lynx -dump -nolist -display_charset=utf-8
 
 DEBTREEDIR:=$(CURDIR)/debian/tmp

xterm: Changes to 'debian-unstable'

2015-08-29 Thread Sven Joachim 
 MANIFEST |2 +-
 THANKS   |7 +--
 button.c |   33 +++--
 debian/changelog |8 
 main.c   |4 ++--
 package/debian/changelog |6 ++
 package/freebsd/Makefile |2 +-
 package/xterm.spec   |4 ++--
 version.h|6 +++---
 xstrings.c   |   29 -
 xstrings.h   |5 +++--
 xterm.log.html   |   27 ---
 xterm.man|   19 ++-
 13 files changed, 120 insertions(+), 32 deletions(-)

New commits:
commit 1b404b75709e5af6131930ea6f29d5d3e49d6ee0
Author: Sven Joachim svenj...@gmx.de
Date:   Sat Aug 29 08:59:23 2015 +0200

Close bug #797008

diff --git a/debian/changelog b/debian/changelog
index b7fe8c0..e32c0d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xterm (320-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+- Amend fix for bug #794201 (report forwarded from Christian Jachmann
+  by Emanuel Haupt, Closes: #797008).
 
  -- Sven Joachim svenj...@gmx.de  Sat, 29 Aug 2015 08:57:26 +0200
 

commit c56e0ae532bbfa9feab062fb9f85b3d7a50c59c4
Author: Sven Joachim svenj...@gmx.de
Date:   Sat Aug 29 08:57:32 2015 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index ea86db3..b7fe8c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (320-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Sven Joachim svenj...@gmx.de  Sat, 29 Aug 2015 08:57:26 +0200
+
 xterm (319-1) unstable; urgency=low
 
   * New upstream release.

commit e53d527194aa459a043487f7f83265b2f9eaaf94
Author: Sven Joachim svenj...@gmx.de
Date:   Sat Aug 29 08:54:39 2015 +0200

Imported Upstream version 320

diff --git a/MANIFEST b/MANIFEST
index 424d573..ff79fa6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-319, version xterm-319
+MANIFEST for xterm-320, version xterm-320
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/THANKS b/THANKS
index e953827..f2af2bf 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
--- $XTermId: THANKS,v 1.14 2014/07/12 14:41:17 tom Exp $
+-- $XTermId: THANKS,v 1.15 2015/08/28 08:17:31 tom Exp $
 -- vile:txtmode fk=8bit
 There's no AUTHORS file in this distribution; it would be redundant since
 I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996.
@@ -61,7 +61,6 @@ Denis Zaitsev
 Dennis Preiser
 Dennis Schneider
 Dimitrios Christidis
-Dr Werner Fink
 Ed Schouten
 Eddy De Greef
 Edward S Arthur
@@ -74,6 +73,7 @@ Frank Giessler
 Frank Guangxin Liu
 Frank Liu
 Gael Roualland
+George Nachman
 George Peter Staplin
 Gertjan Halkes
 Greg Badros
@@ -120,6 +120,8 @@ Marius Tolzmann
 Mark Waggoner
 Markus Kuhn
 Martin Pirker
+Martin Tournoij
+Matthew Green
 Matthias Baake
 Matthias Scheler
 Matthieu Herrb
@@ -188,6 +190,7 @@ Tor Lillqvist
 Torrey Lyons
 Victor Stinner
 Vincent Lefevre
+Werner Fink
 Werner Lemberg
 Will Day
 Zdenek Sekera
diff --git a/button.c b/button.c
index fb922d1..e407136 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.492 2015/04/10 10:16:19 tom Exp $ */
+/* $XTermId: button.c,v 1.494 2015/08/27 23:47:56 tom Exp $ */
 
 /*
  * Copyright 1999-2014,2015 by Thomas E. Dickey
@@ -4927,6 +4927,20 @@ formatVideoAttrs(XtermWidget xw, char *buffer, CELL 
*cell)
 }
 }
 
+static char *
+formatStrlen(char *target, char *source, int freeit)
+{
+if (source != 0) {
+   sprintf(target, %u, (unsigned) strlen(source));
+   if (freeit) {
+   free(source);
+   }
+} else {
+   strcpy(target, 0);
+}
+return target;
+}
+
 /* substitute data into format, reallocating the result */
 static char *
 expandFormat(XtermWidget xw,
@@ -4971,21 +4985,20 @@ expandFormat(XtermWidget xw,
finish-col + 1);
value = numbers;
break;
+   case 'R':
+   value = formatStrlen(numbers, x_strrtrim(data), 1);
+   break;
+   case 'r':
+   value = x_strrtrim(data);
+   break;
case 'S':
-   sprintf(numbers, %u, (unsigned) strlen(data));
-   value = numbers;
+   value = formatStrlen(numbers, data, 0);
break;
case 's':
value = data;
break;
case 'T':
-   if ((value = x_strtrim(data)) != 0) {
-   sprintf(numbers, %u, (unsigned) strlen(value));
-   free(value);
-

xterm: Changes to 'debian-unstable'

2015-08-29 Thread Sven Joachim 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit db2787ba160563282e13115408e3b9691b17538f
Author: Sven Joachim svenj...@gmx.de
Date:   Sat Aug 29 13:47:59 2015 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index e32c0d1..4b7f409 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xterm (320-1) UNRELEASED; urgency=medium
+xterm (320-1) unstable; urgency=medium
 
   * New upstream release.
 - Amend fix for bug #794201 (report forwarded from Christian Jachmann
   by Emanuel Haupt, Closes: #797008).
 
- -- Sven Joachim svenj...@gmx.de  Sat, 29 Aug 2015 08:57:26 +0200
+ -- Sven Joachim svenj...@gmx.de  Sat, 29 Aug 2015 13:47:23 +0200
 
 xterm (319-1) unstable; urgency=low

xterm: Changes to 'debian-unstable'

2015-08-22 Thread Sven Joachim 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6ccff8fe533bf656e0789cbc4952c4c0be39c752
Author: Sven Joachim svenj...@gmx.de
Date:   Sat Aug 22 09:10:24 2015 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 3cb6812..ea86db3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xterm (319-1) UNRELEASED; urgency=low
+xterm (319-1) unstable; urgency=low
 
   * New upstream release.
 - Correct combination of -ls and -e options for utempter configuration
   (Closes: #794201).
   * Update copy of XTerm FAQ to revision 1.305 (dated 2015/05/01).
 
- -- Sven Joachim svenj...@gmx.de  Thu, 20 Aug 2015 19:58:41 +0200
+ -- Sven Joachim svenj...@gmx.de  Sat, 22 Aug 2015 09:10:05 +0200
 
 xterm (318-2) unstable; urgency=low

xterm: Changes to 'debian-unstable'

2015-03-01 Thread Sven Joachim 
 debian/changelog  |8 ++
 debian/patches/905_passedPty.diff |   47 ++
 debian/patches/series |1 
 3 files changed, 56 insertions(+)

New commits:
commit 663c53556da5f6615d499402000bb9bfc1fc46f5
Author: Sven Joachim svenj...@gmx.de
Date:   Sun Mar 1 11:45:34 2015 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 72f692a..b29201d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xterm (312-2) UNRELEASED; urgency=medium
+xterm (312-2) unstable; urgency=medium
 
   * Cherry-pick a patch from xterm 314: change passedPty[] to an
 allocated string to ensure it is long enough for the -S option
 value (Closes: #779397).
 
- -- Sven Joachim svenj...@gmx.de  Sun, 01 Mar 2015 11:34:52 +0100
+ -- Sven Joachim svenj...@gmx.de  Sun, 01 Mar 2015 11:45:01 +0100
 
 xterm (312-1) unstable; urgency=medium
 

commit 976a28a84cb9be75001b0606313e45e0118a27f7
Author: Sven Joachim svenj...@gmx.de
Date:   Sun Mar 1 11:43:13 2015 +0100

Fix buffer overflow in the -S option

Change passedPty[] to an allocated string to ensure it is long enough
for the -S option value.

diff --git a/debian/changelog b/debian/changelog
index 6b5ba0c..72f692a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xterm (312-2) UNRELEASED; urgency=medium
+
+  * Cherry-pick a patch from xterm 314: change passedPty[] to an
+allocated string to ensure it is long enough for the -S option
+value (Closes: #779397).
+
+ -- Sven Joachim svenj...@gmx.de  Sun, 01 Mar 2015 11:34:52 +0100
+
 xterm (312-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/905_passedPty.diff 
b/debian/patches/905_passedPty.diff
new file mode 100644
index 000..93765eb
--- /dev/null
+++ b/debian/patches/905_passedPty.diff
@@ -0,0 +1,47 @@
+Description: Fix buffer overflow in the -S option
+ Change passedPty[] to an allocated string to ensure it is long enough for
+ the -S option value.
+Author: Thomas Dickey dic...@his.com
+Bug-Debian: https://bugs.debian.org/779397
+
+---
+ main.c |8 +---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+--- a/main.c
 b/main.c
+@@ -779,7 +779,8 @@ static char etc_wtmp[] = WTMP_FILENAME;
+ static char bin_login[] = LOGIN_FILENAME;
+ #endif
+ 
+-static char passedPty[PTYCHARLEN + 1];/* name if pty if slave */
++static char noPassedPty[2];
++static char *passedPty = noPassedPty; /* name if pty if slave */
+ 
+ #if defined(TIOCCONS) || defined(SRIOCSREDIR)
+ static int Console;
+@@ -1760,7 +1761,8 @@ ParseSccn(char *option)
+ char *leaf = x_basename(option);
+ Bool code = False;
+ 
+-if (leaf != option) {
++passedPty = x_strdup(option);
++if (leaf != option) {
+   if (leaf - option  0
+isdigit(CharOf(*leaf))
+sscanf(leaf, %d, am_slave) == 1) {
+@@ -1771,13 +1773,13 @@ ParseSccn(char *option)
+* the /dev/pts/XXX value, but since we do not need to reopen it,
+* it is useful mainly for display in a ps -ef.
+*/
+-  strncpy(passedPty, option, len);
+   passedPty[len] = 0;
+   code = True;
+   }
+ } else {
+   code = (sscanf(option, %c%c%d,
+  passedPty, passedPty + 1, am_slave) == 3);
++  passedPty[2] = '\0';
+ }
+ TRACE((ParseSccn(%s) = '%s' %d (%s)\n, option,
+  passedPty, am_slave, code ? OK : ERR));
diff --git a/debian/patches/series b/debian/patches/series
index 0a584d1..c29fff3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 900_debian_xterm.diff
 902_windowops.diff
 904_fontops.diff
+905_passedPty.diff


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1ys1qc-by...@moszumanska.debian.org

xterm: Changes to 'debian-unstable'

2014-09-29 Thread Sven Joachim 
 MANIFEST |2 +-
 button.c |4 ++--
 debian/changelog |7 +++
 package/debian/changelog |6 ++
 package/freebsd/Makefile |2 +-
 package/xterm.spec   |4 ++--
 version.h|6 +++---
 xterm.log.html   |   13 -
 8 files changed, 34 insertions(+), 10 deletions(-)

New commits:
commit d0e10d13dba28e4f137dcbda3ff61673ad0ec37d
Author: Sven Joachim svenj...@gmx.de
Date:   Mon Sep 29 17:16:38 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index a9a6465..6b5ba0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xterm (312-1) UNRELEASED; urgency=medium
+xterm (312-1) unstable; urgency=medium
 
   * New upstream release.
 - Undo change to do_select_regex() in xterm 311 (Closes: #762978).
 
- -- Sven Joachim svenj...@gmx.de  Mon, 29 Sep 2014 17:11:31 +0200
+ -- Sven Joachim svenj...@gmx.de  Mon, 29 Sep 2014 17:16:25 +0200
 
 xterm (311-1) unstable; urgency=low
 

commit 20fa018e85575675d9a8e15b49dbdc64cec46bd3
Author: Sven Joachim svenj...@gmx.de
Date:   Mon Sep 29 17:12:37 2014 +0200

Close bug #762978

diff --git a/debian/changelog b/debian/changelog
index def29b4..a9a6465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xterm (312-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+- Undo change to do_select_regex() in xterm 311 (Closes: #762978).
 
  -- Sven Joachim svenj...@gmx.de  Mon, 29 Sep 2014 17:11:31 +0200
 

commit 28a73903294435d62a8023473a1033aee28aabf0
Author: Sven Joachim svenj...@gmx.de
Date:   Mon Sep 29 17:11:36 2014 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index f3ca8bb..def29b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (312-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Sven Joachim svenj...@gmx.de  Mon, 29 Sep 2014 17:11:31 +0200
+
 xterm (311-1) unstable; urgency=low
 
   * New upstream release.

commit 06a538fbafd3b224fe7a994fb68db0c1896b2ef0
Author: Sven Joachim svenj...@gmx.de
Date:   Mon Sep 29 17:08:30 2014 +0200

Imported Upstream version 312

diff --git a/MANIFEST b/MANIFEST
index 634ec2c..e9068a6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-311, version xterm-311
+MANIFEST for xterm-312, version xterm-312
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/button.c b/button.c
index 77929c9..8dd7390 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.481 2014/09/18 00:17:35 tom Exp $ */
+/* $XTermId: button.c,v 1.482 2014/09/26 23:58:14 tom Exp $ */
 
 /*
  * Copyright 1999-2013,2014 by Thomas E. Dickey
@@ -3257,7 +3257,7 @@ do_select_regex(TScreen *screen, CELL *startc, CELL *endc)
int start_col = indexToCol(indexed, len, start_inx);
int finis_col = indexToCol(indexed, len, finis_inx);
 
-   if (start_col = actual 
+   if (start_col = actual 
actual  finis_col) {
int test = finis_col - start_col;
if (best_len  test) {
diff --git a/package/debian/changelog b/package/debian/changelog
index 92638d6..2a486f8 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+xterm-dev (312) unstable; urgency=low
+
+  * maintenance updates
+
+ -- Thomas E. Dickey dic...@invisible-island.net  Fri, 26 Sep 2014 18:42:15 
-0400
+
 xterm-dev (311) unstable; urgency=low
 
   * maintenance updates
diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile
index 9f4c4fc..9c22d21 100644
--- a/package/freebsd/Makefile
+++ b/package/freebsd/Makefile
@@ -5,7 +5,7 @@
 # and make makesum.
 
 PORTNAME=  xterm
-PORTVERSION=   311
+PORTVERSION=   312
 CATEGORIES=x11
 MASTER_SITES=  ftp://invisible-island.net/xterm/ \
CRITICAL
diff --git a/package/xterm.spec b/package/xterm.spec
index c9a0fcc..a9100d0 100644
--- a/package/xterm.spec
+++ b/package/xterm.spec
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.76 2014/07/28 21:36:30 tom Exp $
+# $XTermId: xterm.spec,v 1.77 2014/09/26 22:42:15 tom Exp $
 Summary: X terminal emulator (development version)
 %global my_middle xterm
 %global my_suffix -dev
 %global fullname %{my_middle}%{my_suffix}
 %global my_class XTermDev
 Name: %{fullname}
-Version: 311
+Version: 312
 Release: 1
 License: X11
 Group: User Interface/X
diff --git a/version.h b/version.h
index b7ef006..30be6f3 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.397 2014/09/18 21:12:19 tom Exp $ */
+/* $XTermId: version.h,v 1.399 2014/09/29 00:37:50 tom Exp $ */
 
 /*
  * Copyright 1998-2013,2014 by Thomas E. Dickey
@@

xterm: Changes to 'debian-unstable'

2014-09-22 Thread Sven Joachim 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3220d6711aaf3821b8ad85dfa94837eb7a36cf55
Author: Sven Joachim svenj...@gmx.de
Date:   Mon Sep 22 17:56:02 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index e2f8b2c..f3ca8bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (311-1) UNRELEASED; urgency=low
+xterm (311-1) unstable; urgency=low
 
   * New upstream release.
 - Mention xclip in manpage as an alternative workaround for copying
@@ -18,7 +18,7 @@ xterm (311-1) UNRELEASED; urgency=low
   recovery used the current font, it would fail if one first selected
   a valid font, then an invalid font (Closes: #760207).
 
- -- Sven Joachim svenj...@gmx.de  Fri, 19 Sep 2014 18:05:27 +0200
+ -- Sven Joachim svenj...@gmx.de  Mon, 22 Sep 2014 17:55:43 +0200
 
 xterm (310-1) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xw61r-0004zy...@moszumanska.debian.org

xterm: Changes to 'debian-unstable'

2014-09-19 Thread Sven Joachim 
 MANIFEST |2 
 button.c |  194 +--
 charproc.c   |   26 +++---
 debian/changelog |   22 +
 fontutils.c  |   29 ++-
 graphics_regis.c |   65 ++-
 menu.c   |   28 --
 menu.h   |8 +
 misc.c   |   18 
 package/debian/changelog |6 +
 package/freebsd/Makefile |2 
 package/xterm.spec   |4 
 ptyx.h   |   23 +
 screen.c |6 -
 version.h|6 -
 xterm.h  |9 +-
 xterm.log.html   |   46 ++-
 xterm.man|   20 
 18 files changed, 349 insertions(+), 165 deletions(-)

New commits:
commit 632c582c411fd8a3513d0dd0781b4f02f3da35a2
Author: Sven Joachim svenj...@gmx.de
Date:   Fri Sep 19 18:21:44 2014 +0200

Close various bugs which are fixed according to upstream

diff --git a/debian/changelog b/debian/changelog
index 695d997..e2f8b2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,22 @@
 xterm (311-1) UNRELEASED; urgency=low
 
   * New upstream release.
+- Mention xclip in manpage as an alternative workaround for copying
+  clipboard data, noting that selectToClipboard is the recommended
+  approach (Closes: #639094).
+- Correct initialization for regular-expression feature of
+  exec-selectable and insert-selectable actions.
+  Modify logic for exec-formatted and insert-formatted actions to
+  ensure that the formatting occurs just after the selection is
+  received (Closes: #758633).
+- Account for state of reverse-video in special case of cursor coloring
+  (Closes: #759734).
+- Enable the Escape Sequence menu entry when an OSC 50 is received.
+  Also disable it if the escape sequence specifies no font
+  (Closes: #760208).
+- Improve fix for the fontsel menu entry from xterm 304: because the
+  recovery used the current font, it would fail if one first selected
+  a valid font, then an invalid font (Closes: #760207).
 
  -- Sven Joachim svenj...@gmx.de  Fri, 19 Sep 2014 18:05:27 +0200
 

commit f761d93b18679f91c8eb00b1b3d423b3d2b79710
Author: Sven Joachim svenj...@gmx.de
Date:   Fri Sep 19 18:05:32 2014 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 9f3079c..695d997 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (311-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Sven Joachim svenj...@gmx.de  Fri, 19 Sep 2014 18:05:27 +0200
+
 xterm (310-1) unstable; urgency=low
 
   * New upstream release.

commit 2982e471d559c69d331ec2f8b4e26c5c583f76c0
Author: Sven Joachim svenj...@gmx.de
Date:   Fri Sep 19 18:03:56 2014 +0200

Imported Upstream version 311

diff --git a/MANIFEST b/MANIFEST
index 22b4d14..634ec2c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-310, version xterm-310
+MANIFEST for xterm-311, version xterm-311
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/button.c b/button.c
index 69936a5..77929c9 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.473 2014/05/26 17:12:51 tom Exp $ */
+/* $XTermId: button.c,v 1.481 2014/09/18 00:17:35 tom Exp $ */
 
 /*
  * Copyright 1999-2013,2014 by Thomas E. Dickey
@@ -2177,16 +2177,39 @@ SelectionReceived(Widget w,
 #endif
for (i = 0; i  text_list_count; i++) {
size_t len = removeControls(xw, text_list[i]);
+
if (screen-selectToBuffer) {
-   size_t have = (screen-internal_select
-  ? strlen(screen-internal_select)
+   InternalSelect *mydata = (screen-internal_select);
+   size_t have = (mydata-buffer
+  ? strlen(mydata-buffer)
   : 0);
size_t need = have + len + 1;
-   char *buffer = realloc(screen-internal_select, need);
+   char *buffer = realloc(mydata-buffer, need);
+
+   screen-selectToBuffer = False;
+#if OPT_PASTE64
+   screen-base64_paste = mydata-base64_paste;
+#endif
+#if OPT_READLINE
+   screen-paste_brackets = mydata-paste_brackets;
+#endif
if (buffer != 0) {
strcpy(buffer + have, text_list[i]);
-   screen-internal_select = buffer;
+   mydata-buffer = buffer;
}
+   TRACE((FormatSelect %d.%d .. %d.%d %s\n,
+  screen-startSel.row,
+  screen-startSel.col,
+  screen-endSel.row,
+  screen-endSel.col,
+  mydata-buffer));
+

xterm: Changes to 'debian-unstable'

2014-08-30 Thread Sven Joachim 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a434d013498b83d8e1b95d10d8e8781b61d084cd
Author: Sven Joachim svenj...@gmx.de
Date:   Sat Aug 30 11:26:23 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 8b3ae90..9f3079c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xterm (310-1) UNRELEASED; urgency=low
+xterm (310-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Sven Joachim svenj...@gmx.de  Fri, 25 Jul 2014 17:00:31 +0200
+ -- Sven Joachim svenj...@gmx.de  Sat, 30 Aug 2014 11:26:09 +0200
 
 xterm (308-1) unstable; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xnf1x-0002ix...@moszumanska.debian.org

xterm: Changes to 'debian-unstable'

2014-08-27 Thread Sven Joachim 
 Imakefile |4 
 MANIFEST  |2 
 aclocal.m4|   21 
 configure | 3122 +++---
 debian/changelog  |2 
 graphics_sixel.c  |3 
 main.c|   18 
 package/debian/changelog  |6 
 package/freebsd/Makefile  |  106 -
 package/freebsd/pkg-plist |7 
 package/xterm.spec|4 
 precompose.c  |   10 
 resize.c  |8 
 unicode/precompose.c.head |1 
 version.h |6 
 xterm.h   |6 
 xterm.log.html|   21 
 xterm_io.h|   17 
 xtermcfg.hin  |3 
 19 files changed, 1717 insertions(+), 1650 deletions(-)

New commits:
commit 47cab8c37d73dc0308366859d7b1310e0d706afb
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Aug 27 19:38:06 2014 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 411b83a..8b3ae90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (309-1) UNRELEASED; urgency=low
+xterm (310-1) UNRELEASED; urgency=low
 
   * New upstream release.
 

commit 63042043364f6150467f874353c7d86472bb868f
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Aug 27 19:33:48 2014 +0200

Imported Upstream version 310

diff --git a/Imakefile b/Imakefile
index 0c2b20e..f2119ec 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.110 2014/04/11 19:36:41 Ross.Combs Exp $
+XCOMM $XTermId: Imakefile,v 1.111 2014/07/22 22:29:17 tom Exp $
 XCOMM
 XCOMM Attention xterm porters
 XCOMM
@@ -140,7 +140,7 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
 # endif
 #endif
 
-#if !defined(OS2Architecture)  !defined(__GNU__)
+#if !defined(OS2Architecture)  !defined(__GNU__)  
!defined(Minix3Architecture)
 #if defined(UseUtempter)
 UTMPDEF = -DUSE_UTEMPTER
 #else
diff --git a/MANIFEST b/MANIFEST
index 06f60d1..22b4d14 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-309, version xterm-309
+MANIFEST for xterm-310, version xterm-310
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/aclocal.m4 b/aclocal.m4
index dff8843..364e683 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.376 2014/07/13 18:36:02 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.378 2014/07/24 22:52:40 tom Exp $
 dnl
 dnl ---
 dnl
@@ -84,7 +84,7 @@ define([CF_ACVERSION_COMPARE],
 [ifelse([$8], , ,[$8])],
 [ifelse([$9], , ,[$9])])])dnl
 dnl ---
-dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
+dnl CF_ADD_CFLAGS version: 11 updated: 2014/07/22 05:32:57
 dnl -
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl The second parameter if given makes this macro verbose.
@@ -109,7 +109,7 @@ no)
-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 
's/^-D[[^=]]*='\''\[[^]]*//'`
 
-   test ${cf_add_cflags} != ${cf_tst_cflags} \
+   test x${cf_add_cflags} != x${cf_tst_cflags} \
 test -z ${cf_tst_cflags} \
 cf_fix_cppflags=yes
 
@@ -146,7 +146,7 @@ yes)
 
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^]]*'\''//'`
 
-   test ${cf_add_cflags} != ${cf_tst_cflags} \
+   test x${cf_add_cflags} != x${cf_tst_cflags} \
 test -z ${cf_tst_cflags} \
 cf_fix_cppflags=no
;;
@@ -315,7 +315,7 @@ if test .$system_name != .$cf_cv_system_name ; then
 fi
 ])dnl
 dnl ---
-dnl CF_CHECK_CFLAGS version: 2 updated: 2001/12/30 19:09:58
+dnl CF_CHECK_CFLAGS version: 3 updated: 2014/07/22 05:32:57
 dnl ---
 dnl Conditionally add to $CFLAGS and $CPPFLAGS values which are derived from
 dnl a build-configuration such as imake.  These have the pitfall that they
@@ -327,10 +327,10 @@ CF_VERBOSE(checking additions to CFLAGS)
 cf_check_cflags=$CFLAGS
 cf_check_cppflags=$CPPFLAGS
 CF_ADD_CFLAGS($1,yes)
-if test $cf_check_cflags != $CFLAGS ; then
+if test x$cf_check_cflags != x$CFLAGS ; then
 AC_TRY_LINK([#include stdio.h],[printf(Hello world);],,
[CF_VERBOSE(test-compile failed.  Undoing change to \$CFLAGS)
-if test $cf_check_cppflags != $CPPFLAGS ; then
+if test x$cf_check_cppflags != x$CPPFLAGS ; then
 CF_VERBOSE(but keeping change to \$CPPFLAGS)
 fi
 CFLAGS=$cf_check_flags])
@@ -3769,7 +3769,7 @@ then
 fi
 ])
 dnl ---

xterm: Changes to 'debian-unstable'

2014-07-25 Thread Sven Joachim 
 INSTALL  |   12 
 MANIFEST |2 
 THANKS   |6 
 Tekproc.c|8 
 aclocal.m4   |   68 
 charproc.c   |   27 
 config.guess |  164 -
 config.sub   |   15 
 configure| 6077 +--
 debian/changelog |6 
 fontutils.c  |4 
 graphics.c   |  125 
 graphics.h   |4 
 graphics_regis.c | 3600 +++
 main.c   |6 
 menu.c   |   14 
 package/debian/changelog |6 
 package/debian/rules |2 
 package/freebsd/Makefile |2 
 package/xterm.spec   |5 
 scrollbar.c  |   40 
 version.h|6 
 xterm.h  |6 
 xterm.log.html   |   62 
 24 files changed, 7128 insertions(+), 3139 deletions(-)

New commits:
commit 49783fb745b0a9b0f5b8adf0a234d0971e367521
Author: Sven Joachim svenj...@gmx.de
Date:   Fri Jul 25 17:00:52 2014 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 4cde7b8..411b83a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (309-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Sven Joachim svenj...@gmx.de  Fri, 25 Jul 2014 17:00:31 +0200
+
 xterm (308-1) unstable; urgency=medium
 
   * New upstream release.

commit fffb2571529ed6c77a752cc64711ff70d6ef10ea
Author: Sven Joachim svenj...@gmx.de
Date:   Fri Jul 25 16:56:41 2014 +0200

Imported Upstream version 309

diff --git a/INSTALL b/INSTALL
index 66336c4..4d442d2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.151 2014/05/08 07:58:06 tom Exp $
+-- $XTermId: INSTALL,v 1.152 2014/07/12 22:40:36 Steve.Wall Exp $
 ---
 -- Copyright 1997-2013,2014 by Thomas E. Dickey
 --
@@ -461,7 +461,7 @@ The options (in alphabetic order):
 
   --enable-narrowprotoenable narrow prototypes for X libraries
 
-   Originally xterm was built using imake rather than a configure script. 
+   Originally xterm was built using imake rather than a configure script.
One feature of imake that is not possible to guess within the
configure script is the wide-prototype compile-time definition
NARROWPROTO.  When this is not set properly, the Athena widget
@@ -540,6 +540,10 @@ The options (in alphabetic order):
 
Look for, compile and link with the Xaw 3d widget library.
 
+  --with-Xaw3dxft link with Xaw 3d xft library
+
+   Look for, compile and link with the Xaw 3d xft widget library.
+
   --with-XawPlus  link with Athena-Plus library
 
Look for, compile and link with the Xaw Plus widget library.
@@ -601,7 +605,7 @@ The options (in alphabetic order):
just one of the variations:
 
pkg*, e.g., pkg-config or pkgconfig uses whatever pkg-config
-   script was found. 
+   script was found.
 
otherwise, the parameter value is used as the name of the script
to try, using --cflags and --libs options.
@@ -724,7 +728,7 @@ The options (in alphabetic order):
 
If xterm is installed setuid'd to root, change the group of the tty
device to the given value on startup.  Three cases are possible:
-   
+
a) If this option is not given, the configure script will attempt to
   find a suitable value (usually tty), and verify that it exists in
   the group database.
diff --git a/MANIFEST b/MANIFEST
index 1cfa15b..06f60d1 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-308, version xterm-308
+MANIFEST for xterm-309, version xterm-309
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/THANKS b/THANKS
index 1b83740..e953827 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
--- $XTermId: THANKS,v 1.12 2014/03/03 19:31:41 tom Exp $
+-- $XTermId: THANKS,v 1.14 2014/07/12 14:41:17 tom Exp $
 -- vile:txtmode fk=8bit
 There's no AUTHORS file in this distribution; it would be redundant since
 I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996.
@@ -157,7 +157,7 @@ Rob Braun
 Robert Brady
 Robert Earl
 Robin Cutshaw
-Romain Francois
+Romain Francoise
 Ross Combs
 Ross Paterson
 Ryan Johnson
@@ -167,7 +167,7 @@ Sergei Laskavy
 Sergey Vlasov
 Slava Semushin
 Stefan Dirsch
-Steve Wall
+Stephen P Wall
 Stuart Lissaman
 Sven Verdoolaege
 Taketo Kabe
diff --git a/Tekproc.c b/Tekproc.c
index 5289bc0..6f8da47 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.196 2014/04/12 00:55:22 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.198 2014/07/12 22:55:02 tom Exp $ */
 
 /*
  * Copyright

xterm: Changes to 'debian-unstable'

2014-06-21 Thread Sven Joachim 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8c87b2c42469cb649886b82dd68b068107e83bc2
Author: Sven Joachim svenj...@gmx.de
Date:   Sat Jun 21 09:44:18 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 8023f3d..4cde7b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xterm (308-1) UNRELEASED; urgency=medium
+xterm (308-1) unstable; urgency=medium
 
   * New upstream release.
 - Correct font used for clipping double-width bitmap fonts from
   xterm 307 changes to work around mis-scaled fonts (Closes: #752047).
 
- -- Sven Joachim svenj...@gmx.de  Fri, 20 Jun 2014 17:34:15 +0200
+ -- Sven Joachim svenj...@gmx.de  Sat, 21 Jun 2014 09:44:01 +0200
 
 xterm (307-1) unstable; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wyg4m-fi...@moszumanska.debian.org

xterm: Changes to 'debian-unstable'

2014-06-20 Thread Sven Joachim 
 MANIFEST |2 +-
 debian/changelog |8 
 package/debian/changelog |6 ++
 package/freebsd/Makefile |2 +-
 package/xterm.spec   |4 ++--
 screen.c |8 
 util.c   |   17 -
 version.h|6 +++---
 xterm.log.html   |   15 ++-
 9 files changed, 51 insertions(+), 17 deletions(-)

New commits:
commit 5160919812031c0d7e2f17df7d33feb7f3dd7ff1
Author: Sven Joachim svenj...@gmx.de
Date:   Fri Jun 20 17:41:05 2014 +0200

Close bug #752047

diff --git a/debian/changelog b/debian/changelog
index 0754c8c..8023f3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xterm (308-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+- Correct font used for clipping double-width bitmap fonts from
+  xterm 307 changes to work around mis-scaled fonts (Closes: #752047).
 
  -- Sven Joachim svenj...@gmx.de  Fri, 20 Jun 2014 17:34:15 +0200
 

commit 3d956a83ce01cc98bf057edf27b56621f466b44e
Author: Sven Joachim svenj...@gmx.de
Date:   Fri Jun 20 17:40:39 2014 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 350c0f8..0754c8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (308-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Sven Joachim svenj...@gmx.de  Fri, 20 Jun 2014 17:34:15 +0200
+
 xterm (307-1) unstable; urgency=medium
 
   * New upstream release.

commit 4051c2ae6ba3be9f496adc5fc8b9f06e9e028d88
Author: Sven Joachim svenj...@gmx.de
Date:   Fri Jun 20 17:31:01 2014 +0200

Imported Upstream version 308

diff --git a/MANIFEST b/MANIFEST
index a54262d..1cfa15b 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-307, version xterm-307
+MANIFEST for xterm-308, version xterm-308
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/package/debian/changelog b/package/debian/changelog
index 15b8144..4712656 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+xterm-dev (308) unstable; urgency=low
+
+  * maintenance updates
+
+ -- Thomas E. Dickey dic...@invisible-island.net  Thu, 19 Jun 2014 15:58:13 
-0400
+
 xterm-dev (307) unstable; urgency=low
 
   * maintenance updates
diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile
index 186e0e5..fd7baca 100644
--- a/package/freebsd/Makefile
+++ b/package/freebsd/Makefile
@@ -5,7 +5,7 @@
 # and make makesum.
 
 PORTNAME=  xterm
-PORTVERSION=   307
+PORTVERSION=   308
 CATEGORIES=x11
 MASTER_SITES=  ftp://invisible-island.net/xterm/ \
CRITICAL
diff --git a/package/xterm.spec b/package/xterm.spec
index 7d4a4ff..ec33b16 100644
--- a/package/xterm.spec
+++ b/package/xterm.spec
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.71 2014/06/04 22:58:36 tom Exp $
+# $XTermId: xterm.spec,v 1.72 2014/06/19 19:58:13 tom Exp $
 Summary: X terminal emulator (development version)
 %global my_middle xterm
 %global my_suffix -dev
 %global fullname %{my_middle}%{my_suffix}
 %global my_class XTermDev
 Name: %{fullname}
-Version: 307
+Version: 308
 Release: 1
 License: X11
 Group: User Interface/X
diff --git a/screen.c b/screen.c
index 1e52e4d..0e2d241 100644
--- a/screen.c
+++ b/screen.c
@@ -1,4 +1,4 @@
-/* $XTermId: screen.c,v 1.499 2014/06/11 18:40:34 tom Exp $ */
+/* $XTermId: screen.c,v 1.500 2014/06/19 21:09:11 tom Exp $ */
 
 /*
  * Copyright 1999-2013,2014 by Thomas E. Dickey
@@ -1431,6 +1431,8 @@ ScrnRefresh(XtermWidget xw,
   nrows, ncols,
   force ?  force : ));
 
+++recurse;
+
 if (screen-cursorp.col = leftcol
 screen-cursorp.col = (leftcol + ncols - 1)
 screen-cursorp.row = ROW2INX(screen, toprow)
@@ -1510,7 +1512,7 @@ ScrnRefresh(XtermWidget xw,
col = leftcol;
}
} else {
-   xtermWarning(This should not happen. Why is it so?\n);
+   xtermWarning(Unexpected recursion drawing hidden 
characters.\n);
}
});
 
@@ -1549,13 +1551,11 @@ ScrnRefresh(XtermWidget xw,
} else {
/* row intersects selection; split into pieces of single type */
if (row == screen-startH.row  col  screen-startH.col) {
-   recurse++;
ScrnRefresh(xw, row, col, 1, screen-startH.col - col,
force);
col = screen-startH.col;
}
if (row == screen-endH.row  maxcol = screen-endH.col) {
-   recurse++;
ScrnRefresh(xw, row, screen-endH.col, 1,
maxcol - screen-endH.col + 1, force);
maxcol = screen-endH.col - 1;
diff --git a/util.c b/util.c
index 91aa6d4..dabeb05 100644
--- a/util.c
+++ b/util.c
@@ -1,4 +1,4

xterm: Changes to 'debian-unstable'

2014-06-18 Thread Sven Joachim 
 MANIFEST |2 
 cachedGCs.c  |   44 ++--
 charproc.c   |   82 ++-
 debian/changelog |   10 ++
 fontutils.c  |  144 
 fontutils.h  |   11 +--
 package/debian/changelog |6 +
 package/freebsd/Makefile |2 
 package/xterm.spec   |4 -
 print.c  |8 +-
 ptyx.h   |5 +
 screen.c |9 +-
 util.c   |  166 +--
 version.h|6 -
 xterm.appdata.xml|3 
 xterm.h  |3 
 xterm.log.html   |   36 +-
 17 files changed, 419 insertions(+), 122 deletions(-)

New commits:
commit 4a18775fa451e53291aabfa7b9abfbf163baf918
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Jun 18 17:44:48 2014 +0200

Close bugs fixed in the new upstream release

diff --git a/debian/changelog b/debian/changelog
index 9c5c11f..36489b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 xterm (307-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+- Amend fix for Freedesktop bug #15979 (Closes: #750733).
+- Amend resets for keyboard-type, pointer-mode and title-modes
+  from xterm 305 changes to account for resource settings
+  (Closes: #751351).
 
  -- Sven Joachim svenj...@gmx.de  Wed, 18 Jun 2014 17:39:07 +0200
 

commit a12891ac8eeff45d86d882c948993f807c1e1cd3
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Jun 18 17:39:18 2014 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 095a545..9c5c11f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (307-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Sven Joachim svenj...@gmx.de  Wed, 18 Jun 2014 17:39:07 +0200
+
 xterm (306-1) unstable; urgency=medium
 
   [ Julien Cristau ]

commit 0d7b6a924fe5a9a62bba90df7a821e12a6dde98c
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Jun 18 17:36:57 2014 +0200

Imported Upstream version 307

diff --git a/MANIFEST b/MANIFEST
index fc36f79..a54262d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-306, version xterm-306
+MANIFEST for xterm-307, version xterm-307
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/cachedGCs.c b/cachedGCs.c
index 21d3bb7..3dd1cd9 100644
--- a/cachedGCs.c
+++ b/cachedGCs.c
@@ -1,7 +1,7 @@
-/* $XTermId: cachedGCs.c,v 1.61 2011/09/11 14:59:38 tom Exp $ */
+/* $XTermId: cachedGCs.c,v 1.62 2014/06/12 23:04:07 tom Exp $ */
 
 /*
- * Copyright 2007-2010,2011 by Thomas E. Dickey
+ * Copyright 2007-2011,2014 by Thomas E. Dickey
  *
  * All Rights Reserved
  *
@@ -120,7 +120,7 @@ traceCgsEnum(CgsEnum value)
 #undef CASE
 
 static const char *
-traceVTwin(XtermWidget xw, VTwin * value)
+traceVTwin(XtermWidget xw, VTwin *value)
 {
 const char *result = ?;
 if (value == 0)
@@ -273,7 +273,7 @@ relinkData(CgsCache * me, int item)
  * Returns the appropriate cache pointer.
  */
 static CgsCache *
-myCache(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId)
+myCache(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId)
 {
 CgsCache *result = 0;
 
@@ -304,7 +304,7 @@ myDisplay(XtermWidget xw)
 }
 
 static Drawable
-myDrawable(XtermWidget xw, VTwin * cgsWin)
+myDrawable(XtermWidget xw, VTwin *cgsWin)
 {
 Drawable drawable = 0;
 
@@ -316,7 +316,7 @@ myDrawable(XtermWidget xw, VTwin * cgsWin)
 }
 
 static GC
-newCache(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, CgsCache * me)
+newCache(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId, CgsCache * me)
 {
 XGCValues xgcv;
 XtGCMask mask;
@@ -448,11 +448,12 @@ chgCache(XtermWidget xw, CgsEnum cgsId GCC_UNUSED, 
CgsCache * me, Bool both)
 THIS(used) = 0;
 return THIS(gc);
 }
+
 /*
  * Use the setCgs() calls to initialize parameters for a new GC.
  */
 void
-setCgsFore(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, Pixel fg)
+setCgsFore(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId, Pixel fg)
 {
 CgsCache *me;
 
@@ -463,7 +464,7 @@ setCgsFore(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, 
Pixel fg)
 }
 
 void
-setCgsBack(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, Pixel bg)
+setCgsBack(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId, Pixel bg)
 {
 CgsCache *me;
 
@@ -475,7 +476,7 @@ setCgsBack(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, 
Pixel bg)
 
 #if OPT_DEC_CHRSET
 void
-setCgsCSet(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, unsigned cset)
+setCgsCSet(XtermWidget xw, VTwin *cgsWin, CgsEnum cgsId, unsigned cset)
 {
 CgsCache *me;
 
@@ -489,7 +490,7 @@ setCgsCSet(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId, 
unsigned cset)
 #endif
 
 void
-setCgsFont(XtermWidget xw, VTwin * cgsWin, CgsEnum cgsId,

xterm: Changes to 'debian-unstable'

2014-06-18 Thread Sven Joachim 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d74d46133d8b48fd234abb15914632fa6a584159
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Jun 18 19:50:10 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 36489b2..350c0f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (307-1) UNRELEASED; urgency=medium
+xterm (307-1) unstable; urgency=medium
 
   * New upstream release.
 - Amend fix for Freedesktop bug #15979 (Closes: #750733).
@@ -6,7 +6,7 @@ xterm (307-1) UNRELEASED; urgency=medium
   from xterm 305 changes to account for resource settings
   (Closes: #751351).
 
- -- Sven Joachim svenj...@gmx.de  Wed, 18 Jun 2014 17:39:07 +0200
+ -- Sven Joachim svenj...@gmx.de  Wed, 18 Jun 2014 19:49:57 +0200
 
 xterm (306-1) unstable; urgency=medium
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wxk5l-00040i...@moszumanska.debian.org

xterm: Changes to 'debian-unstable'

2014-06-05 Thread Sven Joachim 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 82614417fb15f7337a72940913f3ab7d47a0a23c
Author: Sven Joachim svenj...@gmx.de
Date:   Thu Jun 5 17:51:41 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index e3ef9bb..095a545 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (306-1) UNRELEASED; urgency=medium
+xterm (306-1) unstable; urgency=medium
 
   [ Julien Cristau ]
   * New upstream release.
@@ -8,7 +8,7 @@ xterm (306-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Update copy of XTerm FAQ to revision 1.282 (dated 2014/05/25).
 
- -- Julien Cristau jcris...@debian.org  Tue, 03 Jun 2014 09:27:48 +0200
+ -- Sven Joachim svenj...@gmx.de  Thu, 05 Jun 2014 17:50:00 +0200
 
 xterm (304-1) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wsa63-0003u6...@moszumanska.debian.org

xterm: Changes to 'debian-unstable'

2014-06-03 Thread Julien Cristau 
 INSTALL  |   12 
 MANIFEST |3 
 button.c |   52 
 charclass.c  |4 
 charproc.c   |  181 ++
 configure| 3245 +++
 configure.in |   10 
 ctlseqs.ms   |   12 
 ctlseqs.txt  |8 
 debian/changelog |7 
 debian/control   |2 
 doublechr.c  |   29 
 fontutils.c  |  313 +++-
 fontutils.h  |   24 
 graphics.c   |4 
 graphics_regis.c |  139 +-
 main.c   |3 
 menu.c   |4 
 misc.c   |   68 
 package/debian/changelog |6 
 package/freebsd/Makefile |2 
 package/xterm.spec   |5 
 print.c  |   20 
 ptydata.c|   66 
 ptyx.h   |   69 
 screen.c |   75 -
 scrollback.c |   14 
 terminfo |9 
 testxmc.c|   10 
 util.c   |  441 --
 version.h|6 
 xterm.appdata.xml|   24 
 xterm.h  |   24 
 xterm.log.html   |   78 +
 xtermcfg.hin |5 
 35 files changed, 2868 insertions(+), 2106 deletions(-)

New commits:
commit c12cb41756a4d0b4315f3ea067f4862b3080c699
Author: Julien Cristau jcris...@debian.org
Date:   Tue Jun 3 09:37:38 2014 +0200

Remove Cyril from Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 75986ba..86397e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xterm (305-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove Cyril from Uploaders.
 
  -- Julien Cristau jcris...@debian.org  Tue, 03 Jun 2014 09:27:48 +0200
 
diff --git a/debian/control b/debian/control
index 6f0372e..da41d47 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xterm
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: Cyril Brulebois k...@debian.org, Sven Joachim svenj...@gmx.de
+Uploaders: Sven Joachim svenj...@gmx.de
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-xorg/app/xterm.git
 Vcs-Git: git://anonscm.debian.org/pkg-xorg/app/xterm

commit 43aeab6d328b42d1f27d1cbb598ec8ab055a999f
Author: Julien Cristau jcris...@debian.org
Date:   Tue Jun 3 09:30:55 2014 +0200

New upstream release.

diff --git a/debian/changelog b/debian/changelog
index deeec29..75986ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (305-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Julien Cristau jcris...@debian.org  Tue, 03 Jun 2014 09:27:48 +0200
+
 xterm (304-1) unstable; urgency=low
 
   * New upstream release.

commit da4dc0f6a03b79967f9f404763d813bae955ac94
Author: Julien Cristau jcris...@debian.org
Date:   Tue Jun 3 09:27:02 2014 +0200

Imported Upstream version 305

diff --git a/INSTALL b/INSTALL
index 2eab615..66336c4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
--- $XTermId: INSTALL,v 1.150 2014/04/11 19:36:41 Ross.Combs Exp $
+-- $XTermId: INSTALL,v 1.151 2014/05/08 07:58:06 tom Exp $
 ---
--- Copyright 1997-2012,2013 by Thomas E. Dickey
+-- Copyright 1997-2013,2014 by Thomas E. Dickey
 --
 -- All Rights Reserved
 --
@@ -339,6 +339,14 @@ The options (in alphabetic order):
 
A genuine vt100 emulates a vt52.
 
+  --disable-wide-attrsdisable wide-attribute support
+
+   Xterm's base attributes include all of those used in DEC terminals.
+   ISO 6429 defines a few more which historically have found little use.
+   Some people find these amusing.
+
+   This is normally enabled.
+
   --disable-wide-charsdisable wide-character support
 
The wide-character code supports Unicode and UTF-8.
diff --git a/MANIFEST b/MANIFEST
index c140bba..001e738 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-304, version xterm-304
+MANIFEST for xterm-305, version xterm-305
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
@@ -100,6 +100,7 @@ wcwidth.h   interface of wcwidth.c
 xcharmouse.hJason Bacon's mouse-defs, cleaned up a little
 xstrings.c  a few common string functions
 xstrings.h  interface of xstrings.c
+xterm.appdata.xml   sample appdata.xml file
 xterm.dat   application defaults for VMS port of 'xterm'
 xterm.desktop   sample desktop file for xterm.
 xterm.h common includes, definitions and prototypes 
for 'xterm'
diff --git a/button.c b/button.c
index 7dc6e86..69936a5

xterm: Changes to 'debian-unstable'

2014-05-07 Thread Sven Joachim 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9070509f361ac1960670bb85fdcab4a8f7869515
Author: Sven Joachim svenj...@gmx.de
Date:   Wed May 7 16:50:59 2014 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 523d699..deeec29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xterm (304-1) UNRELEASED; urgency=low
+xterm (304-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Sven Joachim svenj...@gmx.de  Mon, 05 May 2014 17:54:47 +0200
+ -- Sven Joachim svenj...@gmx.de  Wed, 07 May 2014 16:50:50 +0200
 
 xterm (303-1) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wi3it-0001k0...@moszumanska.debian.org

xterm: Changes to 'debian-unstable'

2014-05-05 Thread Sven Joachim 
 INSTALL  |6 
 Imakefile|   13 
 MANIFEST |6 
 Tekproc.c|   38 
 VTPrsTbl.c   |   38 
 VTparse.def  |5 
 VTparse.h|5 
 aclocal.m4   |   35 
 button.c |  120 -
 charproc.c   |  389 +++--
 configure| 3299 ++--
 configure.in |   31 
 ctlseqs.ms   |   74 
 ctlseqs.txt  |   92 -
 debian/changelog |6 
 doublechr.c  |6 
 fontutils.c  |   97 -
 graphics.c   | 1491 
 graphics.h   |   78 -
 graphics_regis.c | 3482 +++
 graphics_regis.h |   48 
 graphics_sixel.c |  640 
 graphics_sixel.h |   48 
 input.c  |   10 
 main.c   |   89 -
 menu.c   |  353 ++--
 menu.h   |   12 
 misc.c   |  202 +-
 package/debian/changelog |6 
 package/freebsd/Makefile |2 
 package/xterm.spec   |4 
 ptyx.h   |   43 
 resize.c |8 
 screen.c |   20 
 trace.c  |5 
 util.c   |   28 
 version.h|6 
 xstrings.c   |   18 
 xterm.h  |   42 
 xterm.log.html   |   72 
 xterm.man|8 
 xtermcap.c   |   22 
 xtermcfg.hin |4 
 43 files changed, 7879 insertions(+), 3122 deletions(-)

New commits:
commit 2c2e9fd563e446a0039b281d837965ea687b368f
Author: Sven Joachim svenj...@gmx.de
Date:   Mon May 5 17:57:28 2014 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 84d93d0..523d699 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (304-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Sven Joachim svenj...@gmx.de  Mon, 05 May 2014 17:54:47 +0200
+
 xterm (303-1) unstable; urgency=low
 
   * New upstream release.

commit 7c49ea6ca1f85fff688378d401441558bba22588
Author: Sven Joachim svenj...@gmx.de
Date:   Mon May 5 17:51:41 2014 +0200

Imported Upstream version 304

diff --git a/INSTALL b/INSTALL
index 2554ca2..2eab615 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.149 2013/08/04 19:33:14 tom Exp $
+-- $XTermId: INSTALL,v 1.150 2014/04/11 19:36:41 Ross.Combs Exp $
 ---
 -- Copyright 1997-2012,2013 by Thomas E. Dickey
 --
@@ -482,6 +482,10 @@ The options (in alphabetic order):
 
Compile-in code to support SCO-style function keys.
 
+  --enable-regis-graphics enable support for ReGIS graphics
+
+   Compile-in code to support experimental ReGIS graphics
+
   --enable-sixel-graphics enable support for sixel-graphics
 
Compile-in code to support experimental sixel-graphics
diff --git a/Imakefile b/Imakefile
index 81b6ce8..0c2b20e 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.109 2013/06/23 22:32:37 tom Exp $
+XCOMM $XTermId: Imakefile,v 1.110 2014/04/11 19:36:41 Ross.Combs Exp $
 XCOMM
 XCOMM Attention xterm porters
 XCOMM
@@ -165,6 +165,9 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
 #if !HasPutenv
   PUTENVDEF = -DNOPUTENV
 #endif
+#ifdef RegisXTerm
+   SIXELDEF = -DOPT_REGIS_GRAPHICS=1
+#endif
 #ifdef SixelXTerm
SIXELDEF = -DOPT_SIXEL_GRAPHICS=1
 #endif
@@ -182,9 +185,13 @@ TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
 
 MAINSRC = main.c
 MAINOBJ = main.o
+#ifdef RegisXTerm
+   SIXELSRC = graphics_regis.c
+   SIXELOBJ = graphics_regis.o
+#endif
 #ifdef SixelXTerm
-   SIXELSRC = graphics.c
-   SIXELOBJ = graphics.o
+   SIXELSRC = graphics_sixel.c
+   SIXELOBJ = graphics_sixel.o
 #endif
 #ifdef TraceXTerm
TRACESRC = trace.c
diff --git a/MANIFEST b/MANIFEST
index 7cc89db..c140bba 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-303, version xterm-303
+MANIFEST for xterm-304, version xterm-304
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
@@ -49,6 +49,10 @@ fontutils.h interface of fontutils.c
 gen-pc-fkeys.pl script to generate extended function-key 
terminfo
 graphics.c  graphics support functions for 'xterm'
 graphics.h  interface of graphics.c
+graphics_regis.csupport for ReGIS
+graphics_regis.hinterface of graphics_regis.c
+graphics_sixel.csupport for Sixels
+graphics_sixel.hinterface of graphics_sixel.c
 input.c

xterm: Changes to 'debian-unstable'

2014-03-07 Thread Sven Joachim 
 MANIFEST |2 -
 THANKS   |6 ++-
 debian/changelog |8 
 main.c   |   48 
 misc.c   |   60 +++
 package/debian/changelog |6 +++
 package/freebsd/Makefile |2 -
 package/xterm.spec   |4 +-
 version.h|6 +--
 xterm.log.html   |   29 -
 xterm.man|   79 +--
 11 files changed, 198 insertions(+), 52 deletions(-)

New commits:
commit 8cba09e1dc0e325bfa1436799b3938d2c9f23631
Author: Sven Joachim svenj...@gmx.de
Date:   Fri Mar 7 18:24:17 2014 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index f453a39..84d93d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xterm (303-1) UNRELEASED; urgency=low
+xterm (303-1) unstable; urgency=low
 
   * New upstream release.
 - Fix a regression in xterm 302 relating to interaction of SHELL
   and XTERM_SHELL variables (Closes: #740919).
 
- -- Sven Joachim svenj...@gmx.de  Fri, 07 Mar 2014 18:00:40 +0100
+ -- Sven Joachim svenj...@gmx.de  Fri, 07 Mar 2014 18:23:50 +0100
 
 xterm (302-1) unstable; urgency=low
 

commit 853f2664048c0306c6ad8e8d2c557b7f3ea85943
Author: Sven Joachim svenj...@gmx.de
Date:   Fri Mar 7 18:04:43 2014 +0100

Close bug #740919

The submitter already confirmed his problem fixed, although there is
still an issue with SHELL pointing to a shell not present in
/etc/shells.

diff --git a/debian/changelog b/debian/changelog
index 405dfa1..f453a39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xterm (303-1) UNRELEASED; urgency=low
 
   * New upstream release.
+- Fix a regression in xterm 302 relating to interaction of SHELL
+  and XTERM_SHELL variables (Closes: #740919).
 
  -- Sven Joachim svenj...@gmx.de  Fri, 07 Mar 2014 18:00:40 +0100
 

commit ba9ece3a5cc4a4694c44178d02f96bf3c6c4d0c8
Author: Sven Joachim svenj...@gmx.de
Date:   Fri Mar 7 18:00:56 2014 +0100

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 6857162..405dfa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (303-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Sven Joachim svenj...@gmx.de  Fri, 07 Mar 2014 18:00:40 +0100
+
 xterm (302-1) unstable; urgency=low
 
   * New upstream release.

commit 95e6e9e31c13949dfaed09cedf61b6bdbbf97eb9
Author: Sven Joachim svenj...@gmx.de
Date:   Fri Mar 7 17:49:03 2014 +0100

Imported Upstream version 303

diff --git a/MANIFEST b/MANIFEST
index bc11abb..7cc89db 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-302, version xterm-302
+MANIFEST for xterm-303, version xterm-303
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/THANKS b/THANKS
index a38ebf9..1b83740 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
--- $XTermId: THANKS,v 1.11 2013/08/08 08:24:07 tom Exp $
+-- $XTermId: THANKS,v 1.12 2014/03/03 19:31:41 tom Exp $
 -- vile:txtmode fk=8bit
 There's no AUTHORS file in this distribution; it would be redundant since
 I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996.
@@ -13,6 +13,7 @@ Here's a list from xterm.log.html of people who have 
contributed changes.
 Adam M Costello
 Adam Sulmicki
 Ailin Nemui
+Al Poole
 Alan Coopersmith
 Alex Hornung
 Alexander Pohoyda
@@ -23,6 +24,7 @@ Andreas Schwab
 Andres Perera
 Andrew Sumner
 Andrew Tipton
+Andrey Panov
 Andries E Brouwer
 Anton Kovalenko
 Balazs Kezes
@@ -155,6 +157,7 @@ Rob Braun
 Robert Brady
 Robert Earl
 Robin Cutshaw
+Romain Francois
 Ross Combs
 Ross Paterson
 Ryan Johnson
@@ -184,6 +187,7 @@ Tomohiro Kubota
 Tor Lillqvist
 Torrey Lyons
 Victor Stinner
+Vincent Lefevre
 Werner Lemberg
 Will Day
 Zdenek Sekera
diff --git a/main.c b/main.c
index 6157068..c644e7a 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.748 2014/03/03 01:15:27 tom Exp $ */
+/* $XTermId: main.c,v 1.751 2014/03/07 02:35:39 tom Exp $ */
 
 /*
  * Copyright 2002-2013,2014 by Thomas E. Dickey
@@ -1203,6 +1203,9 @@ static OptionHelp xtermOptions[] = {
 { -/+rw, turn on/off reverse wraparound },
 { -/+s,  turn on/off multiscroll },
 { -/+sb, turn on/off scrollbar },
+#if OPT_REPORT_COLORS
+{ -report-colors,report colors as they are allocated },
+#endif
 #if OPT_REPORT_FONTS
 { -report-fonts, report fonts as loaded to stdout },
 #endif
@@ -3149,9 +3152,37 @@ find_utmp(struct UTMP_STR *tofind)
 #define USE_NO_DEV_TTY 0
 #endif
 
+static int
+same_leaf(char *a, char *b)
+{
+char *p = x_basename(a);
+char *q = x_basename(b);
+return !strcmp(p, q);
+}
+
+/*
+ * good enough (inode

xterm: Changes to 'debian-unstable'

2014-03-04 Thread Sven Joachim 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b34d3294d02e84caadcce16198303eda8ffa3bf5
Author: Sven Joachim svenj...@gmx.de
Date:   Tue Mar 4 19:55:30 2014 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index a7bbeff..6857162 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xterm (302-1) UNRELEASED; urgency=low
+xterm (302-1) unstable; urgency=low
 
   * New upstream release.
   * Update copy of XTerm FAQ to revision 1.278 (dated 2014/02/24)
 (Closes: #737692).
   * Check GPG signature of upstream tarballs in the watch file.
 
- -- Sven Joachim svenj...@gmx.de  Mon, 03 Mar 2014 18:39:43 +0100
+ -- Sven Joachim svenj...@gmx.de  Tue, 04 Mar 2014 19:55:16 +0100
 
 xterm (301-1) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1wkuag-00036z...@moszumanska.debian.org

xterm: Changes to 'debian-unstable'

2014-03-03 Thread Sven Joachim 
 MANIFEST|2 
 Makefile.in |   21 -
 charproc.c  |   30 +
 data.h  |7 
 debian/changelog|9 
 debian/local/xterm.faq.html |  777 
 debian/upstream/signing-key.asc |   24 +
 debian/watch|2 
 main.c  |   26 -
 minstall.in |   10 
 misc.c  |  174 +---
 package/debian/changelog|6 
 package/debian/control  |2 
 package/debian/rules|2 
 package/freebsd/Makefile|2 
 package/xterm.spec  |   39 +-
 ptyx.h  |   26 +
 trace.c |7 
 version.h   |6 
 vttests/256colors.pl|   13 
 vttests/256colors2.pl   |   13 
 vttests/88colors.pl |   11 
 vttests/88colors2.pl|   13 
 vttests/dynamic.pl  |7 
 vttests/paste64.pl  |8 
 vttests/query-color.pl  |7 
 vttests/query-fonts.pl  |7 
 vttests/resize.pl   |   28 +
 vttests/tcapquery.pl|7 
 xterm.h |4 
 xterm.log.html  |   53 ++
 xterm.man   |   53 ++
 32 files changed, 852 insertions(+), 544 deletions(-)

New commits:
commit aec7c9ef6b87b5fce4de8a2b53d91623a1045e02
Author: Sven Joachim svenj...@gmx.de
Date:   Mon Mar 3 19:07:23 2014 +0100

Update copy of XTerm FAQ to revision 1.278 (dated 2014/02/24)

The paragraph that mentions /usr/lib/X11/app-defaults/XTerm has been
rewritten to clarify that it applies to Solaris only.

diff --git a/debian/changelog b/debian/changelog
index 80e5f94..a7bbeff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xterm (302-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Update copy of XTerm FAQ to revision 1.278 (dated 2014/02/24)
+(Closes: #737692).
   * Check GPG signature of upstream tarballs in the watch file.
 
  -- Sven Joachim svenj...@gmx.de  Mon, 03 Mar 2014 18:39:43 +0100
diff --git a/debian/local/xterm.faq.html b/debian/local/xterm.faq.html
index 312fa10..026dfe1 100644
--- a/debian/local/xterm.faq.html
+++ b/debian/local/xterm.faq.html
@@ -1,6 +1,6 @@
 !--
  *
- * Copyright 1997-2012,2013 by Thomas E. Dickey  *
+ * Copyright 1997-2013,2014 by Thomas E. Dickey  *
  * All Rights Reserved.  *
  *   *
  * Permission to use, copy, modify, and distribute this software and its *
@@ -19,8 +19,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   *
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.*
  *
-  $XTermId: xterm.faq.html,v 1.259 2013/11/25 10:22:56 tom Exp $
-  base href=http://invisible-island.net/xterm/;
+  $XTermId: xterm.faq.html,v 1.278 2014/02/24 22:32:04 tom Exp $
   --
 !DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01//EN
 
@@ -33,6 +32,10 @@
   link rev=MADE href=mailto:dic...@invisible-island.net;
   meta http-equiv=Content-Type content=
   text/html; charset=us-ascii
+  meta name=keywords content=
+  xterm, terminal, vt220, vt420, 256-colors, UTF-8
+  meta name=description content=
+  xterm is the standard terminal emulator for the X Window System. This page 
gives some background and pointers to xterm resources.
   link rel=SHORTCUT ICON href=/img/icons/xterm.ico type=
   image/x-icon
   link rel=stylesheet href=/css/simplestyle.css type=
@@ -42,65 +45,65 @@
   link rel=stylesheet href=/css/xterm-icons.css type=
   text/css
   style type=text/css
-@import /css/simplenav15.css all;
+@import /css/simplenavXX.css all;
   /style
 /head
 
 body
   hr
 
-  pa href=../http://invisible-island.net//aa href=
+  pa href=/http://invisible-island.net//aa href=
   ./xterm//abr
-  Copyright copy; 1997-2012,2013 by Thomas E. Dickey/p
+  Copyright copy; 1997-2013,2014 by Thomas E. Dickey/p
   hr
 
-  pa href=xterm.faq.htmlHere/a is the latest version of
-  this file./p
+  pa href=
+  http://invisible-island.net/xterm/xterm.faq.html;Here/a is
+  the latest version of this file./p
+
+  h1 class=no-headerXTerm ndash; Frequently Asked Questions
+  (FAQ)/h1
 
   div class=nav
 ul
-  lia href=xterm.faq.html(top)/a/li
+  li class=nav-topa href=
+  /xterm/xterm.faq.html(top)/a/li
 
-  lia href=xterm.faq.html#what_is_itWhat is
+  lia href=#what_is_itWhat is
   strongXTerm/strong?/a/li
 
-  lia href=xterm.faq.html#who_did_itWho wrote
+  lia href=#who_did_itWho wrote
   strongXTerm/strong?/a/li
 
-  lia

xterm: Changes to 'debian-unstable'

2014-01-22 Thread Sven Joachim 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit afc0b4b520f584fd484ac12bf41df3bf0957f0df
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Jan 22 18:22:21 2014 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 433f601..9c10843 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (301-1) UNRELEASED; urgency=low
+xterm (301-1) unstable; urgency=low
 
   * New upstream release.
 - Improve manpage description of scrollbar translations versus
@@ -6,7 +6,7 @@ xterm (301-1) UNRELEASED; urgency=low
   * Build-depend on autotools-dev to update config.{guess,sub}.
   * Bump Standards-Version to 3.9.5, no changes needed.
 
- -- Sven Joachim svenj...@gmx.de  Sun, 05 Jan 2014 19:08:05 +0100
+ -- Sven Joachim svenj...@gmx.de  Wed, 22 Jan 2014 18:22:12 +0100
 
 xterm (300-1) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1w61zl-0007un...@moszumanska.debian.org

xterm: Changes to 'debian-unstable'

2014-01-20 Thread Sven Joachim 
 MANIFEST |2 
 config.guess |   30 
 configure| 2505 +++
 configure.in |5 
 ctlseqs.ms   |   34 
 ctlseqs.txt  |   16 
 debian/changelog |5 
 fontutils.c  |   15 
 fontutils.h  |7 
 main.c   |  107 +-
 misc.c   |   70 -
 package/debian/changelog |6 
 package/debian/copyright |2 
 package/freebsd/Makefile |2 
 package/xterm.spec   |4 
 util.c   |   37 
 version.h|8 
 xterm.h  |8 
 xterm.log.html   |   46 
 xterm.man|  192 ++-
 xtermcfg.hin |5 
 21 files changed, 1678 insertions(+), 1428 deletions(-)

New commits:
commit 185d267b700a7a2461d600d69a06afa918691bb5
Author: Sven Joachim svenj...@gmx.de
Date:   Mon Jan 20 19:54:19 2014 +0100

Close bug 723573

diff --git a/debian/changelog b/debian/changelog
index 7744dd0..433f601 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xterm (301-1) UNRELEASED; urgency=low
 
   * New upstream release.
+- Improve manpage description of scrollbar translations versus
+  the vt100 translations (Closes: #723573).
   * Build-depend on autotools-dev to update config.{guess,sub}.
   * Bump Standards-Version to 3.9.5, no changes needed.
 

commit 55162cc633b61a993ee4d81910afcb25c28f88a8
Author: Sven Joachim svenj...@gmx.de
Date:   Mon Jan 20 19:41:28 2014 +0100

New upstream release

diff --git a/debian/changelog b/debian/changelog
index db44605..7744dd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xterm (300-2) UNRELEASED; urgency=low
+xterm (301-1) UNRELEASED; urgency=low
 
+  * New upstream release.
   * Build-depend on autotools-dev to update config.{guess,sub}.
   * Bump Standards-Version to 3.9.5, no changes needed.
 

commit 8e93c34ea71623763318a83fbac8b8457c225059
Author: Sven Joachim svenj...@gmx.de
Date:   Mon Jan 20 19:35:56 2014 +0100

Imported Upstream version 301

diff --git a/MANIFEST b/MANIFEST
index 499d9ab..95ab9da 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-300, version xterm-300
+MANIFEST for xterm-301, version xterm-301
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/config.guess b/config.guess
index b79252d..9afd676 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2013-06-10'
+timestamp='2013-11-29'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -1260,16 +1260,26 @@ EOF
if test $UNAME_PROCESSOR = unknown ; then
UNAME_PROCESSOR=powerpc
fi
-   if [ $CC_FOR_BUILD != 'no_compiler_found' ]; then
-   if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-   (CCOPTS= $CC_FOR_BUILD -E - 2/dev/null) | \
-   grep IS_64BIT_ARCH /dev/null
-   then
-   case $UNAME_PROCESSOR in
-   i386) UNAME_PROCESSOR=x86_64 ;;
-   powerpc) UNAME_PROCESSOR=powerpc64 ;;
-   esac
+   if test `echo $UNAME_RELEASE | sed -e 's/\..*//'` -le 10 ; then
+   if [ $CC_FOR_BUILD != 'no_compiler_found' ]; then
+   if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') 
| \
+   (CCOPTS= $CC_FOR_BUILD -E - 2/dev/null) | \
+   grep IS_64BIT_ARCH /dev/null
+   then
+   case $UNAME_PROCESSOR in
+   i386) UNAME_PROCESSOR=x86_64 ;;
+   powerpc) UNAME_PROCESSOR=powerpc64 ;;
+   esac
+   fi
fi
+   elif test $UNAME_PROCESSOR = i386 ; then
+   # Avoid executing cc on OS X 10.9, as it ships with a stub
+   # that puts up a graphical alert prompting to install
+   # developer tools.  Any system running Mac OS X 10.7 or
+   # later (Darwin 11 and later) is required to have a 64-bit
+   # processor. This is not true of the ARM version of Darwin
+   # that Apple uses in portable devices.
+   UNAME_PROCESSOR=x86_64
fi
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
diff --git a/configure b/configure
index 1ec5f9f..d24be2d 100755
--- a/configure
+++ b/configure
@@ -4550,6 +4550,7 @@ fi
 for ac_func in \
gethostname \
getlogin \
+   initgroups \
mkdtemp \
putenv \
unsetenv \
@@ -4562,13 +4563,13 @@ for ac_func in \
wcwidth
 do
 as_ac_var=`echo ac_cv_func_$ac_func |

xterm: Changes to 'debian-unstable'

2014-01-05 Thread Sven Joachim 
 debian/changelog |7 +++
 debian/control   |4 +++-
 debian/rules |2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 8d7ab352f4d7d12bf099f0e8d16071c98c831136
Author: Sven Joachim svenj...@gmx.de
Date:   Sun Jan 5 19:42:32 2014 +0100

Bump Standards-Version to 3.9.5

diff --git a/debian/changelog b/debian/changelog
index 61a13fc..db44605 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xterm (300-2) UNRELEASED; urgency=low
 
   * Build-depend on autotools-dev to update config.{guess,sub}.
+  * Bump Standards-Version to 3.9.5, no changes needed.
 
  -- Sven Joachim svenj...@gmx.de  Sun, 05 Jan 2014 19:08:05 +0100
 
diff --git a/debian/control b/debian/control
index 08bd5ce..6f0372e 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: Cyril Brulebois k...@debian.org, Sven Joachim svenj...@gmx.de
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 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 98bb8f7b63fa3c3cb31c5c359cabff2296f0dea2
Author: Sven Joachim svenj...@gmx.de
Date:   Sun Jan 5 19:08:37 2014 +0100

Build-depend on autotools-dev to update config.{guess,sub}

diff --git a/debian/changelog b/debian/changelog
index ae26cdb..61a13fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (300-2) UNRELEASED; urgency=low
+
+  * Build-depend on autotools-dev to update config.{guess,sub}.
+
+ -- Sven Joachim svenj...@gmx.de  Sun, 05 Jan 2014 19:08:05 +0100
+
 xterm (300-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 9d6dd60..08bd5ce 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Build-Depends:
  libxcursor-dev,
  debhelper (= 9),
  quilt,
+ autotools-dev,
  lynx-cur | lynx,
  xorg-docs-core,
  desktop-file-utils,
@@ -103,6 +104,7 @@ Build-Depends:
 #   detect
 #   debhelper (= 9)debian/compat = 9
 #   quilt   patch management system
+#   autotools-dev   update config.guess, config.sub
 #   lynx-cur | lynx generates plain-text version of xterm faq
 #   desktop-file-utils  for installing xterm.desktop
 
diff --git a/debian/rules b/debian/rules
index c512cee..e0d4995 100755
--- a/debian/rules
+++ b/debian/rules
@@ -67,7 +67,7 @@ override_dh_install:
dh_install --fail-missing
 
 %:
-   dh $@ --with quilt --builddirectory=build/ --parallel
+   dh $@ --with quilt,autotools_dev --builddirectory=build/ --parallel
 
 debian/local/xterm.faq.html:
wget -O $@ http://invisible-island.net/xterm/xterm.faq.html


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vzsky-sz...@moszumanska.debian.org

xterm: Changes to 'debian-unstable'

2013-12-04 Thread Sven Joachim 
 MANIFEST |2 +-
 debian/changelog |8 
 misc.c   |3 +--
 package/debian/changelog |6 ++
 package/freebsd/Makefile |2 +-
 package/xterm.spec   |4 ++--
 version.h|6 +++---
 xterm.log.html   |   19 ++-
 8 files changed, 40 insertions(+), 10 deletions(-)

New commits:
commit acac1ce9ecd63bc72ad95e36f3a521c2d6148b5a
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Dec 4 18:05:14 2013 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index b5412b5..ae26cdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xterm (300-1) UNRELEASED; urgency=low
+xterm (300-1) unstable; urgency=low
 
   * New upstream release.
 - Avoid infinite recursion and stack overflow in libxcursor
   (Closes: #731269).
 
- -- Sven Joachim svenj...@gmx.de  Wed, 04 Dec 2013 17:52:17 +0100
+ -- Sven Joachim svenj...@gmx.de  Wed, 04 Dec 2013 18:05:01 +0100
 
 xterm (299-1) unstable; urgency=low
 

commit fa36d7f17c8d77e9eb78bf0a76ffe24da7f4c56a
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Dec 4 17:57:16 2013 +0100

Close bug 731269

diff --git a/debian/changelog b/debian/changelog
index d7f9bea..b5412b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xterm (300-1) UNRELEASED; urgency=low
 
   * New upstream release.
+- Avoid infinite recursion and stack overflow in libxcursor
+  (Closes: #731269).
 
  -- Sven Joachim svenj...@gmx.de  Wed, 04 Dec 2013 17:52:17 +0100
 

commit c281f63305d9d9510dc68395b9363694f9b35b3e
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Dec 4 17:52:23 2013 +0100

New upstream release

diff --git a/debian/changelog b/debian/changelog
index f73f652..d7f9bea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (300-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Sven Joachim svenj...@gmx.de  Wed, 04 Dec 2013 17:52:17 +0100
+
 xterm (299-1) unstable; urgency=low
 
   * New upstream release.

commit 9d1d81fcbf72e3222b196493a9a0cbed10a43f93
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Dec 4 17:49:17 2013 +0100

Imported Upstream version 300

diff --git a/MANIFEST b/MANIFEST
index 1804074..499d9ab 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-299, version xterm-299
+MANIFEST for xterm-300, version xterm-300
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/misc.c b/misc.c
index 9c26cb6..129d0a5 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.681 2013/11/26 22:47:29 tom Exp $ */
+/* $XTermId: misc.c,v 1.682 2013/12/03 23:24:48 tom Exp $ */
 
 /*
  * Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -735,7 +735,6 @@ init_colored_cursor(void)
strcat(leaf, theme);
if ((fp = fopen(xterm_cursor_theme, w)) != 0) {
fprintf(fp, [Icon Theme]\n);
-   fprintf(fp, Inherits=\n);
fclose(fp);
*leaf = '\0';
xtermSetenv(XCURSOR_PATH, xterm_cursor_theme);
diff --git a/package/debian/changelog b/package/debian/changelog
index 00907c7..828b54c 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,9 @@
+xterm-dev (300) unstable; urgency=high
+
+  * fix a regression from #298 changes
+
+ -- Thomas E. Dickey dic...@invisible-island.net  Tue, 03 Dec 2013 18:59:58 
-0500
+
 xterm-dev (299) unstable; urgency=low
 
   * fix remaining regression from #297 changes
diff --git a/package/freebsd/Makefile b/package/freebsd/Makefile
index b3c4f6c..9d0bcb3 100644
--- a/package/freebsd/Makefile
+++ b/package/freebsd/Makefile
@@ -5,7 +5,7 @@
 # and make makesum.
 
 PORTNAME=  xterm
-PORTVERSION=   299
+PORTVERSION=   300
 CATEGORIES=x11
 MASTER_SITES=  ftp://invisible-island.net/xterm/ \
CRITICAL
diff --git a/package/xterm.spec b/package/xterm.spec
index 854d4b4..092668a 100644
--- a/package/xterm.spec
+++ b/package/xterm.spec
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.57 2013/12/01 16:47:52 tom Exp $
+# $XTermId: xterm.spec,v 1.58 2013/12/03 23:59:13 tom Exp $
 Summary: X terminal emulator (development version)
 %global my_middle xterm
 %global my_suffix -dev
 %global fullname %{my_middle}%{my_suffix}
 %global my_class XTermDev
 Name: %{fullname}
-Version: 299
+Version: 300
 Release: 1
 License: X11
 Group: User Interface/X
diff --git a/version.h b/version.h
index 50477c5..bc96669 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.375 2013/12/01 16:38:13 tom Exp $ */
+/* $XTermId: version.h,v 1.376 2013/12/03 23:53:59 tom Exp $ */
 
 /*
  * Copyright 1998-2012,2013 by Thomas E. Dickey
@@ -38,8 +38,8 @@
  * version of X to which this version of xterm has been built.  The resulting
  * number in parentheses

xterm: Changes to 'debian-unstable'

2013-12-02 Thread Sven Joachim 
 MANIFEST |3 ++-
 Tekproc.c|4 ++--
 VTPrsTbl.c   |4 ++--
 charsets.c   |4 ++--
 cursor.c |4 ++--
 debian/changelog |7 +++
 debian/control   |3 +++
 doublechr.c  |4 ++--
 minstall.in  |4 ++--
 package/debian/changelog |6 ++
 package/debian/copyright |2 +-
 package/freebsd/Makefile |2 +-
 package/xterm.spec   |4 ++--
 trace.h  |4 ++--
 version.h|6 +++---
 xterm.log.html   |   14 +-
 xtermcap.h   |4 ++--
 17 files changed, 54 insertions(+), 25 deletions(-)

New commits:
commit cfbcb0b9e25bb99ed700c0facf6762a8c9cb557c
Author: Sven Joachim svenj...@gmx.de
Date:   Mon Dec 2 18:58:30 2013 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 8659db0..f73f652 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xterm (299-1) UNRELEASED; urgency=low
+xterm (299-1) unstable; urgency=low
 
   * New upstream release.
   * Add libxcursor-dev to Build-Depends (Closes: #466704).
 
- -- Sven Joachim svenj...@gmx.de  Mon, 02 Dec 2013 18:35:58 +0100
+ -- Sven Joachim svenj...@gmx.de  Mon, 02 Dec 2013 18:58:17 +0100
 
 xterm (298-1) unstable; urgency=low
 

commit aebba71542180d04a0acd6dab939815f3cdb1cff
Author: Sven Joachim svenj...@gmx.de
Date:   Mon Dec 2 18:47:33 2013 +0100

Add libxcursor-dev to Build-Depends

Needed by init_colored_cursor() and cleanup_colored_cursor() in misc.c,
see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=466704#181.

diff --git a/debian/changelog b/debian/changelog
index 7f9916d..8659db0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xterm (299-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Add libxcursor-dev to Build-Depends (Closes: #466704).
 
  -- Sven Joachim svenj...@gmx.de  Mon, 02 Dec 2013 18:35:58 +0100
 
diff --git a/debian/control b/debian/control
index 73fdc67..9d6dd60 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends:
  libxaw7-dev,
  libxkbfile-dev,
  libutempter-dev,
+ libxcursor-dev,
  debhelper (= 9),
  quilt,
  lynx-cur | lynx,
@@ -96,6 +97,8 @@ Build-Depends:
 #   data.h:#include X11/extensions/XKBbells.h
 #   libutempter-dev
 #   main.c:#include utempter.h
+#   libxcursor-dev
+#   misc.c:#ifdev HAVE_LIB_XCURSOR
 #   xorg-docs-core  provides X(7) which minstall.sh tries to
 #   detect
 #   debhelper (= 9)debian/compat = 9

commit 0cd4bd0b68445927b9c38a28a8d8a92d8bfb5fb8
Author: Sven Joachim svenj...@gmx.de
Date:   Mon Dec 2 18:36:07 2013 +0100

New upstream release

diff --git a/debian/changelog b/debian/changelog
index cb19ac0..7f9916d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (299-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Sven Joachim svenj...@gmx.de  Mon, 02 Dec 2013 18:35:58 +0100
+
 xterm (298-1) unstable; urgency=low
 
   * New upstream release.

commit a5ef86eb6abce2eada071b4c97a8571daa990ad5
Author: Sven Joachim svenj...@gmx.de
Date:   Mon Dec 2 18:33:49 2013 +0100

Imported Upstream version 299

diff --git a/MANIFEST b/MANIFEST
index 91125e6..1804074 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-298, version xterm-298
+MANIFEST for xterm-299, version xterm-299
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
@@ -48,6 +48,7 @@ fontutils.c xterm functions for 
(re)loading fonts
 fontutils.h interface of fontutils.c
 gen-pc-fkeys.pl script to generate extended function-key 
terminfo
 graphics.c  graphics support functions for 'xterm'
+graphics.h  interface of graphics.c
 input.c VT100 key-symbol and function-key translation
 install-sh  install-script (needed by configure)
 keysym2ucs.clookup-table for UTF-8 to keysyms
diff --git a/Tekproc.c b/Tekproc.c
index bb22f3b..3961c6b 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,7 +1,7 @@
-/* $XTermId: Tekproc.c,v 1.193 2012/09/07 09:08:44 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.194 2012/09/07 09:08:44 tom Exp $ */
 
 /*
- * Copyright 2001-2010,2011 by Thomas E. Dickey
+ * Copyright 2001-2011,2012 by Thomas E. Dickey
  *
  * All Rights Reserved
  *
diff --git a/VTPrsTbl.c b/VTPrsTbl.c
index 34accc3..9f67957 100644
--- a/VTPrsTbl.c
+++ b/VTPrsTbl.c
@@ -1,7 +1,7 @@
-/* $XTermId: VTPrsTbl.c,v 1.72 2013/08/21 23:50:44 tom Exp $ */
+/* $XTermId: VTPrsTbl.c,v 1.73 2013/08/21 23:50:44 tom Exp $ */
 
 /*
- * Copyright 1999-2011,2012 by Thomas E. Dickey
+ *

xterm: Changes to 'debian-unstable'

2013-12-01 Thread Sven Joachim 
 debian/changelog|7 +-
 debian/local/xterm.faq.html |  135 +---
 debian/rules|5 +
 3 files changed, 113 insertions(+), 34 deletions(-)

New commits:
commit 6fa1dbd874a67a54e53793a38ef37129794f484a
Author: Sven Joachim svenj...@gmx.de
Date:   Sun Dec 1 09:18:12 2013 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 922d740..cb19ac0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (298-1) UNRELEASED; urgency=low
+xterm (298-1) unstable; urgency=low
 
   * New upstream release.
 - Change default for assumeAllChars resource (Closes: #725682).
@@ -13,7 +13,7 @@ xterm (298-1) UNRELEASED; urgency=low
   * Add a debian/rules target to download that FAQ from
 http://invisible-island.net.
 
- -- Sven Joachim svenj...@gmx.de  Wed, 27 Nov 2013 19:12:36 +0100
+ -- Sven Joachim svenj...@gmx.de  Sun, 01 Dec 2013 09:18:00 +0100
 
 xterm (297-1) unstable; urgency=low
 

commit 01ddf80250f31c3ce4fc4e875eae1ca53a8c4561
Author: Sven Joachim svenj...@gmx.de
Date:   Sun Dec 1 09:08:30 2013 +0100

Add a debian/rules target to download the XTerm FAQ

diff --git a/debian/changelog b/debian/changelog
index 6e18450..922d740 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ xterm (298-1) UNRELEASED; urgency=low
 - work around Xcursor library to make pointerColor resource work as
   documented (Closes: #466704).
   * Update copy of XTerm FAQ to revision 1.259 (dated 2013/11/25).
+  * Add a debian/rules target to download that FAQ from
+http://invisible-island.net.
 
  -- Sven Joachim svenj...@gmx.de  Wed, 27 Nov 2013 19:12:36 +0100
 
diff --git a/debian/rules b/debian/rules
index b1ad0da..c512cee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,3 +68,8 @@ override_dh_install:
 
 %:
dh $@ --with quilt --builddirectory=build/ --parallel
+
+debian/local/xterm.faq.html:
+   wget -O $@ http://invisible-island.net/xterm/xterm.faq.html
+
+.PHONY: debian/local/xterm.faq.html

commit ce2696a3b6f7cd5ec58d0fc9626955b2337b3e99
Author: Sven Joachim svenj...@gmx.de
Date:   Sun Dec 1 09:05:03 2013 +0100

Update copy of XTerm FAQ to revision 1.259 (dated 2013/11/25)

diff --git a/debian/changelog b/debian/changelog
index 813dcbf..6e18450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xterm (298-1) UNRELEASED; urgency=low
   (Closes: #728949).
 - work around Xcursor library to make pointerColor resource work as
   documented (Closes: #466704).
+  * Update copy of XTerm FAQ to revision 1.259 (dated 2013/11/25).
 
  -- Sven Joachim svenj...@gmx.de  Wed, 27 Nov 2013 19:12:36 +0100
 
diff --git a/debian/local/xterm.faq.html b/debian/local/xterm.faq.html
index 544c693..312fa10 100644
--- a/debian/local/xterm.faq.html
+++ b/debian/local/xterm.faq.html
@@ -19,13 +19,13 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   *
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.*
  *
-  $XTermId: xterm.faq.html,v 1.243 2013/07/05 17:33:01 tom Exp $
+  $XTermId: xterm.faq.html,v 1.259 2013/11/25 10:22:56 tom Exp $
+  base href=http://invisible-island.net/xterm/;
   --
 !DOCTYPE html PUBLIC -//W3C//DTD HTML 4.01//EN
 
 html
 head
-  base href=http://invisible-island.net/xterm/;
   meta name=generator content=
   HTML Tidy for Linux (vers 25 March 2009), see www.w3.org
 
@@ -521,19 +521,37 @@
 
   pFinally of course, there are a multitude of programs which set
   TERM to xterm, in the hope that applications will treat them
-  the same as xterm. For example, PuTTY does this. But its wrapping
-  behavior is incompatible with xterm (and any vt100 emulator). You
-  can see this in the first menu entry for a href=
-  ../vttest/vttest.htmlvttest/a./p
+  the same as xterm. For example,/p
+
+  ul
+liPuTTY does this. But its wrapping behavior is incompatible
+with xterm (and any vt100 emulator). You can see this in the
+first menu entry for a href=
+../vttest/vttest.htmlvttest/a./li
+
+liVTE does this. But consider the list of problems with
+a href=
+https://bugzilla.gnome.org/buglist.cgi?quicksearch=vte;VTE/a
+and with a href=
+https://bugzilla.gnome.org/buglist.cgi?quicksearch=gnome+terminal;
+GNOME Terminal/a./li
+
+liKonsole does this as wellmdash;intentionally as shown in
+a href=https://bugs.kde.org/show_bug.cgi?id=145977;KDE
+#145977/a. The reasoning expressed there is that Konsole
+should match xterm. Incidentally, one of the comments (about
+xterm's support for mouse) cited as proof a a href=
+http://www.linuxjournal.com/article/1136;page about Gpm/a
+from Linux Journal which was more than 12 years old./li
+  /ul
 
   pEach of the programs noted here which are well-established and
   which are known to differ markedly from xterm have

xterm: Changes to 'debian-unstable'

2013-11-27 Thread Sven Joachim 
 MANIFEST |2 
 aclocal.m4   |   30 
 button.c |4 
 charproc.c   |8 
 charsets.c   |5 
 config.guess |  167 +--
 config.sub   |   89 -
 configure| 2563 ---
 configure.in |6 
 ctlseqs.ms   |   20 
 ctlseqs.txt  |   15 
 data.c   |8 
 data.h   |   11 
 debian/changelog |   14 
 fontutils.c  |  135 ++
 fontutils.h  |6 
 graphics.c   |   46 
 input.c  |   13 
 main.c   |   41 
 misc.c   |   81 +
 package/debian/changelog |6 
 package/freebsd/Makefile |2 
 package/xterm.spec   |4 
 ptyx.h   |6 
 trace.c  |   20 
 trace.h  |4 
 util.c   |  145 +-
 version.h|6 
 xstrings.c   |8 
 xterm.h  |4 
 xterm.log.html   |   55 -
 xterm.man|   21 
 xtermcfg.hin |4 
 33 files changed, 2024 insertions(+), 1525 deletions(-)

New commits:
commit b5e28f09b6f50c583a7e1513fe4ccdef7b62a040
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Nov 27 23:06:53 2013 +0100

Close some bugs fixed in the new upstream release

diff --git a/debian/changelog b/debian/changelog
index 73f2b87..813dcbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,14 @@
 xterm (298-1) UNRELEASED; urgency=low
 
   * New upstream release.
+- Change default for assumeAllChars resource (Closes: #725682).
+- Amend change from xterm 297 for ASCII-equivalents to ensure that
+  missing characters which happen to be double-width are padded to
+  the expected number of columns. Also, correct the choice between
+  normal/wide Xft fonts used when checking for missing characters
+  (Closes: #728949).
+- work around Xcursor library to make pointerColor resource work as
+  documented (Closes: #466704).
 
  -- Sven Joachim svenj...@gmx.de  Wed, 27 Nov 2013 19:12:36 +0100
 

commit 8f8cb51e14ca482eefc02fcca1f7978d5335a267
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Nov 27 19:12:40 2013 +0100

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 1085959..73f2b87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (298-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Sven Joachim svenj...@gmx.de  Wed, 27 Nov 2013 19:12:36 +0100
+
 xterm (297-1) unstable; urgency=low
 
   * New upstream release.

commit 4d8cd69e7b269c9f9d88ef0722bb0da0a73db363
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Nov 27 19:10:34 2013 +0100

Imported Upstream version 298

diff --git a/MANIFEST b/MANIFEST
index 08d673c..91125e6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-297, version xterm-297
+MANIFEST for xterm-298, version xterm-298
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/aclocal.m4 b/aclocal.m4
index da13727..3a1f086 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.369 2013/07/10 01:29:34 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.372 2013/11/20 00:24:55 tom Exp $
 dnl
 dnl ---
 dnl
@@ -376,7 +376,7 @@ fi
 
 ])dnl
 dnl ---
-dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39
+dnl CF_CLANG_COMPILER version: 2 updated: 2013/11/19 19:23:35
 dnl -
 dnl Check if the given compiler is really clang.  clang's C driver defines
 dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
@@ -387,7 +387,7 @@ dnl ensure that it is not mistaken for gcc/g++.  It is 
normally invoked from
 dnl the wrappers for gcc and g++ warnings.
 dnl
 dnl $1 = GCC (default) or GXX
-dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
+dnl $2 = CLANG_COMPILER (default)
 dnl $3 = CFLAGS (default) or CXXFLAGS
 AC_DEFUN([CF_CLANG_COMPILER],[
 ifelse([$2],,CLANG_COMPILER,[$2])=no
@@ -950,7 +950,7 @@ if test $GCC = yes ; then
 fi
 ])dnl
 dnl ---
-dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39
+dnl CF_GCC_WARNINGS version: 31 updated: 2013/11/19 19:23:35
 dnl ---
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:
@@ -1022,10 +1022,14 @@ then
EXTRA_CFLAGS=
cf_warn_CONST=
test $with_ext_const = yes  cf_warn_CONST=Wwrite-strings
+   cf_gcc_warnings=Wignored-qualifiers Wlogical-op

xterm: Changes to 'debian-unstable'

2013-09-15 Thread Sven Joachim 
 debian/changelog |5 +++--
 debian/rules |1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit fdd9674eb08d1a6dfc9941eb514db478288c5036
Author: Sven Joachim svenj...@gmx.de
Date:   Sun Sep 15 15:52:37 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 9d8cc84..1085959 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xterm (297-1) UNRELEASED; urgency=low
+xterm (297-1) unstable; urgency=low
 
   * New upstream release.
   * Enable sixel graphics (Closes: #716660).
 
- -- Sven Joachim svenj...@gmx.de  Thu, 11 Jul 2013 20:30:29 +0200
+ -- Sven Joachim svenj...@gmx.de  Sun, 15 Sep 2013 15:52:21 +0200
 
 xterm (295-1) unstable; urgency=low
 

commit dea5cf1a1c6a337aacecb279fd9a76ee7d16ac5c
Author: Sven Joachim svenj...@gmx.de
Date:   Sun Sep 15 15:43:06 2013 +0200

Enable sixel graphics

diff --git a/debian/changelog b/debian/changelog
index ce03567..9d8cc84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xterm (297-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Enable sixel graphics (Closes: #716660).
 
  -- Sven Joachim svenj...@gmx.de  Thu, 11 Jul 2013 20:30:29 +0200
 
diff --git a/debian/rules b/debian/rules
index bd9e25e..b1ad0da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,7 @@ override_dh_auto_configure:
--enable-exec-xterm \
--enable-dabbrev \
--enable-backarrow-is-erase \
+   --enable-sixel-graphics \
--with-utempter \
DESKTOP_FLAGS=$(DESKTOP_FLAGS) \
CFLAGS=$(CFLAGS) \


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vlcrc-0003ch...@vasks.debian.org

xterm: Changes to 'debian-unstable'

2013-09-11 Thread Sven Joachim 
 INSTALL  |   50 +-
 MANIFEST |2 
 THANKS   |4 
 VTPrsTbl.c   |  342 ++-
 VTparse.def  |6 
 VTparse.h|7 
 button.c |  291 ++--
 charproc.c   |  297 +---
 charsets.c   |  825 +--
 configure|  138 +++
 configure.in |   52 +-
 ctlseqs.ms   |   28 +
 ctlseqs.txt  |   29 +
 cursor.c |4 
 debian/changelog |2 
 doublechr.c  |6 
 fontutils.c  |   68 +--
 fontutils.h  |   20 -
 graphics.c   |   18 -
 input.c  |   19 -
 misc.c   |   87 ++--
 package/debian/changelog |6 
 package/freebsd/Makefile |2 
 package/xterm.spec   |4 
 ptyx.h   |   64 +++
 screen.c |   12 
 trace.c  |  110 +++---
 trace.h  |9 
 util.c   |   90 +++--
 version.h|6 
 xterm.h  |   10 
 xterm.log.html   |   97 +
 xterm.man|7 
 33 files changed, 1849 insertions(+), 863 deletions(-)

New commits:
commit 435561933205edb946921568b56b3b287c79b308
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Sep 11 17:40:18 2013 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 5d24019..ce03567 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (296-1) UNRELEASED; urgency=low
+xterm (297-1) UNRELEASED; urgency=low
 
   * New upstream release.
 

commit 109db94a827306c71c63fd8e3314e21509bde184
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Sep 11 17:33:32 2013 +0200

Imported Upstream version 297

diff --git a/INSTALL b/INSTALL
index 9d555fc..2554ca2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.148 2013/06/23 20:22:46 tom Exp $
+-- $XTermId: INSTALL,v 1.149 2013/08/04 19:33:14 tom Exp $
 ---
 -- Copyright 1997-2012,2013 by Thomas E. Dickey
 --
@@ -30,23 +30,12 @@
 ---
 
 Xterm was originally built as part of the X Window System source tree, using
-imake to generate a Makefile from Imakefile.  You can also use the configure
-script to generate a Makefile from Makefile.in:
+imake to generate a Makefile from Imakefile.
 
-   + If you have imake (or xmkmf), then you can use those directly,
- or use the configure script, which normally uses those tools
- to obtain the special definitions needed to build xterm.
+An example Imakefile is provided for legacy use.
 
- Ultimately, imake will not be necessary, since it is possible
- to add configure tests that derive the information that imake
- would supply.
-
-   + You need the Athena widgets (or a clone, such as Xaw3d or
- neXtaw), to provide the popup menus.
-
-Even if you have imake, the configure script is still convenient because
-it allows you to build different configurations more easily than with
-imake, simply by specifying options to the configure script.
+The preferred method uses the configure script to generate a Makefile from
+Makefile.in
 
 Options:
 ---
@@ -221,6 +210,15 @@ The options (in alphabetic order):
tool.  Normally these chunks of memory are retained as long as xterm
is running.
 
+  --disable-luit  disable support for luit filter (Unicode translation)
+
+   Luit is a filter that can be run between an arbitrary application and a
+   UTF-8 terminal emulator.  It will convert application output from the
+   locale's encoding into UTF-8, and convert terminal input from UTF-8
+   into the locale's encoding.
+
+   This is normally enabled, relying upon --enable-wide-chars.
+
   --disable-maximize  disable actions for 
iconify/deiconify/maximize/restore
 
Do not compile-in code that implements runtime 'actions' for
@@ -341,6 +339,12 @@ The options (in alphabetic order):
 
A genuine vt100 emulates a vt52.
 
+  --disable-wide-charsdisable wide-character support
+
+   The wide-character code supports Unicode and UTF-8.
+
+   This is normally enabled.
+
   --disable-ziconbeep disable -ziconbeep option
 
Do not compile-in code that modifies the icon's title and sounds a
@@ -436,15 +440,6 @@ The options (in alphabetic order):
Logging was disabled in X11R5 xterm because of security problems.
They were addressed in X11R6, but the feature was not reinstated.
 
-  --enable-luit   enable support for luit filter (Unicode translation)
-
-   Luit is a filter that can be run between an arbitrary application and a
-   UTF-8 terminal

xterm: Changes to 'debian-unstable'

2013-07-11 Thread Sven Joachim 
 MANIFEST |2 
 aclocal.m4   |   10 +-
 configure|   20 ++---
 debian/changelog |6 +
 graphics.c   |  164 ---
 graphics.h   |   16 ++--
 package/debian/changelog |6 +
 package/freebsd/Makefile |2 
 package/xterm.spec   |4 -
 screen.c |   66 +-
 util.c   |   70 +++-
 version.h|6 -
 xterm.log.html   |   20 +
 13 files changed, 250 insertions(+), 142 deletions(-)

New commits:
commit 736105b1db0522129a9e1bbffc049ed2c32a5ea1
Author: Sven Joachim svenj...@gmx.de
Date:   Thu Jul 11 20:30:33 2013 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 50bc01a..5d24019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (296-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Sven Joachim svenj...@gmx.de  Thu, 11 Jul 2013 20:30:29 +0200
+
 xterm (295-1) unstable; urgency=low
 
   * New upstream release.

commit a3928ced8a82ccb420c23b2caad32f758cbf4aab
Author: Sven Joachim svenj...@gmx.de
Date:   Thu Jul 11 20:24:55 2013 +0200

Imported Upstream version 296

diff --git a/MANIFEST b/MANIFEST
index 03fd848..5675bd8 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-295, version xterm-295
+MANIFEST for xterm-296, version xterm-296
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/aclocal.m4 b/aclocal.m4
index e32778e..da13727 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.368 2013/07/07 01:30:48 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.369 2013/07/10 01:29:34 tom Exp $
 dnl
 dnl ---
 dnl
@@ -188,7 +188,7 @@ dnl $1 = libraries to add, with the -l, etc.
 dnl $2 = variable to update (default $LIBS)
 AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])=$1 
[$]ifelse($2,,LIBS,[$2])])dnl
 dnl ---
-dnl CF_ADD_LIB_AFTER version: 2 updated: 2010/11/08 20:33:46
+dnl CF_ADD_LIB_AFTER version: 3 updated: 2013/07/09 21:27:22
 dnl 
 dnl Add a given library after another, e.g., following the one it satisfies a
 dnl dependency for.
@@ -197,7 +197,7 @@ dnl $1 = the first library
 dnl $2 = its dependency
 AC_DEFUN([CF_ADD_LIB_AFTER],[
 CF_VERBOSE(...before $LIBS)
-LIBS=`echo $LIBS | sed -e s/[[  ]][[]]*/ /g -e s,$1 ,$1 $2 , -e 
's/  / /g'`
+LIBS=`echo $LIBS | sed -e s/[[  ]][[]]*/ /g -e s%$1 %$1 $2 % -e 
's%  % %g'`
 CF_VERBOSE(...after  $LIBS)
 ])dnl
 dnl ---
@@ -2322,7 +2322,7 @@ foo.c_ospeed = B9600;
 test $cf_cv_termio_c_ispeed = yes  
AC_DEFINE(HAVE_TERMIO_C_ISPEED,1,[define 1 if we have IRIX 6.5 baud-rate 
redefinitions])
 ])dnl
 dnl ---
-dnl CF_TRIM_X_LIBS version: 1 updated: 2013/07/06 21:27:06
+dnl CF_TRIM_X_LIBS version: 2 updated: 2013/07/09 21:27:22
 dnl --
 dnl Trim extra base X libraries added as a workaround for inconsistent library
 dnl dependencies returned by new pkg-config files.
@@ -2331,7 +2331,7 @@ AC_DEFUN([CF_TRIM_X_LIBS],[
do
case $LIBS in
*-l$cf_trim_lib\ *-l$cf_trim_lib*)
-   LIBS=`echo $LIBS  | sed -e 's/  / /g' -e 
's/-l'$cf_trim_lib' //' -e 's/ $//'`
+   LIBS=`echo $LIBS  | sed -e 's/  / /g' -e 
's%-l'$cf_trim_lib' %%' -e 's/ $//'`
CF_VERBOSE(..trimmed $LIBS)
;;
esac
diff --git a/configure b/configure
index 1f4a5e6..1bfcb84 100755
--- a/configure
+++ b/configure
@@ -9225,7 +9225,7 @@ test -n $verbose  echo   ...before $LIBS 16
 
 echo ${as_me:-configure}:9226: testing ...before $LIBS ... 15
 
-LIBS=`echo $LIBS | sed -e s/[   ][  ]*/ /g -e s,-lXt ,-lXt -lX11 
, -e 's/  / /g'`
+LIBS=`echo $LIBS | sed -e s/[   ][  ]*/ /g -e s%-lXt %-lXt -lX11 
% -e 's%  % %g'`
 test -n $verbose  echo...after  $LIBS 16
 
 echo ${as_me:-configure}:9231: testing ...after  $LIBS ... 15
@@ -9497,7 +9497,7 @@ test -n $verbose  echo   ...before $LIBS 16
 
 echo ${as_me:-configure}:9498: testing ...before $LIBS ... 15
 
-LIBS=`echo $LIBS | sed -e s/[   ][  ]*/ /g -e s,-lXt ,-lXt 
$X_PRE_LIBS , -e 's/  / /g'`
+LIBS=`echo $LIBS | sed -e s/[   ][  ]*/ /g -e s%-lXt %-lXt 
$X_PRE_LIBS % -e 's%  % %g'`
 test -n $verbose  echo...after  $LIBS 16
 
 echo ${as_me:-configure}:9503: testing ...after  $LIBS ... 15
@@ -10267,7 +10267,7 @@ EOF
do
case $LIBS in
*-l$cf_trim_lib\

xterm: Changes to 'debian-unstable'

2013-07-07 Thread Sven Joachim 
 INSTALL  |6 
 Imakefile|   15 
 MANIFEST |3 
 Makefile.in  |4 
 THANKS   |7 
 VTparse.h|2 
 XTerm.ad |4 
 aclocal.m4   |   47 
 button.c |   10 
 charproc.c   |  269 ++-
 configure| 3366 ---
 configure.in |   15 
 ctlseqs.ms   |  104 +
 ctlseqs.txt  |  215 +--
 debian/changelog |8 
 graphics.c   | 1409 +++
 graphics.h   |   66 
 menu.c   |   72 -
 menu.h   |   18 
 misc.c   |  248 ++-
 package/debian/changelog |   12 
 package/debian/rules |1 
 package/freebsd/Makefile |2 
 package/xterm.spec   |5 
 plink.sh |   33 
 ptyx.h   |  132 +
 screen.c |   36 
 scrollbar.c  |3 
 util.c   |   36 
 version.h|6 
 xterm.h  |   11 
 xterm.log.html   |   60 
 xterm.man|   67 
 xtermcap.h   |4 
 xtermcfg.hin |3 
 35 files changed, 4307 insertions(+), 1992 deletions(-)

New commits:
commit bd6b87cb4f4b2f3151b44ff9ab2bc90269ca6c0d
Author: Sven Joachim svenj...@gmx.de
Date:   Sun Jul 7 11:43:52 2013 +0200

Close bug #714527

diff --git a/debian/changelog b/debian/changelog
index 27800be..d88ef98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xterm (295-1) UNRELEASED; urgency=low
 
   * New upstream release.
+- Amend fix from xterm 292 by removing now-unneeded chunk which
+  introduced problem in selection (Closes: #714527).
 
  -- Sven Joachim svenj...@gmx.de  Sun, 07 Jul 2013 11:42:34 +0200
 

commit f2f2abf10f24bb36012d84fab279f30a87c4989d
Author: Sven Joachim svenj...@gmx.de
Date:   Sun Jul 7 11:42:39 2013 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 14b11f6..27800be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (295-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Sven Joachim svenj...@gmx.de  Sun, 07 Jul 2013 11:42:34 +0200
+
 xterm (293-1) unstable; urgency=low
 
   * New upstream release.

commit 03c940de3dd124a2baa8c1c324d07a23b0aa4b69
Author: Sven Joachim svenj...@gmx.de
Date:   Sun Jul 7 08:30:46 2013 +0200

Imported Upstream version 295

diff --git a/MANIFEST b/MANIFEST
index 5c9f348..03fd848 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-294, version xterm-294
+MANIFEST for xterm-295, version xterm-295
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/aclocal.m4 b/aclocal.m4
index c25a90b..e32778e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.365 2013/05/27 22:36:25 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.368 2013/07/07 01:30:48 tom Exp $
 dnl
 dnl ---
 dnl
@@ -2322,7 +2322,23 @@ foo.c_ospeed = B9600;
 test $cf_cv_termio_c_ispeed = yes  
AC_DEFINE(HAVE_TERMIO_C_ISPEED,1,[define 1 if we have IRIX 6.5 baud-rate 
redefinitions])
 ])dnl
 dnl ---
-dnl CF_TRY_PKG_CONFIG version: 4 updated: 2010/06/14 17:42:30
+dnl CF_TRIM_X_LIBS version: 1 updated: 2013/07/06 21:27:06
+dnl --
+dnl Trim extra base X libraries added as a workaround for inconsistent library
+dnl dependencies returned by new pkg-config files.
+AC_DEFUN([CF_TRIM_X_LIBS],[
+   for cf_trim_lib in Xmu Xt X11
+   do
+   case $LIBS in
+   *-l$cf_trim_lib\ *-l$cf_trim_lib*)
+   LIBS=`echo $LIBS  | sed -e 's/  / /g' -e 
's/-l'$cf_trim_lib' //' -e 's/ $//'`
+   CF_VERBOSE(..trimmed $LIBS)
+   ;;
+   esac
+   done
+])
+dnl ---
+dnl CF_TRY_PKG_CONFIG version: 5 updated: 2013/07/06 21:27:06
 dnl -
 dnl This is a simple wrapper to use for pkg-config, for libraries which may be
 dnl available in that form.
@@ -2343,6 +2359,8 @@ if test $PKG_CONFIG != none  $PKG_CONFIG --exists 
$1; then
CF_ADD_LIBS($cf_pkgconfig_libs)
ifelse([$2],,:,[$2])
 else
+   cf_pkgconfig_incs=
+   cf_pkgconfig_libs=
ifelse([$3],,:,[$3])
 fi
 ])
@@ -3822,7 +3840,7 @@ make an error
 fi
 ])
 dnl ---
-dnl CF_X_ATHENA version: 20 updated: 2010/11/09 05:18:02
+dnl CF_X_ATHENA version: 21 updated: 2013/07/06 21:27:06
 dnl ---
 dnl Check for Xaw

xterm: Changes to 'debian-unstable'

2013-05-29 Thread Sven Joachim 
 debian/changelog |5 +++--
 debian/copyright |2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit d595122d69f9c8a4b3b6925ac8a78eceb3fcd50e
Author: Sven Joachim svenj...@gmx.de
Date:   Wed May 29 17:19:59 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 2550ecd..14b11f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xterm (293-1) UNRELEASED; urgency=low
+xterm (293-1) unstable; urgency=low
 
   * New upstream release.
 - Improve description of initialFont, set-vt-font and set-tex-text
   in manpage (Closes: #707899).
   * Update copyright year in debian/copyright.
 
- -- Sven Joachim svenj...@gmx.de  Tue, 28 May 2013 19:58:30 +0200
+ -- Sven Joachim svenj...@gmx.de  Wed, 29 May 2013 17:19:26 +0200
 
 xterm (292-1) unstable; urgency=low
 

commit d670181d122bfab952f18c9352c758e44c09bf1c
Author: Sven Joachim svenj...@gmx.de
Date:   Wed May 29 17:19:08 2013 +0200

Update copyright year in debian/copyright

diff --git a/debian/changelog b/debian/changelog
index c5fc09e..2550ecd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xterm (293-1) UNRELEASED; urgency=low
   * New upstream release.
 - Improve description of initialFont, set-vt-font and set-tex-text
   in manpage (Closes: #707899).
+  * Update copyright year in debian/copyright.
 
  -- Sven Joachim svenj...@gmx.de  Tue, 28 May 2013 19:58:30 +0200
 
diff --git a/debian/copyright b/debian/copyright
index c0d20a7..6abce4a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ This package was debianized by first time by David Martinez 
Moreno
 
 Upstream sources: http://invisible-island.net/xterm/xterm.html
 
-Copyright 1997-2011 by Thomas E. Dickey
+Copyright 1997-2013 by Thomas E. Dickey
 Copyright 1999-2000 by Steve Wall
 
 All Rights Reserved


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uhijf-0005wn...@vasks.debian.org

xterm: Changes to 'debian-unstable'

2013-05-28 Thread Sven Joachim 
 INSTALL  |   15 
 MANIFEST |2 
 Makefile.in  |   56 
 aclocal.m4   |   31 
 button.c |   18 
 charproc.c   |   53 
 configure| 3193 +++
 configure.in |3 
 debian/changelog |8 
 fontutils.c  |4 
 main.c   |   53 
 misc.c   |9 
 package/debian/changelog |6 
 package/freebsd/Makefile |2 
 package/xterm.spec   |   68 -
 print.c  |   38 
 ptyx.h   |   14 
 util.c   |4 
 version.h|6 
 xterm.log.html   |  256 ++-
 xterm.man|  100 +
 xtermcfg.hin |3 
 22 files changed, 2105 insertions(+), 1837 deletions(-)

New commits:
commit b80ee6a5e233d573e8e26eb539e8788416633274
Author: Sven Joachim svenj...@gmx.de
Date:   Tue May 28 20:00:25 2013 +0200

Close bug #707899

diff --git a/debian/changelog b/debian/changelog
index 31b2896..c5fc09e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 xterm (293-1) UNRELEASED; urgency=low
 
   * New upstream release.
+- Improve description of initialFont, set-vt-font and set-tex-text
+  in manpage (Closes: #707899).
 
  -- Sven Joachim svenj...@gmx.de  Tue, 28 May 2013 19:58:30 +0200
 

commit c32314ee15e6871fb9bf0d9eb78adf783c7ac32a
Author: Sven Joachim svenj...@gmx.de
Date:   Tue May 28 19:58:44 2013 +0200

New upstream release

diff --git a/debian/changelog b/debian/changelog
index 0098b11..31b2896 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (293-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Sven Joachim svenj...@gmx.de  Tue, 28 May 2013 19:58:30 +0200
+
 xterm (292-1) unstable; urgency=low
 
   * New upstream release.

commit 9d791112866a5ac58ae9bd05f41f277cb8c099c0
Author: Sven Joachim svenj...@gmx.de
Date:   Tue May 28 19:56:26 2013 +0200

Imported Upstream version 293

diff --git a/INSTALL b/INSTALL
index 1918578..c31726d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.143 2013/04/17 09:13:09 tom Exp $
+-- $XTermId: INSTALL,v 1.147 2013/05/27 22:19:09 tom Exp $
 ---
 -- Copyright 1997-2012,2013 by Thomas E. Dickey
 --
@@ -625,6 +625,19 @@ The options (in alphabetic order):
small sizes.  This is used for window decoration, e.g., the
icon at the upper left corner in many window managers.
 
+  --with-icon-symlink=NAME create symbolic links to icon name (default: NONE)
+
+   This is a workaround for certain systems which translate icon names
+   containing xterm, e.g., xterm-color into the single icon xterm.
+   The option should also be harmless on a properly configured system.
+
+   If the option is used, its default value is xterm.  For each icon,
+   the makefile will strip the suffix (e.g., .png), as well as the part
+   of the filename which denotes the size (e.g., _32x32 in an xpm file),
+   and constructs a link with that name to the icon.
+
+   If the option is unused, its default value is NONE (no link is made).
+
   --with-icondir=DIR directory in which to install icon files (default: no)
 
The X libraries may automatically search these locations:
diff --git a/MANIFEST b/MANIFEST
index 0ea4ed9..25e9cc5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-292, version xterm-292
+MANIFEST for xterm-293, version xterm-293
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index b35582f..f9c3f20 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.216 2013/01/03 01:33:29 tom Exp $
+## $XTermId: Makefile.in,v 1.219 2013/05/27 19:39:59 tom Exp $
 # -
 # this file is part of xterm
 #
@@ -83,11 +83,15 @@ pixmapdir   = @PIXMAPDIR@
 
  End of system configuration section. 
 
+ICON_NAME  = @ICON_NAME@
+ICON_SYMLINK   = @ICON_SYMLINK@
+
 DESTDIR=
 BINDIR = $(DESTDIR)$(bindir)
 LIBDIR = $(DESTDIR)$(libdir)
 MANDIR = $(DESTDIR)$(mandir)
 APPSDIR= $(DESTDIR)$(appsdir)
+
 @no_icondir@ICONDIR= $(DESTDIR)$(icondir)
 @no_pixmapdir@PIXMAPDIR= $(DESTDIR)$(pixmapdir)
 
@@ -267,17 +271,29 @@ APP_NAMES = XTerm UXTerm KOI8RXTerm
 @no_icondir@install-icon \
 @no_icondir@install-full :: $(ICONDIR)
 @no_icondir@   ACTUAL_XTERM=$(actual_xterm) \
-@no_icondir@   $(SHELL) -c 'for n in $(ICON_LIST); \
-@no_icondir@   do \
-@no_icondir@   x=$$ACTUAL_XTERM; \
-@no_icondir@

xterm: Changes to 'debian-unstable'

2013-05-26 Thread Sven Joachim 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e9486de7b2e05c722bbe77e1e82808c87ddb6e42
Author: Sven Joachim svenj...@gmx.de
Date:   Sun May 26 11:22:49 2013 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 50ca38c..0098b11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (292-1) UNRELEASED; urgency=low
+xterm (292-1) unstable; urgency=low
 
   * New upstream release.
   * Refresh 904_fontops.diff.
@@ -9,7 +9,7 @@ xterm (292-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.4, no changes needed.
   * Add myself to Uploaders.
 
- -- Sven Joachim svenj...@gmx.de  Thu, 23 May 2013 20:04:08 +0200
+ -- Sven Joachim svenj...@gmx.de  Sun, 26 May 2013 11:22:26 +0200
 
 xterm (290-1) experimental; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ugyo0-0008fq...@vasks.debian.org

xterm: Changes to 'debian-unstable'

2013-05-25 Thread Sven Joachim 
 debian/README.source |   24 -
 debian/changelog |5 
 debian/clean |1 
 debian/compat|2 
 debian/control   |8 
 debian/rules |  101 +--
 debian/xsfbs/repack.sh   |   32 --
 debian/xsfbs/xsfbs.mk|  285 -
 debian/xsfbs/xsfbs.sh|  622 ---
 debian/xterm.docs|2 
 debian/xterm.install |1 
 debian/xterm.postinst|   34 ++
 debian/xterm.postinst.in |   39 --
 debian/xterm.prerm   |   21 +
 debian/xterm.prerm.in|   26 -
 15 files changed, 83 insertions(+), 1120 deletions(-)

New commits:
commit f512969b0057cbe7852d970946cf661fd513b31c
Author: Sven Joachim svenj...@gmx.de
Date:   Sat May 25 15:27:33 2013 +0200

Add myself to Uploaders

diff --git a/debian/changelog b/debian/changelog
index c9f9b81..50ca38c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xterm (292-1) UNRELEASED; urgency=low
   * Use dh_install's --fail-missing option.
   * Convert debian/rules to dh and drop xsfbs.
   * Bump Standards-Version to 3.9.4, no changes needed.
+  * Add myself to Uploaders.
 
  -- Sven Joachim svenj...@gmx.de  Thu, 23 May 2013 20:04:08 +0200
 
diff --git a/debian/control b/debian/control
index 8b079c2..1c9aee9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xterm
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: Cyril Brulebois k...@debian.org
+Uploaders: Cyril Brulebois k...@debian.org, Sven Joachim svenj...@gmx.de
 Standards-Version: 3.9.4
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xterm.git
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xterm

commit 426e337a7505cf71527e39f23ef93fcccb0ee223
Author: Sven Joachim svenj...@gmx.de
Date:   Sat May 25 15:27:17 2013 +0200

Bump Standards-Version to 3.9.4

diff --git a/debian/changelog b/debian/changelog
index 0577366..c9f9b81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xterm (292-1) UNRELEASED; urgency=low
   * Bump debhelper compatibility level to 9.
   * Use dh_install's --fail-missing option.
   * Convert debian/rules to dh and drop xsfbs.
+  * Bump Standards-Version to 3.9.4, no changes needed.
 
  -- Sven Joachim svenj...@gmx.de  Thu, 23 May 2013 20:04:08 +0200
 
diff --git a/debian/control b/debian/control
index 2416bdf..8b079c2 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: Cyril Brulebois k...@debian.org
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xterm.git
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xterm
 Homepage: http://invisible-island.net/xterm/xterm.html

commit 967016131b4cf9f8016bde87d2c4a82462523869
Author: Sven Joachim svenj...@gmx.de
Date:   Sat May 25 15:26:44 2013 +0200

Convert debian/rules to dh and drop xsfbs

diff --git a/debian/README.source b/debian/README.source
index b09a1ab..4ecd5e6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -47,27 +47,3 @@ are involved:
   case, it appears directly in the .diff.gz.
 * Otherwise, the patch is added to debian/patches/ which is managed
   with quilt as documented in /usr/share/doc/quilt/README.source.
-
-quilt is actually invoked by the Debian X packaging through a larger
-set of scripts called XSFBS. XSFBS brings some other X specific
-features such as managing dependencies and conflicts due to the video
-and input driver ABIs.
-XSFBS itself is maintained in a separate repository at
-  git://git.debian.org/pkg-xorg/xsfbs.git
-and it is pulled inside the other Debian X repositories when needed.
-
-The XSFBS patching system requires a build dependency on quilt. Also
-a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
-so that the XSFBS patching occurs before the actual build. So the
-very first target of the build (likely the one running autoreconf)
-should depend on $(STAMP_DIR)/patch. It should also not depend on
-anything so that parallel builds are correctly supported (nothing
-should probably run while patching is being done). And finally, the
-clean target should depend on the xsfclean target so that patches
-are unapplied on clean.
-
-When the upstream sources contain some DFSG-nonfree files, they are
-listed in text files in debian/prune/ in the debian-* branch of
-the Debian repository. XSFBS' scripts then take care of removing
-these listed files during the build so as to generate a modified
-DFSG-free .orig.tar.gz tarball.
diff --git a/debian/changelog b/debian/changelog
index bd24d17..0577366 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xterm (292-1) UNRELEASED; urgency=low
   * Update copy of XTerm FAQ to revision 1.229 (dated 2013/05/18).
   * Bump debhelper compatibility level to 9.
   * Use dh_install's --fail-missing option.
+  *

xterm: Changes to 'debian-unstable'

2013-05-23 Thread Sven Joachim 
 INSTALL   |   97 
 Imakefile |   32 
 MANIFEST  |   42 
 Makefile.in   |  187 
 THANKS|   12 
 Tekproc.c |7 
 VTPrsTbl.c|  110 
 VTparse.def   |   10 
 VTparse.h |   16 
 aclocal.m4| 1336 -
 button.c  |  226 
 charproc.c| 2579 +-
 config.guess  |  202 
 config.sub|  112 
 configure |12266 ++
 configure.in  |  233 
 ctlseqs.ms|  311 
 ctlseqs.txt   |  527 
 cursor.c  |  166 
 data.h|6 
 debian/changelog  |   40 
 debian/local/xterm.faq.html   |  419 
 debian/patches/100_fix_crash_with_tektronix_mode.diff |   74 
 debian/patches/101_670638.diff|  141 
 debian/patches/102_MdFlag.diff|   19 
 debian/patches/103_nullptr.diff   |   28 
 debian/patches/900_debian_xterm.diff  |   10 
 debian/patches/902_windowops.diff |4 
 debian/patches/904_fontops.diff   |8 
 debian/patches/series |4 
 debian/rules  |3 
 debian/xterm.install  |1 
 dev/null  |binary
 df-install.in |   19 
 doublechr.c   |   44 
 error.h   |5 
 fontutils.c   |   68 
 icons/filled-xterm.png|binary
 icons/filled-xterm.svg|  680 
 icons/filled-xterm.xpms   |  694 
 icons/filled-xterm_16x16.xpm  |  129 
 icons/filled-xterm_32x32.xpm  |  260 
 icons/filled-xterm_48x48.xpm  |  297 
 icons/make-xpms   |   26 
 icons/mini.xterm.svg  |  128 
 icons/mini.xterm.xpms |  553 
 icons/mini.xterm_16x16.png|binary
 icons/mini.xterm_16x16.xpm|  103 
 icons/mini.xterm_256x256.png  |binary
 icons/mini.xterm_32x32.png|binary
 icons/mini.xterm_32x32.xpm|  178 
 icons/mini.xterm_48x48.png|binary
 icons/mini.xterm_48x48.xpm|  264 
 icons/terminal_48x48.svg  |  643 
 icons/terminal_48x48.xpm  |   53 
 icons/xterm-color.png |binary
 icons/xterm-color.svg |  792 
 icons/xterm-color.xpms|  263 
 icons/xterm-color_16x16.xpm   |   99 
 icons/xterm-color_32x32.xpm   |  123 
 icons/xterm-color_48x48.xpm   |4 
 icons/xterm.png   |binary
 icons/xterm.svg   |  652 
 icons/xterm.xpms  |  119 
 icons/xterm_16x16.xpm |   21 
 icons/xterm_32x32.xpm |  126 
 icons/xterm_48x48.xpm |  100 
 input.c   |  349 
 koi8rxterm.man|   39 
 linedata.c|5 
 main.c|  263 
 main.h|   16 
 menu.c|  170 
 menu.h|   11 
 minstall.in   |   39 
 misc.c| 1027 
 os2main.c | 2227 -
 package/debian/changelog  |   89 
 package/debian/rules  |   10

xterm: Changes to 'debian-unstable'

2012-11-27 Thread Julien Cristau 
 debian/changelog  |   15 +
 debian/patches/100_fix_crash_with_tektronix_mode.diff |   70 
 debian/patches/101_670638.diff|  141 ++
 debian/patches/102_MdFlag.diff|   19 ++
 debian/patches/103_nullptr.diff   |   28 +++
 debian/patches/series |5 
 6 files changed, 271 insertions(+), 7 deletions(-)

New commits:
commit 4b8d8d295fd453ad57ef5d90d04f6fc9d2f272ce
Author: Julien Cristau jcris...@debian.org
Date:   Tue Nov 27 19:57:50 2012 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 267c950..16f730e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (278-3) UNRELEASED; urgency=low
+xterm (278-3) unstable; urgency=low
 
   [ Timo Aaltonen ]
   * control: Mark the package as Multi-Arch: foreign.
@@ -13,7 +13,7 @@ xterm (278-3) UNRELEASED; urgency=low
 - add a null-pointer check in OkPasswd macro to fix a problem in resize
   with Fedora 17 and a serial console (report/patch by Daniel Drake).
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Fri, 28 Sep 2012 13:11:17 +0300
+ -- Julien Cristau jcris...@debian.org  Tue, 27 Nov 2012 19:57:47 +0100
 
 xterm (278-2) unstable; urgency=low
 

commit 120bdbd68c8447024b3ca2c1f14687c447914e82
Author: Julien Cristau jcris...@debian.org
Date:   Tue Nov 27 19:57:28 2012 +0100

Apply a few patches recommended by upstream in #694375 (thanks!)

- amend patch from 278-2 to catch more cases
- amend fix for Debian #650291 in patch #277 changes to account for
  different data returned by vnc4server (closes: #670638)
- correct macro definition used for testing modes used in ANSI/DEC
  request-mode controls introduced in patch #262
- add a null-pointer check in OkPasswd macro to fix a problem in resize
  with Fedora 17 and a serial console (report/patch by Daniel Drake).

diff --git a/debian/changelog b/debian/changelog
index 356698b..267c950 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,18 @@
 xterm (278-3) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * control: Mark the package as Multi-Arch: foreign.
 
+  [ Julien Cristau ]
+  * Apply a few patches recommended by upstream in #694375 (thanks!)
+- amend patch from 278-2 to catch more cases
+- amend fix for Debian #650291 in patch #277 changes to account for
+  different data returned by vnc4server (closes: #670638)
+- correct macro definition used for testing modes used in ANSI/DEC
+  request-mode controls introduced in patch #262
+- add a null-pointer check in OkPasswd macro to fix a problem in resize
+  with Fedora 17 and a serial console (report/patch by Daniel Drake).
+
  -- Timo Aaltonen tjaal...@ubuntu.com  Fri, 28 Sep 2012 13:11:17 +0300
 
 xterm (278-2) unstable; urgency=low
diff --git a/debian/patches/100_fix_crash_with_tektronix_mode.diff 
b/debian/patches/100_fix_crash_with_tektronix_mode.diff
index eade1a1..bb4ff2b 100644
--- a/debian/patches/100_fix_crash_with_tektronix_mode.diff
+++ b/debian/patches/100_fix_crash_with_tektronix_mode.diff
@@ -1,7 +1,48 @@
-Fix crash in Tektronix mode (#685458).
 a/input.c
-+++ b/input.c
-@@ -832,7 +832,7 @@ Input(XtermWidget xw,
+# ftp://invisible-island.net/temp/xterm-278-p4.patch.gz
+# patch by Thomas E. Dickey dic...@invisible-island.net
+# created  Tue Nov 27 10:17:35 UTC 2012
+# 
--
+# charproc.c |8 
+# input.c|2 +-
+# misc.c |4 ++--
+# 3 files changed, 7 insertions(+), 7 deletions(-)
+# 
--
+Index: charproc.c
+--- xterm-278+/charproc.c  2012-01-19 00:22:08.0 +
 xterm-278-p4/charproc.c2012-11-27 10:15:42.0 +
+@@ -3797,7 +3797,7 @@
+ XPoint spot;
+ XVaNestedList list;
+ 
+-if (input-xic
++if (input  input-xic
+(ld = getLineData(screen, screen-cur_row)) != 0) {
+   spot.x = (short) LineCursorX(screen, ld, screen-cur_col);
+   spot.y = (short) (CursorY(screen, screen-cur_row) + 
xw-misc.xim_fs_ascent);
+@@ -6952,7 +6952,7 @@
+ {
+ TInput *input = lookupTInput(xw, (Widget) xw);
+ 
+-if (input-xim) {
++if (input  input-xim) {
+   XCloseIM(input-xim);
+   input-xim = 0;
+   TRACE((freed screen-xim\n));
+@@ -7506,8 +7506,8 @@
+ 
+ TRACE((xim_destroy_cb im=%lx, client=%p, call=%p\n,
+  (long) im, client_data, call_data));
+-
+-input-xic = NULL;
++if (input)
++  input-xic = NULL;
+ XRegisterIMInstantiateCallback(XtDisplay(xw), NULL, NULL, NULL,
+  xim_instantiate_cb, NULL);
+ }
+Index: input.c
+--- xterm-278+/input.c 2012-01-07 02:01:05.0 +
 xterm-278-p4/input.c   2012-11-27 10:15:42.0 +
+@@ -832,7 +832,7 @@
  {
  #if

xterm: Changes to 'debian-unstable'

2012-09-28 Thread Timo Aaltonen 
 debian/changelog |6 ++
 debian/control   |1 +
 2 files changed, 7 insertions(+)

New commits:
commit 19c840ec4bee5b7bce438f5d743d78c7e766c6c0
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Fri Sep 28 13:11:52 2012 +0300

control: Mark the package as Multi-Arch: foreign.

diff --git a/debian/changelog b/debian/changelog
index 589b3f0..356698b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (278-3) UNRELEASED; urgency=low
+
+  * control: Mark the package as Multi-Arch: foreign.
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Fri, 28 Sep 2012 13:11:17 +0300
+
 xterm (278-2) unstable; urgency=low
 
   * Fix crash in Tektronix mode (Closes: #685458).
diff --git a/debian/control b/debian/control
index 5fb0ab8..f135a27 100644
--- a/debian/control
+++ b/debian/control
@@ -105,6 +105,7 @@ Build-Depends:
 
 Package: xterm
 Architecture: any
+Multi-Arch: foreign
 Depends:
  xbitmaps,
  ${shlibs:Depends},


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1thxzk-0003a4...@vasks.debian.org

xterm: Changes to 'debian-unstable'

2012-08-26 Thread Cyril Brulebois 
 debian/changelog  |6 ++
 debian/patches/100_fix_crash_with_tektronix_mode.diff |   12 
 debian/patches/series |1 +
 3 files changed, 19 insertions(+)

New commits:
commit 3510336bdce4fcaef84494f09eb3b75d8e4a78cd
Author: Cyril Brulebois k...@debian.org
Date:   Mon Aug 27 02:14:44 2012 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index bbf158c..589b3f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xterm (278-2) UNRELEASED; urgency=low
+xterm (278-2) unstable; urgency=low
 
   * Fix crash in Tektronix mode (Closes: #685458).
 
- -- Cyril Brulebois k...@debian.org  Mon, 27 Aug 2012 02:13:47 +0200
+ -- Cyril Brulebois k...@debian.org  Mon, 27 Aug 2012 02:14:38 +0200
 
 xterm (278-1) unstable; urgency=low
 

commit 68e24d5543548a45917b8fc733a4aef44372ca45
Author: Cyril Brulebois k...@debian.org
Date:   Mon Aug 27 02:14:33 2012 +0200

Fix crash in Tektronix mode (Closes: #685458).

diff --git a/debian/changelog b/debian/changelog
index 8b84a21..bbf158c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (278-2) UNRELEASED; urgency=low
+
+  * Fix crash in Tektronix mode (Closes: #685458).
+
+ -- Cyril Brulebois k...@debian.org  Mon, 27 Aug 2012 02:13:47 +0200
+
 xterm (278-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/100_fix_crash_with_tektronix_mode.diff 
b/debian/patches/100_fix_crash_with_tektronix_mode.diff
new file mode 100644
index 000..eade1a1
--- /dev/null
+++ b/debian/patches/100_fix_crash_with_tektronix_mode.diff
@@ -0,0 +1,12 @@
+Fix crash in Tektronix mode (#685458).
+--- a/input.c
 b/input.c
+@@ -832,7 +832,7 @@ Input(XtermWidget xw,
+ {
+ #if OPT_I18N_SUPPORT  OPT_INPUT_METHOD
+   TInput *input = lookupTInput(xw, (Widget) xw);
+-  if (input-xic) {
++  if (input  input-xic) {
+   Status status_return;
+ #if OPT_WIDE_CHARS
+   if (screen-utf8_mode) {
diff --git a/debian/patches/series b/debian/patches/series
index 0a584d1..98395e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 900_debian_xterm.diff
 902_windowops.diff
 904_fontops.diff
+100_fix_crash_with_tektronix_mode.diff


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1t5nna-0004ev...@vasks.debian.org

xterm: Changes to 'debian-unstable'

2012-01-08 Thread Julien Cristau 
 INSTALL  |7 
 Imakefile|7 
 MANIFEST |2 
 Tekproc.c|8 
 VTPrsTbl.c   |   22 
 VTparse.def  |   10 
 VTparse.h|   10 
 aclocal.m4   |  162 +-
 button.c |  832 ++
 charproc.c   |  497 --
 configure| 3631 +++
 configure.in |   26 
 ctlseqs.ms   |   89 +
 ctlseqs.txt  |   99 -
 debian/changelog |   21 
 fontutils.c  |   20 
 input.c  |   23 
 main.c   |  467 ++
 main.h   |8 
 menu.c   |4 
 misc.c   |  381 +++-
 os2main.c|   43 
 package/debian/changelog |6 
 package/xterm.spec   |4 
 ptyx.h   |   62 
 screen.c |4 
 trace.c  |4 
 util.c   |   81 -
 version.h|4 
 vttests/16colors.sh  |6 
 vttests/8colors.sh   |6 
 vttests/acolors.sh   |6 
 vttests/doublechars.sh   |6 
 vttests/dynamic.sh   |6 
 vttests/dynamic2.sh  |6 
 vttests/fonts.sh |6 
 vttests/resize.sh|6 
 vttests/title.sh |6 
 xcharmouse.h |7 
 xterm.h  |   25 
 xterm.log.html   |  107 +
 xterm.man|  457 +++--
 xterm_io.h   |4 
 xtermcfg.hin |9 
 44 files changed, 4734 insertions(+), 2463 deletions(-)

New commits:
commit 9ac25b837c3491b1bafa289273c35e68670e2652
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jan 8 13:42:11 2012 +0100

Changelog entry

diff --git a/debian/changelog b/debian/changelog
index ef64297..9474c29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+xterm (277-1) UNRELEASED; urgency=low
+
+  * New upstream release
+- move call to grantpt before asking utempter to add a record, to work
+  with kFreeBSD which does not update the terminal's ownership until this
+  point (closes: #652907)
+- document limitation of XIM interface in manpage (see #230787)
+- add four new actions for making the selection or data directly copied
+  from the screen: exec-formatted, exec-selectable, insert-formatted,
+  insert-selectable (closes: #637001)
+- add eightBitMeta resource to control the features which modify or
+  interpret the eighth bit of a key when the meta modifier key is pressed
+  (prompted by #326200)
+- improve discussion of eightBitInput in the manpage (prompted by #326200)
+- add a workaround for XAllocColor(), which does not actually allocate a
+  read-only colormap entry corresponding to the closest RGB value
+  supported by the hardware, but rather a rough approximation (closes:
+  #650291)
+
+ -- Julien Cristau jcris...@debian.org  Sun, 08 Jan 2012 13:33:32 +0100
+
 xterm (276-2) unstable; urgency=low
 
   * Team upload.

commit 4e01e5971e45b9d39ac1531f9b84f5058e362400
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jan 8 13:21:43 2012 +0100

Imported Upstream version 277

diff --git a/INSTALL b/INSTALL
index c8f28eb..0d0a4de 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.126 2011/08/30 09:51:01 tom Exp $
+-- $XTermId: INSTALL,v 1.127 2011/12/22 01:59:16 tom Exp $
 ---
 -- Copyright 1997-2010,2011 by Thomas E. Dickey
 --
@@ -281,6 +281,11 @@ The options (in alphabetic order):
Do not compile-in code that suppresses redundant updates to the
titlebar when the text has not changed.
 
+  --disable-selection-ops disable selection operations
+
+   Do not compile-in code to support the actions which allow users
+   to bind keys that use the selection or extract data from the screen.
+
   --disable-session-mgt   enable support for session management
 
Do not compile-in code which adds simple session management hooks
diff --git a/Imakefile b/Imakefile
index f65c300..fcfaced 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.104 2011/07/02 00:48:49 tom Exp $
+XCOMM $XTermId: Imakefile,v 1.105 2011/11/29 10:19:20 Thorsten.Glaser Exp $
 XCOMM
 XCOMM Attention xterm porters
 XCOMM
@@ -253,6 +253,11 @@ SetUIDProgramTarget(xterm,$(OBJS1),$(DEPLIBS1),$(XRFLIBS) 
XkbClientLibs XawClien
 NormalProgramTarget(xterm,$(OBJS1),$(DEPLIBS1),$(XRFLIBS) XkbClientLibs 
XawClientLibs,$(TERMCAPLIB) $(UTMPLIB) $(PTYLIB))
 #endif
 
+#if defined(OpenBSDArchitecture) || defined(MirBSDArchitecture)
+/* On OpenBSD xterm is now setgid utmp */
+INSTUIDFLAGS= -m 2555 -g utmp
+#endif
+
 #if InstallXtermSetUID  defined(SunArchitecture)  HasSharedLibraries  
(OSMajorVersion  5)
 #if AlternateUsrLibDir
 #if ((OSMajorVersion

xterm: Changes to 'debian-unstable'

2011-12-31 Thread Julien Cristau 
 debian/changelog |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 22af21eab8c8c742e7eaea2778c2af0c6d94e3c8
Author: Julien Cristau jcris...@debian.org
Date:   Sat Dec 31 19:00:07 2011 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 6cdb44c..ef64297 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-xterm (276-2) UNRELEASED; urgency=low
+xterm (276-2) unstable; urgency=low
+
+  * Team upload.
 
   [ Julien Cristau ]
   * Pass -DFOO in CPPFLAGS, not CFLAGS.
@@ -13,7 +15,7 @@ xterm (276-2) UNRELEASED; urgency=low
 - 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 jcris...@debian.org  Sat, 15 Oct 2011 20:54:36 +0200
+ -- Julien Cristau jcris...@debian.org  Sat, 31 Dec 2011 19:00:02 +0100
 
 xterm (276-1) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rh3ji-0004xj...@vasks.debian.org

xterm: Changes to 'debian-unstable'

2011-12-28 Thread Julien Cristau 
 debian/changelog |2 ++
 debian/rules |   15 ---
 2 files changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 11b849b9b42047585675dc62386fef8743175a64
Author: Julien Cristau jcris...@debian.org
Date:   Wed Dec 28 23:27:59 2011 +0100

Enable hardened build flags through dpkg-buildflags (closes: #653488).

Based on patch by Moritz Muehlenhoff, thanks!

diff --git a/debian/changelog b/debian/changelog
index 9c24076..6cdb44c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xterm (276-2) UNRELEASED; urgency=low
   * Update copyright year in debian/copyright.
   * Bump Standards-Version to 3.9.2, no changes needed.
   * Remove David Nusinow from Uploaders.
+  * Enable hardened build flags through dpkg-buildflags (closes: #653488).
+Based on patch by Moritz Muehlenhoff, thanks!
 
   [ Sven Joachim ]
   * Update 900_debian_xterm.diff:
diff --git a/debian/rules b/debian/rules
index ab7c20c..ebb8b5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,12 +20,12 @@ else
confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-CFLAGS = -g -Wall
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-   CFLAGS += -O0
-else
-   CFLAGS += -O2
-endif
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS += -Wall
+
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter 
parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
@@ -37,7 +37,7 @@ DESKTOP_FLAGS = --vendor debian \
--dir=$(DEBTREEDIR)/usr/share/applications
 
 # disable some unsafe operations
-CPPFLAGS = \
+CPPFLAGS += \
-DDEF_ALLOW_FONT=False \
-DDEF_ALLOW_TCAP=False \

-DDEF_DISALLOWED_WINDOW=\\\1,2,3,4,5,6,7,8,9,11,13,14,18,19,20,21,GetSelection,SetSelection,SetWinLines,SetXprop\\\
@@ -67,6 +67,7 @@ $(STAMP_DIR)/configure: $(STAMP_DIR)/patch
DESKTOP_FLAGS=$(DESKTOP_FLAGS) \
CFLAGS=$(CFLAGS) \
CPPFLAGS=$(CPPFLAGS) \
+   LDFLAGS=$(LDFLAGS) \
LUIT=/usr/bin/luit
$@
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1rg1zf-0008q9...@vasks.debian.org

xterm: Changes to 'debian-unstable'

2011-12-12 Thread Sven Joachim 
 debian/changelog |6 ++
 debian/patches/900_debian_xterm.diff |   13 ++---
 2 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 1f83b7be6e4a87d302aef83ee3179c38807dae83
Author: Sven Joachim svenj...@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 jcris...@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,
  


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ra7do-00041a...@vasks.debian.org

xterm: Changes to 'debian-unstable'

2011-10-16 Thread Julien Cristau 
 debian/changelog |9 +
 debian/control   |4 ++--
 debian/copyright |2 +-
 debian/rules |7 ---
 4 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit c18d61b3feac0c5c63e5f022e8b4d1c2056947d7
Author: Julien Cristau jcris...@debian.org
Date:   Sun Oct 16 19:46:42 2011 +0200

Remove David Nusinow from Uploaders.

diff --git a/debian/changelog b/debian/changelog
index c760c4f..86d3abd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xterm (276-2) UNRELEASED; urgency=low
   * 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.
 
  -- Julien Cristau jcris...@debian.org  Sat, 15 Oct 2011 20:54:36 +0200
 
diff --git a/debian/control b/debian/control
index 3cd236e..5fb0ab8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xterm
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org, Cyril Brulebois 
k...@debian.org
+Uploaders: Cyril Brulebois k...@debian.org
 Standards-Version: 3.9.2
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xterm.git
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xterm

commit 0cd124ed65198efa5b6b729786b6a8a2485a7b77
Author: Julien Cristau jcris...@debian.org
Date:   Sun Oct 16 19:46:23 2011 +0200

Bump Standards-Version to 3.9.2, no changes needed.

diff --git a/debian/changelog b/debian/changelog
index 0f4bea5..c760c4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xterm (276-2) UNRELEASED; urgency=low
 
   * Pass -DFOO in CPPFLAGS, not CFLAGS.
   * Update copyright year in debian/copyright.
+  * Bump Standards-Version to 3.9.2, no changes needed.
 
  -- Julien Cristau jcris...@debian.org  Sat, 15 Oct 2011 20:54:36 +0200
 
diff --git a/debian/control b/debian/control
index 81924f2..3cd236e 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: David Nusinow dnusi...@debian.org, Cyril Brulebois 
k...@debian.org
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xterm.git
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xterm
 Homepage: http://invisible-island.net/xterm/xterm.html

commit 0aa1e83596fe0dc6f6e31d2093ec54cc977e669b
Author: Julien Cristau jcris...@debian.org
Date:   Sat Oct 15 20:56:03 2011 +0200

Update copyright year in debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index b57629d..0f4bea5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xterm (276-2) UNRELEASED; urgency=low
 
   * Pass -DFOO in CPPFLAGS, not CFLAGS.
+  * Update copyright year in debian/copyright.
 
  -- Julien Cristau jcris...@debian.org  Sat, 15 Oct 2011 20:54:36 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 48740bc..c0d20a7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ This package was debianized by first time by David Martinez 
Moreno
 
 Upstream sources: http://invisible-island.net/xterm/xterm.html
 
-Copyright 1997-2010 by Thomas E. Dickey
+Copyright 1997-2011 by Thomas E. Dickey
 Copyright 1999-2000 by Steve Wall
 
 All Rights Reserved

commit 78c64d94768c9d21ecac4376eb467a41766b70c1
Author: Julien Cristau jcris...@debian.org
Date:   Sat Oct 15 20:54:46 2011 +0200

Pass -DFOO in CPPFLAGS, not CFLAGS.

diff --git a/debian/changelog b/debian/changelog
index 375e257..b57629d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (276-2) UNRELEASED; urgency=low
+
+  * Pass -DFOO in CPPFLAGS, not CFLAGS.
+
+ -- Julien Cristau jcris...@debian.org  Sat, 15 Oct 2011 20:54:36 +0200
+
 xterm (276-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
diff --git a/debian/rules b/debian/rules
index 9c7697b..ab7c20c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ DESKTOP_FLAGS = --vendor debian \
--dir=$(DEBTREEDIR)/usr/share/applications
 
 # disable some unsafe operations
-CFLAGS += \
+CPPFLAGS = \
-DDEF_ALLOW_FONT=False \
-DDEF_ALLOW_TCAP=False \

-DDEF_DISALLOWED_WINDOW=\\\1,2,3,4,5,6,7,8,9,11,13,14,18,19,20,21,GetSelection,SetSelection,SetWinLines,SetXprop\\\
@@ -66,8 +66,9 @@ $(STAMP_DIR)/configure: $(STAMP_DIR)/patch
$(confflags) \
DESKTOP_FLAGS=$(DESKTOP_FLAGS) \
CFLAGS=$(CFLAGS) \
+   CPPFLAGS=$(CPPFLAGS) \
LUIT=/usr/bin/luit
-   touch $@
+   $@
 
 
 .PHONY: build
@@ -75,7 +76,7 @@ build: $(STAMP_DIR)/build
 $(STAMP_DIR)/build: $(STAMP_DIR)/configure debian/local/xterm.faq
dh_testdir
cd build  $(MAKE)
-   touch $@
+   $@
 
 .PHONY: clean
 clean: xsfclean


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org

xterm: Changes to 'debian-unstable'

2011-10-15 Thread Julien Cristau 
 MANIFEST|2 
 VTPrsTbl.c  |7 
 cachedGCs.c |   62 
 charsets.c  |   63 
 debian/changelog|5 
 debian/local/xterm.faq.html |9 -
 doublechr.c |   62 
 fontutils.c |  329 +---
 fontutils.h |   64 
 linedata.c  |   62 
 main.c  |  233 +--
 main.h  |8 -
 menu.c  |   20 ++
 misc.c  |   80 +++---
 package/debian/changelog|   12 +
 package/xterm.spec  |4 
 print.c |   62 
 ptydata.c   |   62 
 resize.c|   41 +++--
 resize.man  |   25 ++-
 scrollback.c|   62 
 tabs.c  |5 
 testxmc.c   |   62 
 trace.c |   13 -
 trace.h |3 
 util.c  |   22 ++
 version.h   |   19 +-
 xstrings.c  |  175 ++-
 xstrings.h  |   68 -
 xterm.h |   65 
 xterm.log.html  |   64 
 xterm.man   |   11 -
 xtermcap.h  |   62 
 xtermcfg.hin|   62 
 xutf8.c |   43 ++---
 35 files changed, 1106 insertions(+), 842 deletions(-)

New commits:
commit cdee710295c2fe4e440f8c4d8637a177df873bd7
Author: Julien Cristau jcris...@debian.org
Date:   Sat Oct 15 19:38:46 2011 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index d1f55ce..375e257 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (276-1) UNRELEASED; urgency=low
+xterm (276-1) unstable; urgency=low
 
   [ Timo Aaltonen ]
   * Install .desktop files again. (Closes: #486317, LP: #129041)
@@ -21,7 +21,7 @@ xterm (276-1) UNRELEASED; urgency=low
 - Disable rmm and smm features in xterm terminfo entry to match the
   behavior in ncurses-base (see #574396).
 
- -- Julien Cristau jcris...@debian.org  Sat, 15 Oct 2011 19:36:10 +0200
+ -- Julien Cristau jcris...@debian.org  Sat, 15 Oct 2011 19:38:42 +0200
 
 xterm (271-1) unstable; urgency=low
 

commit 0f6ec6e99e763055a791c05794f532772f5d52d2
Author: Julien Cristau jcris...@debian.org
Date:   Sat Oct 15 19:38:40 2011 +0200

Update copy of XTerm FAQ to revision 1.168 (dated 2011/09/12).

diff --git a/debian/changelog b/debian/changelog
index 5b6f8d9..d1f55ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ xterm (276-1) UNRELEASED; urgency=low
   * Update 900_debian_xterm.diff to only edit the new xterm+kbs fragment in
 both terminfo and termcap instead of adding an xterm-debian variant to
 change the backspace key behaviour.
+  * Update copy of XTerm FAQ to revision 1.168 (dated 2011/09/12).
 
   [ Sven Joachim ]
   * Update 900_debian_xterm.diff:
diff --git a/debian/local/xterm.faq.html b/debian/local/xterm.faq.html
index d2fa477..a5593aa 100644
--- a/debian/local/xterm.faq.html
+++ b/debian/local/xterm.faq.html
@@ -1,7 +1,7 @@
 !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN
 !--
  *
- * Copyright 1997-2009,2010 by Thomas E. Dickey  *
+ * Copyright 1997-2010,2011 by Thomas E. Dickey  *
  * All Rights Reserved.  *
  *   *
  * Permission to use, copy, modify, and distribute this software and its *
@@ -20,7 +20,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   *
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.*
  *
-  $XTermId: xterm.faq.html,v 1.167 2010/11/25 14:10:03 tom Exp $
+  $XTermId: xterm.faq.html,v 1.168 2011/09/12 08:37:53 tom Exp $
   --
 HTML
 HEAD
@@ -30,7 +30,8 @@
 /HEAD
 BODY
 HR
-Copyright 1997-2009,2010 by Thomas E. Dickey
+a href=http://invisible-island.net/;http://invisible-island.net//aa 
href=http://invisible-island.net/xterm/;xterm//abr
+Copyright copy; 1997-2010,2011 by Thomas E. Dickey
 HR
 a href=http://invisible-island.net/xterm/xterm.faq.html;Here/a
 is the latest version of this file.
@@ -1631,7 +1632,7 @@ which would not affect the home/end keys.
 which I tested with xterm-88c, xterm-149 and xterm-158,
 using $TERM set to xterm-debian:
 !--{{atr2html--p style=font-family: monospace; font-size: 10pt;
-font color=#80!nbsp;$Id: xterm.faq.html,v 1.167 2010/11/25 14:10:03 
tom Exp $br
+font color=#80!nbsp;$Id: xterm.faq.html,v 1.168

xterm: Changes to 'debian-unstable'

2011-09-07 Thread Julien Cristau 
 INSTALL  |   19 
 MANIFEST |2 
 Tekproc.c|4 
 aclocal.m4   |  108 +
 charproc.c   |   22 
 configure| 2980 ---
 configure.in |4 
 ctlseqs.ms   |   48 
 ctlseqs.txt  |   36 
 debian/changelog |4 
 fontutils.c  |   31 
 main.c   |   28 
 menu.c   |6 
 menu.h   |   10 
 misc.c   |  250 +++
 package/debian/changelog |6 
 package/xterm.spec   |4 
 ptyx.h   |5 
 scrollbar.c  |4 
 trace.c  |   13 
 trace.h  |   11 
 util.c   |5 
 version.h|4 
 xstrings.c   |6 
 xterm.h  |6 
 xterm.log.html   |   48 
 xterm.man|   29 
 xtermcap.h   |6 
 xtermcfg.hin |6 
 29 files changed, 2095 insertions(+), 1610 deletions(-)

New commits:
commit f5d18646dfcb374ca40da64584a8625d7fc96b3a
Author: Julien Cristau jcris...@debian.org
Date:   Wed Sep 7 20:53:07 2011 +0200

Bump changelog

diff --git a/debian/changelog b/debian/changelog
index 23aaac3..f3b052b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (273-1) UNRELEASED; urgency=low
+xterm (274-1) UNRELEASED; urgency=low
 
   [ Timo Aaltonen ]
   * Install .desktop files again. (Closes: #486317, LP: #129041)
@@ -20,7 +20,7 @@ xterm (273-1) UNRELEASED; urgency=low
 - Disable rmm and smm features in xterm terminfo entry to match the
   behavior in ncurses-base (see #574396).
 
- -- Julien Cristau jcris...@debian.org  Sun, 28 Aug 2011 18:00:26 +0200
+ -- Julien Cristau jcris...@debian.org  Wed, 07 Sep 2011 20:52:57 +0200
 
 xterm (271-1) unstable; urgency=low
 

commit b7466d18be04cf6f831536156f12940e07d5a3bb
Author: Julien Cristau jcris...@debian.org
Date:   Wed Sep 7 20:43:35 2011 +0200

Imported Upstream version 274

diff --git a/INSTALL b/INSTALL
index 028375a..c8f28eb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.125 2011/07/07 01:01:14 tom Exp $
+-- $XTermId: INSTALL,v 1.126 2011/08/30 09:51:01 tom Exp $
 ---
 -- Copyright 1997-2010,2011 by Thomas E. Dickey
 --
@@ -537,6 +537,23 @@ The options (in alphabetic order):
at existing .desktop files for xterm and common terminal
emulators, to use those.
 
+  --with-freetype-config  configure script to use for FreeType
+
+   Use a specific option value to tell the configure script to try
+   just one of the variations:
+
+   pkg*, e.g., pkg-config or pkgconfig uses whatever pkg-config
+   script was found. 
+
+   otherwise, the parameter value is used as the name of the script
+   to try, using --cflags and --libs options.
+
+   Use --without-freetype-config to enable the --with-freetype-cflags
+   and --with-freetype-libs options.
+
+   The default value auto tells the configure script to try the
+   pkg-config script first, then freetype-config and finally xft-config.
+
   --with-freetype-cflags  -D/-I options for compiling with FreeType library
 
Override options provided by xft-config or freetype-config.
diff --git a/MANIFEST b/MANIFEST
index 083ef51..470da66 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-273, version xterm-273
+MANIFEST for xterm-274, version xterm-274
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/Tekproc.c b/Tekproc.c
index f07831e..1aa9282 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.189 2011/07/10 22:19:32 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.190 2011/09/03 12:13:42 tom Exp $ */
 
 /*
  * Copyright 2001-2010,2011 by Thomas E. Dickey
@@ -826,7 +826,7 @@ Tinput(TekWidget tw)
TCursorToggle(tw, TOGGLE);
Ttoggled = False;
}
-   if (XtAppPending(app_con)  XtIMXEvent) {
+   if (xtermAppPending()  XtIMXEvent) {
 #ifdef VMS
Tselect_mask = X_mask;
 #else /* VMS */
diff --git a/aclocal.m4 b/aclocal.m4
index a78eb7e..f77b1d7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.310 2011/07/17 19:28:03 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.313 2011/09/04 21:20:20 tom Exp $
 dnl
 dnl ---
 dnl
@@ -574,7 +574,7 @@ int main() {
fi
 ])])dnl
 dnl ---
-dnl CF_FUNC_TGETENT version: 17 updated: 2011/07/14 19:34:47
+dnl CF_FUNC_TGETENT version: 18

xterm: Changes to 'debian-unstable'

2011-09-03 Thread Julien Cristau 
 debian/changelog |2 +-
 debian/patches/900_debian_xterm.diff |9 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit b046f974b1e4a1919a1704af4d07013252531568
Author: Julien Cristau jcris...@debian.org
Date:   Sat Sep 3 17:30:31 2011 +0200

Restore termcap/terminfo comments with pointers to Policy 9.8

Suggested by Riku Saikkonen.

diff --git a/debian/changelog b/debian/changelog
index 08eb84b..23aaac3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,7 @@ xterm (273-1) UNRELEASED; urgency=low
 - Disable rmm and smm features in xterm terminfo entry to match the
   behavior in ncurses-base (see #574396).
 
-  -- Julien Cristau jcris...@debian.org  Sun, 28 Aug 2011 18:00:26 +0200
+ -- Julien Cristau jcris...@debian.org  Sun, 28 Aug 2011 18:00:26 +0200
 
 xterm (271-1) unstable; urgency=low
 
diff --git a/debian/patches/900_debian_xterm.diff 
b/debian/patches/900_debian_xterm.diff
index 870a13a..c433806 100644
--- a/debian/patches/900_debian_xterm.diff
+++ b/debian/patches/900_debian_xterm.diff
@@ -25,9 +25,12 @@ Index: xterm/termcap
 ===
 --- xterm.orig/termcap
 +++ xterm/termcap
-@@ -240,4 +240,4 @@ v0|xterm|X11 terminal emulator:\
+@@ -239,5 +239,7 @@ v0|xterm|X11 terminal emulator:\
+ 
  # This fragment is for people who cannot agree on what the backspace key
  # should send.
++# Modified to more strictly conform to the DEC VT220 behavior; this is
++# mandated by Section 9.8 of the Debian Policy Manual.
  xterm+kbs|fragment for backspace key:\
 -  :kb=^H:
 +  :kb=^?:
@@ -35,7 +38,7 @@ Index: xterm/terminfo
 ===
 --- xterm.orig/terminfo
 +++ xterm/terminfo
-@@ -1963,11 +1963,13 @@ xterm-r5|xterm R5 version,
+@@ -1963,11 +1963,15 @@ 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.
@@ -48,6 +51,8 @@ Index: xterm/terminfo
  
  # This fragment is for people who cannot agree on what the backspace key
  # should send.
++# Modified to more strictly conform to the DEC VT220 behavior; this is
++# mandated by Section 9.8 of the Debian Policy Manual.
  xterm+kbs|fragment for backspace key,
 -  kbs=^H,
 +  kbs=\177,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qzse8-0002y1...@vasks.debian.org

Re: xterm: Changes to 'debian-unstable'

2011-09-03 Thread Julien Cristau 
On Wed, Aug 31, 2011 at 23:11:31 +0300, Riku Saikkonen wrote:

 Hi,
 
 Julien Cristau jcris...@debian.org writes:
 can you check if the change I've made makes sense?  (And if we need to
 keep the xterm-debian definition for backwards-compatibility reasons?)
 
 Just a note from an outsider that follows debian-x every now and then:
 maybe it would be useful to keep the comment that refers to Debian
 Policy 9.8? The idea being that it gives a reference to a rationale
 for the backspace behavior, so if someone has a broken backspace and
 examines the termcap or terminfo entry, the comment would point them
 somewhere that explains the situation (and, perhaps more importantly,
 reminds the reader that this is something that needs to be kept
 consistent and is thus specified in a policy, and changing it in one
 place could break things somewhere else).
 
Restored the pointer to Policy 9.8, thanks for the suggestion.

Cheers,
Julien


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110903153424.go2...@radis.liafa.jussieu.fr

Re: xterm: Changes to 'debian-unstable'

2011-08-31 Thread Sven Joachim 
On 2011-08-30 22:01 +0200, Julien Cristau wrote:

 Hi Sven,

 can you check if the change I've made makes sense?

Looks okay.  Unifying backspace behavior across all xterm* terminfo
entries is probably a good thing, even if does not match current
behavior.

 (And if we need to
 keep the xterm-debian definition for backwards-compatibility reasons?)

Some people may still have set TERM to xterm-debian, and I don't want to
break their setups.  Keeping an alias is cheap, so I've done that.

Cheers,
   Sven


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87y5y9h7yf@turtle.gmx.de

xterm: Changes to 'debian-unstable'

2011-08-31 Thread Sven Joachim 
 debian/changelog |8 +++-
 debian/patches/900_debian_xterm.diff |   12 +++-
 2 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit e596bbe7182b8c2507ca63c73cf4dea1e665ad1c
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Aug 31 18:01:43 2011 +0200

Disable rmm and smm features in xterm terminfo entry

This matches what I have done in ncurses-base in reaction to
http://bugs.debian.org/574396, a bug that seems unlikely to get fixed
any time soon.

diff --git a/debian/changelog b/debian/changelog
index 59a84c5..08eb84b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,10 @@ xterm (273-1) UNRELEASED; urgency=low
 change the backspace key behaviour.
 
   [ Sven Joachim ]
-  * Add xterm-debian as an alias for xterm in 900_debian_xterm.diff.
+  * Update 900_debian_xterm.diff:
+- Add xterm-debian terminfo entry as an alias for xterm.
+- Disable rmm and smm features in xterm terminfo entry to match the
+  behavior in ncurses-base (see #574396).
 
   -- Julien Cristau jcris...@debian.org  Sun, 28 Aug 2011 18:00:26 +0200
 
diff --git a/debian/patches/900_debian_xterm.diff 
b/debian/patches/900_debian_xterm.diff
index c454dbe..870a13a 100644
--- a/debian/patches/900_debian_xterm.diff
+++ b/debian/patches/900_debian_xterm.diff
@@ -35,12 +35,14 @@ Index: xterm/terminfo
 ===
 --- xterm.orig/terminfo
 +++ xterm/terminfo
-@@ -1963,11 +1963,11 @@ xterm-r5|xterm R5 version,
+@@ -1963,11 +1963,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,
  

commit 13575d6e10c960a2f4dc907028280b6bf0e9747e
Author: Sven Joachim svenj...@gmx.de
Date:   Wed Aug 31 17:13:34 2011 +0200

Add xterm-debian as an alias for xterm in 900_debian_xterm.diff

diff --git a/debian/changelog b/debian/changelog
index 121ffe9..59a84c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,10 @@ xterm (273-1) UNRELEASED; urgency=low
 both terminfo and termcap instead of adding an xterm-debian variant to
 change the backspace key behaviour.
 
- -- Julien Cristau jcris...@debian.org  Sun, 28 Aug 2011 18:00:26 +0200
+  [ Sven Joachim ]
+  * Add xterm-debian as an alias for xterm in 900_debian_xterm.diff.
+
+  -- Julien Cristau jcris...@debian.org  Sun, 28 Aug 2011 18:00:26 +0200
 
 xterm (271-1) unstable; urgency=low
 
diff --git a/debian/patches/900_debian_xterm.diff 
b/debian/patches/900_debian_xterm.diff
index 3efc259..c454dbe 100644
--- a/debian/patches/900_debian_xterm.diff
+++ b/debian/patches/900_debian_xterm.diff
@@ -35,7 +35,15 @@ Index: xterm/terminfo
 ===
 --- xterm.orig/terminfo
 +++ xterm/terminfo
-@@ -1970,4 +1970,4 @@ xterm|X11 terminal emulator,
+@@ -1963,11 +1963,11 @@ 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,
+   use=xterm-new,
+ # use=xterm-r6,
+ 
  # This fragment is for people who cannot agree on what the backspace key
  # should send.
  xterm+kbs|fragment for backspace key,


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qynsj-0001uw...@vasks.debian.org

Re: xterm: Changes to 'debian-unstable'

2011-08-31 Thread Julien Cristau 
On Wed, Aug 31, 2011 at 18:16:56 +0200, Sven Joachim wrote:

 On 2011-08-30 22:01 +0200, Julien Cristau wrote:
 
  Hi Sven,
 
  can you check if the change I've made makes sense?
 
 Looks okay.  Unifying backspace behavior across all xterm* terminfo
 entries is probably a good thing, even if does not match current
 behavior.
 
  (And if we need to
  keep the xterm-debian definition for backwards-compatibility reasons?)
 
 Some people may still have set TERM to xterm-debian, and I don't want to
 break their setups.  Keeping an alias is cheap, so I've done that.
 
Thanks!

Cheers,
Julien


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20110831172152.gv2...@radis.liafa.jussieu.fr

Re: xterm: Changes to 'debian-unstable'

2011-08-31 Thread Riku Saikkonen 
Hi,

Julien Cristau jcris...@debian.org writes:
can you check if the change I've made makes sense?  (And if we need to
keep the xterm-debian definition for backwards-compatibility reasons?)

Just a note from an outsider that follows debian-x every now and then:
maybe it would be useful to keep the comment that refers to Debian
Policy 9.8? The idea being that it gives a reference to a rationale
for the backspace behavior, so if someone has a broken backspace and
examines the termcap or terminfo entry, the comment would point them
somewhere that explains the situation (and, perhaps more importantly,
reminds the reader that this is something that needs to be kept
consistent and is thus specified in a policy, and changing it in one
place could break things somewhere else).

-- 
-=- Rjs -=- r...@cs.hut.fi, riku.saikko...@hut.fi


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/87ippds5n0@lambda.cs.hut.fi

xterm: Changes to 'debian-unstable'

2011-08-30 Thread Julien Cristau 
 debian/changelog |4 +
 debian/patches/900_debian_xterm.diff |   73 +--
 debian/rules |1 
 3 files changed, 15 insertions(+), 63 deletions(-)

New commits:
commit 05f4a917b7891f2d73e80d1d73fc91055edf7c4e
Author: Julien Cristau jcris...@debian.org
Date:   Tue Aug 30 21:51:36 2011 +0200

Fix up 900_debian_xterm.diff's changes to termcap and terminfo

Update 900_debian_xterm.diff to only edit the new xterm+kbs fragment in
both terminfo and termcap instead of adding an xterm-debian variant to
change the backspace key behaviour.

diff --git a/debian/changelog b/debian/changelog
index c6588a1..121ffe9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ xterm (273-1) UNRELEASED; urgency=low
 + fix regression in command-line parsing introduced in patch #271 changes
   for Debian #629358 (closes: #637910)
   * Don't use dh_testroot in clean.
+  * Update 900_debian_xterm.diff to only edit the new xterm+kbs fragment in
+both terminfo and termcap instead of adding an xterm-debian variant to
+change the backspace key behaviour.
 
  -- Julien Cristau jcris...@debian.org  Sun, 28 Aug 2011 18:00:26 +0200
 
diff --git a/debian/patches/900_debian_xterm.diff 
b/debian/patches/900_debian_xterm.diff
index f108321..3efc259 100644
--- a/debian/patches/900_debian_xterm.diff
+++ b/debian/patches/900_debian_xterm.diff
@@ -25,73 +25,22 @@ Index: xterm/termcap
 ===
 --- xterm.orig/termcap
 +++ xterm/termcap
-@@ -71,6 +71,14 @@ xb|xterm-basic|modern xterm common:\
-   :so=\E[7m:sr=\EM:st=\EH:te=\E[?1049l:ti=\E[?1049h:\
-   :ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?12l\E[?25h:vi=\E[?25l:vs=\E[?12;25h:
- 
-+# xterm-debian is identical to xterm-new except that it more strictly
-+# conforms to DEC VT220 behavior in the case of the backspace key; this is
-+# mandated by Section 9.8 of the Debian Policy Manual.  Also see
-+# http://vt100.net/docs/vt220-rm/.
-+xd|xterm-debian|Debian xterm (VT220-conformant backspace):\
-+  :kb=^?:\
-+  :tc=xterm-new:
-+
- # The xterm-new description has all of the features, but is not completely
- # compatible with vt220.  If you are using a Sun or PC keyboard, set the
- # sunKeyboard resource to true:
-@@ -233,5 +241,6 @@ x0|xterm-xfree86|xterm terminal emulator
- # is widely used for a variety of incompatible terminal emulations including
- # color_xterm and rxvt.
- v0|xterm|X11 terminal emulator:\
--  :tc=xterm-new:
-+  :tc=xterm-debian:
-+# :tc=xterm-new:
- # :tc=xterm-r6:
+@@ -240,4 +240,4 @@ v0|xterm|X11 terminal emulator:\
+ # This fragment is for people who cannot agree on what the backspace key
+ # should send.
+ xterm+kbs|fragment for backspace key:\
+-  :kb=^H:
++  :kb=^?:
 Index: xterm/terminfo
 ===
 --- xterm.orig/terminfo
 +++ xterm/terminfo
-@@ -981,6 +981,13 @@ xterm-basic|modern xterm terminal emulat
-   u8=\E[?1;2c,
-   u9=\E[c,
-   vpa=\E[%i%p1%dd,
-+# xterm-debian is identical to xterm-new except that it more strictly
-+# conforms to DEC VT220 behavior in the case of the backspace key; this is
-+# mandated by the Section 9.8 of the Debian Policy Manual.  Also see
-+# http://vt100.net/docs/vt220-rm/.
-+xterm-debian|Debian xterm (VT220-conformant backspace),
+@@ -1970,4 +1970,4 @@ xterm|X11 terminal emulator,
+ # This fragment is for people who cannot agree on what the backspace key
+ # should send.
+ xterm+kbs|fragment for backspace key,
+-  kbs=^H,
 +  kbs=\177,
-+  use=xterm-new,
- #
- # The xterm-new description has all of the features, but is not completely
- # compatible with vt220.  If you are using a Sun or PC keyboard, set the
-@@ -1419,7 +1426,7 @@ xterm-16color|xterm with 16 colors,
-   setaf=\E[%?%p1%{8}%%t%p1%{30}%+%e%p1%{82}%+%;%dm,
-   
setb=%p1%{8}%/%{6}%*%{4}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m,
-   
setf=%p1%{8}%/%{6}%*%{3}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m,
--  use=xterm-new,
-+  use=xterm-debian,
- #
- # This uses RGB values 0..1000
- #
-@@ -1434,7 +1441,7 @@ xterm-256color|xterm with 256 colors,
-   setaf=\E[%?%p1%{8}%%t3%p1%d%e%p1%{16}%%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
-   setb@,
-   setf@,
--  use=xterm-new,
-+  use=xterm-debian,
- xterm-88color|xterm with 88 colors,
-   colors#88,
-   pairs#7744,
-@@ -1961,5 +1968,6 @@ xterm-r5|xterm R5 version,
- # is widely used for a variety of incompatible terminal emulations including
- # color_xterm and rxvt.
- xterm|X11 terminal emulator,
--  use=xterm-new,
-+  use=xterm-debian,
-+# use=xterm-new,
- # use=xterm-r6,
 Index: xterm/XTerm.ad
 ===
 --- xterm.orig/XTerm.ad

commit

Re: xterm: Changes to 'debian-unstable'

2011-08-30 Thread Julien Cristau 
Hi Sven,

can you check if the change I've made makes sense?  (And if we need to
keep the xterm-debian definition for backwards-compatibility reasons?)

Thanks,
Julien

On Tue, Aug 30, 2011 at 19:52:32 +, Julien Cristau wrote:

  debian/changelog |4 +
  debian/patches/900_debian_xterm.diff |   73 
 +--
  debian/rules |1 
  3 files changed, 15 insertions(+), 63 deletions(-)
 
 New commits:
 commit 05f4a917b7891f2d73e80d1d73fc91055edf7c4e
 Author: Julien Cristau jcris...@debian.org
 Date:   Tue Aug 30 21:51:36 2011 +0200
 
 Fix up 900_debian_xterm.diff's changes to termcap and terminfo
 
 Update 900_debian_xterm.diff to only edit the new xterm+kbs fragment in
 both terminfo and termcap instead of adding an xterm-debian variant to
 change the backspace key behaviour.
 
 diff --git a/debian/changelog b/debian/changelog
 index c6588a1..121ffe9 100644
 --- a/debian/changelog
 +++ b/debian/changelog
 @@ -10,6 +10,9 @@ xterm (273-1) UNRELEASED; urgency=low
  + fix regression in command-line parsing introduced in patch #271 changes
for Debian #629358 (closes: #637910)
* Don't use dh_testroot in clean.
 +  * Update 900_debian_xterm.diff to only edit the new xterm+kbs fragment in
 +both terminfo and termcap instead of adding an xterm-debian variant to
 +change the backspace key behaviour.
  
   -- Julien Cristau jcris...@debian.org  Sun, 28 Aug 2011 18:00:26 +0200
  
 diff --git a/debian/patches/900_debian_xterm.diff 
 b/debian/patches/900_debian_xterm.diff
 index f108321..3efc259 100644
 --- a/debian/patches/900_debian_xterm.diff
 +++ b/debian/patches/900_debian_xterm.diff
 @@ -25,73 +25,22 @@ Index: xterm/termcap
  ===
  --- xterm.orig/termcap
  +++ xterm/termcap
 -@@ -71,6 +71,14 @@ xb|xterm-basic|modern xterm common:\
 - :so=\E[7m:sr=\EM:st=\EH:te=\E[?1049l:ti=\E[?1049h:\
 - :ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?12l\E[?25h:vi=\E[?25l:vs=\E[?12;25h:
 - 
 -+# xterm-debian is identical to xterm-new except that it more strictly
 -+# conforms to DEC VT220 behavior in the case of the backspace key; this is
 -+# mandated by Section 9.8 of the Debian Policy Manual.  Also see
 -+# http://vt100.net/docs/vt220-rm/.
 -+xd|xterm-debian|Debian xterm (VT220-conformant backspace):\
 -+:kb=^?:\
 -+:tc=xterm-new:
 -+
 - # The xterm-new description has all of the features, but is not completely
 - # compatible with vt220.  If you are using a Sun or PC keyboard, set the
 - # sunKeyboard resource to true:
 -@@ -233,5 +241,6 @@ x0|xterm-xfree86|xterm terminal emulator
 - # is widely used for a variety of incompatible terminal emulations including
 - # color_xterm and rxvt.
 - v0|xterm|X11 terminal emulator:\
 --:tc=xterm-new:
 -+:tc=xterm-debian:
 -+#   :tc=xterm-new:
 - #   :tc=xterm-r6:
 +@@ -240,4 +240,4 @@ v0|xterm|X11 terminal emulator:\
 + # This fragment is for people who cannot agree on what the backspace key
 + # should send.
 + xterm+kbs|fragment for backspace key:\
 +-:kb=^H:
 ++:kb=^?:
  Index: xterm/terminfo
  ===
  --- xterm.orig/terminfo
  +++ xterm/terminfo
 -@@ -981,6 +981,13 @@ xterm-basic|modern xterm terminal emulat
 - u8=\E[?1;2c,
 - u9=\E[c,
 - vpa=\E[%i%p1%dd,
 -+# xterm-debian is identical to xterm-new except that it more strictly
 -+# conforms to DEC VT220 behavior in the case of the backspace key; this is
 -+# mandated by the Section 9.8 of the Debian Policy Manual.  Also see
 -+# http://vt100.net/docs/vt220-rm/.
 -+xterm-debian|Debian xterm (VT220-conformant backspace),
 +@@ -1970,4 +1970,4 @@ xterm|X11 terminal emulator,
 + # This fragment is for people who cannot agree on what the backspace key
 + # should send.
 + xterm+kbs|fragment for backspace key,
 +-kbs=^H,
  +kbs=\177,
 -+use=xterm-new,
 - #
 - # The xterm-new description has all of the features, but is not completely
 - # compatible with vt220.  If you are using a Sun or PC keyboard, set the
 -@@ -1419,7 +1426,7 @@ xterm-16color|xterm with 16 colors,
 - setaf=\E[%?%p1%{8}%%t%p1%{30}%+%e%p1%{82}%+%;%dm,
 - 
 setb=%p1%{8}%/%{6}%*%{4}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m,
 - 
 setf=%p1%{8}%/%{6}%*%{3}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m,
 --use=xterm-new,
 -+use=xterm-debian,
 - #
 - # This uses RGB values 0..1000
 - #
 -@@ -1434,7 +1441,7 @@ xterm-256color|xterm with 256 colors,
 - setaf=\E[%?%p1%{8}%%t3%p1%d%e%p1%{16}%%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
 - setb@,
 - setf@,
 --use=xterm-new,
 -+use=xterm-debian,
 - xterm-88color|xterm with 88 colors,
 - colors#88,
 - pairs#7744,
 -@@ -1961,5 +1968,6 @@ xterm-r5|xterm R5 version,
 - # is widely used for a variety of incompatible terminal emulations

xterm: Changes to 'debian-unstable'

2011-08-28 Thread Julien Cristau 
 MANIFEST |4 
 Makefile.in  |   36 -
 THANKS   |7 
 aclocal.m4   |   32 -
 button.c |4 
 charproc.c   |7 
 configure|  965 +++
 configure.in |8 
 debian/changelog |   12 
 fontutils.c  |6 
 koi8rxterm.man   |6 
 main.c   |  460 ++
 minstall.in  |  133 ++
 minstall.sh  |  125 --
 misc.c   |  152 +++
 package/debian/changelog |   12 
 package/xterm.spec   |4 
 ptyx.h   |9 
 resize.man   |   24 -
 termcap  |   48 +-
 terminfo |   24 -
 trace.c  |   88 
 trace.h  |   12 
 uxterm.man   |6 
 version.h|4 
 xstrings.c   |   75 +++
 xstrings.h   |   10 
 xterm.h  |   12 
 xterm.log.html   |   76 +++
 xterm.man|  110 ++---
 30 files changed, 1549 insertions(+), 922 deletions(-)

New commits:
commit 29d413592ce54487988eeb243f2b8da374219428
Author: Julien Cristau jcris...@debian.org
Date:   Sun Aug 28 18:03:35 2011 +0200

Changelog entry for new upstream release

diff --git a/debian/changelog b/debian/changelog
index d791b2a..77be5ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
-xterm (271-2) UNRELEASED; urgency=low
+xterm (273-1) UNRELEASED; urgency=low
 
+  [ Timo Aaltonen ]
   * Install .desktop files again. (Closes: #486317, LP: #129041)
 
- -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 04 Aug 2011 15:19:28 +0300
+  [ Julien Cristau ]
+  * New upstream release
++ document limitation of Gtk in connection with xterm's -into option, in
+  the manpage (LP: #806969)
++ fix regression in command-line parsing introduced in patch #271 changes
+  for Debian #629358 (closes: #637910)
+
+ -- Julien Cristau jcris...@debian.org  Sun, 28 Aug 2011 18:00:26 +0200
 
 xterm (271-1) unstable; urgency=low
 

commit e2853acdc3e5209924a7030e9083299bfd3f7003
Author: Julien Cristau jcris...@debian.org
Date:   Sun Aug 28 17:56:20 2011 +0200

Imported Upstream version 273

diff --git a/MANIFEST b/MANIFEST
index 4e2d987..083ef51 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-272, version xterm-272
+MANIFEST for xterm-273, version xterm-273
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index 9cc073a..17684ea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.184 2011/08/19 09:08:05 tom Exp $
+## $XTermId: Makefile.in,v 1.186 2011/08/25 09:25:51 tom Exp $
 # -
 # this file is part of xterm
 #
@@ -130,7 +130,7 @@ all :   $(PROGRAMS)
grep '^CASE_' $ | $(AWK) '{printf #define %s %d\n, $$1, n++}' $@
 
 .man.$(manext) :
-   $(SHELL) $(srcdir)/minstall $(INSTALL_DATA) $ $@ $(appsdir) $(CLASS)
+   $(SHELL) ./minstall $(INSTALL_DATA) $ $@ $(appsdir) $(CLASS)
 
 .$(manext).html :
GROFF_NO_SGR=stupid $(SHELL) -c tbl $*.$(manext) | groff -Thtml -man 
$@
@@ -142,13 +142,13 @@ all : $(PROGRAMS)
GROFF_NO_SGR=stupid $(SHELL) -c tbl $*.$(manext) | nroff -Tascii -man 
| col -bx $@
 
 .ms.html :
-   GROFF_NO_SGR=stupid $(SHELL) -c tbl $*.ms | groff -Thtml -ms $@
+   GROFF_NO_SGR=stupid $(SHELL) -c tbl $ | groff -Thtml -ms $@
 
 .ms.ps :
-   $(SHELL) -c tbl $*.ms | groff -ms $@
+   $(SHELL) -c tbl $ | groff -ms $@
 
 .ms.txt :
-   GROFF_NO_SGR=stupid $(SHELL) -c tbl $*.ms | nroff -Tascii -ms | col 
-bx $@
+   GROFF_NO_SGR=stupid $(SHELL) -c tbl $ | nroff -Tascii -ms | col -bx 
$@
 
 .ps.pdf :
ps2pdf $*.ps
@@ -222,10 +222,10 @@ install-full ::
 install \
 install-man \
 install-full :: $(MANDIR)
-   $(SHELL) $(srcdir)/minstall $(INSTALL_DATA) $(srcdir)/xterm.man
$(MANDIR)/$(actual_xterm).$(manext)  $(appsdir) $(CLASS)
-   $(SHELL) $(srcdir)/minstall $(INSTALL_DATA) $(srcdir)/resize.man   
$(MANDIR)/$(actual_resize).$(manext) $(appsdir) $(CLASS)
-   $(SHELL) $(srcdir)/minstall $(INSTALL_DATA) $(srcdir)/uxterm.man   
$(MANDIR)/$(actual_uxterm).$(manext) $(appsdir) $(CLASS)
-   $(SHELL) $(srcdir)/minstall $(INSTALL_DATA) $(srcdir)/koi8rxterm.man  
 $(MANDIR)/$(actual_k8term).$(manext) $(appsdir) $(CLASS)
+   $(SHELL) ./minstall $(INSTALL_DATA) $(srcdir)/xterm.man
$(MANDIR)/$(actual_xterm).$(manext)  $(appsdir) $(CLASS)
+   $(SHELL) ./minstall $(INSTALL_DATA) $(srcdir)/resize.man   
$(MANDIR)/$(actual_resize).$(manext) $(appsdir) $(CLASS)
+   $(SHELL) ./minstall $(INSTALL_DATA)

xterm: Changes to 'debian-unstable'

2011-08-04 Thread Timo Aaltonen 
 debian/changelog |6 ++
 debian/control   |2 ++
 debian/rules |2 +-
 debian/xterm.install |1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit dc48174ad87c328be5d429a714e88597e74f2e2d
Author: Timo Aaltonen tjaal...@ubuntu.com
Date:   Thu Aug 4 15:56:38 2011 +0300

Install .desktop files again.

diff --git a/debian/changelog b/debian/changelog
index 51ff142..d791b2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xterm (271-2) UNRELEASED; urgency=low
+
+  * Install .desktop files again. (Closes: #486317, LP: #129041)
+
+ -- Timo Aaltonen tjaal...@ubuntu.com  Thu, 04 Aug 2011 15:19:28 +0300
+
 xterm (271-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 2d6b79f..81924f2 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends:
  quilt,
  lynx-cur | lynx,
  xorg-docs-core,
+ desktop-file-utils,
 
 # Reasons for Build-Depends:
 #
@@ -100,6 +101,7 @@ Build-Depends:
 #   debhelper (= 5)debian/compat = 5
 #   quilt   patch management system
 #   lynx-cur | lynx generates plain-text version of xterm faq
+#   desktop-file-utils  for installing xterm.desktop
 
 Package: xterm
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 2879066..5c2beea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,7 +93,7 @@ install: build
dh_installdirs
# General installation
cd build  \
-   $(MAKE) install mandir=/usr/share/man/man1 libdir=/etc 
DESTDIR=$(DEBTREEDIR)
+   $(MAKE) install install-desktop mandir=/usr/share/man/man1 libdir=/etc 
DESTDIR=$(DEBTREEDIR)

## Install lxterm command and manual page.
install -m 755 debian/local/lxterm $(DEBTREEDIR)/usr/bin
diff --git a/debian/xterm.install b/debian/xterm.install
index e620391..dad8ef6 100644
--- a/debian/xterm.install
+++ b/debian/xterm.install
@@ -2,3 +2,4 @@ etc/X11/app-defaults/*
 usr/bin/*
 usr/share/man/man1/*
 usr/share/pixmaps
+usr/share/applications/*


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qoynh-0004rr...@vasks.debian.org

xterm: Changes to 'debian-unstable'

2011-07-23 Thread Julien Cristau 
 INSTALL  |7 
 Imakefile|7 
 MANIFEST |3 
 Makefile.in  |   48 
 Tekproc.c|4 
 XTerm.ad |4 
 aclocal.m4   |  138 +-
 button.c |   30 
 charproc.c   |  151 +-
 configure| 3004 ---
 configure.in |   15 
 ctlseqs.ms   |   19 
 ctlseqs.txt  |   20 
 data.h   |6 
 debian/changelog |   11 
 df-install.in|   20 
 fontutils.c  |   61 
 main.c   |   59 
 menu.c   |  272 +++-
 menu.h   |   16 
 misc.c   |   52 
 os2main.c|   25 
 package/debian/changelog |6 
 package/debian/control   |4 
 package/debian/rules |9 
 package/xterm.spec   |   26 
 print.c  |  239 ++-
 ptyx.h   |   40 
 terminfo |   30 
 trace.c  |   18 
 trace.h  |6 
 version.h|4 
 vttests/dynamic.pl   |  131 ++
 xterm.h  |   11 
 xterm.log.html   |  102 +
 xterm.man|  388 --
 xterm_io.h   |6 
 xtermcap.c   |   10 
 xutf8.c  |   24 
 39 files changed, 3058 insertions(+), 1968 deletions(-)

New commits:
commit d8c08825d83e07dc45d0994507013fddb1fcadb6
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jul 23 13:39:33 2011 +0200

Bump changelog

diff --git a/debian/changelog b/debian/changelog
index 1bd7d55..c984e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xterm (271-1) UNRELEASED; urgency=low
+
+  * New upstream release
+- amend change for Debian #110226 so that -h or -v options cause an
+  exit, rather than simply printing to stdout while the window is
+  displayed (closes: #629358)
+- handle special-case of KeyPress translated to popup-menu action
+  (LP: #756273)
+
+ -- Julien Cristau jcris...@debian.org  Sat, 23 Jul 2011 13:35:06 +0200
+
 xterm (270-1) unstable; urgency=low
 
   * New upstream release:

commit 5d85c8906d416e1e4cb556d6313585b16b83b814
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jul 23 13:34:19 2011 +0200

Imported Upstream version 271

diff --git a/INSTALL b/INSTALL
index 0cdf04a..028375a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.124 2011/04/22 09:30:55 tom Exp $
+-- $XTermId: INSTALL,v 1.125 2011/07/07 01:01:14 tom Exp $
 ---
 -- Copyright 1997-2010,2011 by Thomas E. Dickey
 --
@@ -499,6 +499,11 @@ The options (in alphabetic order):
 
Look for, compile and link with the Xaw Plus widget library.
 
+  --with-app-class=XXXX resource class (default: XTerm)
+
+   Rename the X resource class, e.g., for packaging a development version
+   of xterm with different result names.
+
   --with-app-defaults=DIR directory in which to install resource files 
(default: EPREFIX/lib/X11/app-defaults)
 
autoconf scripts assume that all of the files should be installed
diff --git a/Imakefile b/Imakefile
index 5bfaba7..f65c300 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.103 2011/02/19 13:09:15 tom Exp $
+XCOMM $XTermId: Imakefile,v 1.104 2011/07/02 00:48:49 tom Exp $
 XCOMM
 XCOMM Attention xterm porters
 XCOMM
@@ -143,11 +143,14 @@ module.o: ; $(CC) -c defines $(CFLAGS) module.c
  OSMINORVERSION = OSMinorVersion
 
 #ifdefined(NTOArchitecture)|| \
-   defined(LinuxArchitecture)  || \
defined(OpenBSDArchitecture)|| \
defined(SGIArchitecture)|| \
defined(SunArchitecture)
 TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
+#elif   defined(LinuxArchitecture)
+# if LinuxUsesNcurses
+TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
+# endif
 #endif
 
 #if !defined(OS2Architecture)  !defined(__GNU__)
diff --git a/MANIFEST b/MANIFEST
index 58226e8..757e8e0 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-270, version xterm-270
+MANIFEST for xterm-271, version xterm-271
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
@@ -155,6 +155,7 @@ vttests/88colors2.plsample script showing 
88-colors
 vttests/8colors.sh  test-script to illustrate 8-colors
 vttests/acolors.sh  demonstrate changing the ANSI colors
 vttests/doublechars.sh  test script to demonstrate doublesize chars
+vttests/dynamic.pl  demo for dynamic colors
 vttests/dynamic.sh  script to illustrate the dynamic colors 
control sequence
 vttests/dynamic2.sh

xterm: Changes to 'debian-unstable'

2011-07-23 Thread Julien Cristau 
 debian/changelog |4 ++--
 debian/patches/900_debian_xterm.diff |   10 +-
 debian/patches/902_windowops.diff|6 +++---
 debian/patches/904_fontops.diff  |2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 3490f0f112990bfa880f4fe1c334720db8b001d4
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jul 23 13:55:50 2011 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index c984e60..51ff142 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (271-1) UNRELEASED; urgency=low
+xterm (271-1) unstable; urgency=low
 
   * New upstream release
 - amend change for Debian #110226 so that -h or -v options cause an
@@ -7,7 +7,7 @@ xterm (271-1) UNRELEASED; urgency=low
 - handle special-case of KeyPress translated to popup-menu action
   (LP: #756273)
 
- -- Julien Cristau jcris...@debian.org  Sat, 23 Jul 2011 13:35:06 +0200
+ -- Julien Cristau jcris...@debian.org  Sat, 23 Jul 2011 13:55:37 +0200
 
 xterm (270-1) unstable; urgency=low
 

commit cfacdcf69267606895809ef1a436fbe57cdef219
Author: Julien Cristau jcris...@debian.org
Date:   Sat Jul 23 13:55:25 2011 +0200

Refresh patches

diff --git a/debian/patches/900_debian_xterm.diff 
b/debian/patches/900_debian_xterm.diff
index f8f3c9f..f108321 100644
--- a/debian/patches/900_debian_xterm.diff
+++ b/debian/patches/900_debian_xterm.diff
@@ -52,7 +52,7 @@ Index: xterm/terminfo
 ===
 --- xterm.orig/terminfo
 +++ xterm/terminfo
-@@ -955,6 +955,13 @@ xterm-basic|modern xterm terminal emulat
+@@ -981,6 +981,13 @@ xterm-basic|modern xterm terminal emulat
u8=\E[?1;2c,
u9=\E[c,
vpa=\E[%i%p1%dd,
@@ -66,7 +66,7 @@ Index: xterm/terminfo
  #
  # The xterm-new description has all of the features, but is not completely
  # compatible with vt220.  If you are using a Sun or PC keyboard, set the
-@@ -1393,7 +1400,7 @@ xterm-16color|xterm with 16 colors,
+@@ -1419,7 +1426,7 @@ xterm-16color|xterm with 16 colors,
setaf=\E[%?%p1%{8}%%t%p1%{30}%+%e%p1%{82}%+%;%dm,

setb=%p1%{8}%/%{6}%*%{4}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m,

setf=%p1%{8}%/%{6}%*%{3}%+\E[%d%p1%{8}%m%Pa%?%ga%{1}%=%t4%e%ga%{3}%=%t6%e%ga%{4}%=%t1%e%ga%{6}%=%t3%e%ga%d%;m,
@@ -75,7 +75,7 @@ Index: xterm/terminfo
  #
  # This uses RGB values 0..1000
  #
-@@ -1408,7 +1415,7 @@ xterm-256color|xterm with 256 colors,
+@@ -1434,7 +1441,7 @@ xterm-256color|xterm with 256 colors,
setaf=\E[%?%p1%{8}%%t3%p1%d%e%p1%{16}%%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
setb@,
setf@,
@@ -84,7 +84,7 @@ Index: xterm/terminfo
  xterm-88color|xterm with 88 colors,
colors#88,
pairs#7744,
-@@ -1935,5 +1942,6 @@ xterm-r5|xterm R5 version,
+@@ -1961,5 +1968,6 @@ xterm-r5|xterm R5 version,
  # is widely used for a variety of incompatible terminal emulations including
  # color_xterm and rxvt.
  xterm|X11 terminal emulator,
@@ -96,7 +96,7 @@ Index: xterm/XTerm.ad
 ===
 --- xterm.orig/XTerm.ad
 +++ xterm/XTerm.ad
-@@ -155,6 +155,10 @@
+@@ -159,6 +159,10 @@
  *tek4014*font3: 6x13
  *tek4014*fontSmall: 6x10
  
diff --git a/debian/patches/902_windowops.diff 
b/debian/patches/902_windowops.diff
index c2e8a2d..8779c7c 100644
--- a/debian/patches/902_windowops.diff
+++ b/debian/patches/902_windowops.diff
@@ -2,7 +2,7 @@ Index: xterm/xterm.man
 ===
 --- xterm.orig/xterm.man
 +++ xterm/xterm.man
-@@ -2173,8 +2173,9 @@ This is a comma-separated list of names,
+@@ -2249,8 +2249,9 @@ This is a comma-separated list of names,
  from \fIdtterm\fP the operation number).
  The default value is
  .RS
@@ -11,5 +11,5 @@ Index: xterm/xterm.man
  .RE
 +(i.e. no operations are allowed).
  .IP
- The names are listed below.  \fIxterm\fP ignores capitalization, but
- they are shown in mixed-case for clarity.  Where a number can be used
+ The names are listed below.
+ \fIxterm\fP ignores capitalization, but
diff --git a/debian/patches/904_fontops.diff b/debian/patches/904_fontops.diff
index 5042269..7f7769a 100644
--- a/debian/patches/904_fontops.diff
+++ b/debian/patches/904_fontops.diff
@@ -2,7 +2,7 @@ Index: xterm/xterm.man
 ===
 --- xterm.orig/xterm.man
 +++ xterm/xterm.man
-@@ -1523,7 +1523,7 @@ The default is \*(``true.\*(''
+@@ -1590,7 +1590,7 @@ The default is \*(``true.\*(''
  .TP
  .B allowFontOps (\fPclass\fB AllowFontOps)
  Specifies whether control sequences that set/query the font should be allowed.


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qkc4s-0007nw...@vasks.debian.org

xterm: Changes to 'debian-unstable'

2011-06-02 Thread Cyril Brulebois 
 INSTALL  |   18 
 MANIFEST |3 
 Makefile.in  |9 
 XTerm.ad |8 
 aclocal.m4   |  158 ++
 charproc.c   |   75 +
 config.guess |   37 
 config.sub   |   75 -
 configure| 2889 ---
 configure.in |   54 
 data.h   |7 
 debian/changelog |   11 
 df-install.in|   91 +
 error.h  |3 
 fontutils.c  |   98 +
 fontutils.h  |8 
 main.c   |   55 
 menu.c   |  132 +-
 menu.h   |   14 
 misc.c   |   14 
 os2main.c|   20 
 package/debian/changelog |6 
 package/debian/rules |   10 
 package/xterm.spec   |4 
 print.c  |  115 +
 ptyx.h   |   62 -
 screen.c |   22 
 scrollbar.c  |   11 
 trace.c  |6 
 version.h|4 
 xterm.h  |   12 
 xterm.log.html   |   76 +
 xterm.man|  124 +-
 33 files changed, 2559 insertions(+), 1672 deletions(-)

New commits:
commit 4609424884a34efb6a9e5e9996a8606255bd0a94
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 3 00:05:58 2011 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 45d1c34..1bd7d55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (270-1) UNRELEASED; urgency=low
+xterm (270-1) unstable; urgency=low
 
   * New upstream release:
 - Add printModeOnXError and printFileOnXError resources, which allow
@@ -7,7 +7,7 @@ xterm (270-1) UNRELEASED; urgency=low
 - Fix translations vs. fullscreen initializations to handle a corner
   case (Closes: #612978).
 
- -- Cyril Brulebois k...@debian.org  Thu, 02 Jun 2011 23:57:21 +0200
+ -- Cyril Brulebois k...@debian.org  Fri, 03 Jun 2011 00:05:53 +0200
 
 xterm (269-1) unstable; urgency=low
 

commit 77a365fd928ae612f568e23f0cf09b1be2b222cf
Author: Cyril Brulebois k...@debian.org
Date:   Fri Jun 3 00:04:31 2011 +0200

Bump changelog.

diff --git a/debian/changelog b/debian/changelog
index 0d3c056..45d1c34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xterm (270-1) UNRELEASED; urgency=low
+
+  * New upstream release:
+- Add printModeOnXError and printFileOnXError resources, which allow
+  the user to specify that xterm will write the contents of its screen
+  to a file if it is exiting due to an X error (Closes: #280457).
+- Fix translations vs. fullscreen initializations to handle a corner
+  case (Closes: #612978).
+
+ -- Cyril Brulebois k...@debian.org  Thu, 02 Jun 2011 23:57:21 +0200
+
 xterm (269-1) unstable; urgency=low
 
   * New upstream release:

commit 1816c00f92661cf3ef349c9962532cbcbf8d103d
Author: Cyril Brulebois k...@debian.org
Date:   Thu Jun 2 23:53:48 2011 +0200

Import xterm 270

diff --git a/INSTALL b/INSTALL
index 4f1cd8c..0cdf04a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
--- $XTermId: INSTALL,v 1.123 2010/06/14 08:57:22 tom Exp $
+-- $XTermId: INSTALL,v 1.124 2011/04/22 09:30:55 tom Exp $
 ---
--- Copyright 1997-2009,2010 by Thomas E. Dickey
+-- Copyright 1997-2010,2011 by Thomas E. Dickey
 --
 -- All Rights Reserved
 --
@@ -29,9 +29,9 @@
 -- authorization.
 ---
 
-Xterm is normally built as part of the X Window System source tree, using
-imake to generate a Makefile from Imakefile.  You can also use the
-configure script to generate a Makefile from Makefile.in:
+Xterm was originally built as part of the X Window System source tree, using
+imake to generate a Makefile from Imakefile.  You can also use the configure
+script to generate a Makefile from Makefile.in:
 
+ If you have imake (or xmkmf), then you can use those directly,
  or use the configure script, which normally uses those tools
@@ -524,6 +524,14 @@ The options (in alphabetic order):
Use --without-app-defaults or --with-app-defaults=no to disable the
feature.
 
+  --with-desktop-category=XXX  one or more desktop catgories or auto
+   This is a list of names.  The configure script maps blanks and commas
+   to semicolons (;) which are used by the desktop utils as a separator.
+
+   The default value auto tells the configure script to look
+   at existing .desktop files for xterm and common terminal
+   emulators, to use those.
+
   --with-freetype-cflags  -D/-I options for compiling with FreeType library
 
Override options provided by xft-config or freetype-config.
diff --git a/MANIFEST b/MANIFEST
index fe2ab6d..58226e8 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for

xterm: Changes to 'debian-unstable'

2011-03-05 Thread Cyril Brulebois 
 Imakefile|   12 
 MANIFEST |2 
 Makefile.in  |4 
 THANKS   |3 
 Tekproc.c|   12 
 aclocal.m4   |   51 +
 button.c |4 
 charproc.c   |  339 ++-
 config.guess |  172 ++---
 config.sub   |  109 ++-
 configure| 1415 ---
 ctlseqs.ms   |4 
 ctlseqs.txt  |2 
 data.c   |5 
 data.h   |9 
 debian/changelog |7 
 main.c   |   32 -
 menu.c   |  174 -
 misc.c   |   23 
 os2main.c|   99 +--
 package/debian/changelog |6 
 package/debian/copyright |2 
 package/xterm.spec   |4 
 ptyx.h   |   15 
 screen.c |  188 ++
 scrollbar.c  |4 
 trace.c  |   10 
 util.c   |   44 +
 version.h|6 
 xterm.h  |   27 
 xterm.log.html   |   57 +
 xterm.man|   58 +
 xtermcap.c   |6 
 33 files changed, 1696 insertions(+), 1209 deletions(-)

New commits:
commit 8132cfa47e21be93330f5edd8058d57ce8e63c16
Author: Cyril Brulebois k...@debian.org
Date:   Sat Mar 5 17:05:08 2011 +0100

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index 54463e7..0d3c056 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xterm (269-1) UNRELEASED; urgency=low
+xterm (269-1) unstable; urgency=low
 
   * New upstream release:
 - Make the fullscreen feature configurable (Closes: #612978).
 
- -- Cyril Brulebois k...@debian.org  Sat, 05 Mar 2011 17:03:22 +0100
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Mar 2011 17:05:05 +0100
 
 xterm (268-1) unstable; urgency=low
 

commit f67af9e000b0de289355880f1b5ddeabc8af1c9d
Author: Cyril Brulebois k...@debian.org
Date:   Sat Mar 5 17:04:32 2011 +0100

Bump changelog.

diff --git a/debian/changelog b/debian/changelog
index 5def055..54463e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xterm (269-1) UNRELEASED; urgency=low
+
+  * New upstream release:
+- Make the fullscreen feature configurable (Closes: #612978).
+
+ -- Cyril Brulebois k...@debian.org  Sat, 05 Mar 2011 17:03:22 +0100
+
 xterm (268-1) unstable; urgency=low
 
   [ Sven Joachim ]

commit b0a490d98e4f25dd2ed3e3a660098f8fa3116769
Author: Cyril Brulebois k...@debian.org
Date:   Sat Mar 5 16:52:54 2011 +0100

Import xterm 269

diff --git a/Imakefile b/Imakefile
index 57a7fd0..5bfaba7 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.102 2009/04/27 19:26:34 tom Exp $
+XCOMM $XTermId: Imakefile,v 1.103 2011/02/19 13:09:15 tom Exp $
 XCOMM
 XCOMM Attention xterm porters
 XCOMM
@@ -7,8 +7,6 @@ XCOMM Xterm assumes that bcopy can handle overlapping 
arguments.  If your
 XCOMM bcopy (or memcpy) cannot, write a routine called bcopy and link it in
 XCOMM or add -Dbcopy=mybcopy to the DEFINES list below.
 XCOMM
-XCOMM $XFree86: xc/programs/xterm/Imakefile,v 3.73 2006/04/10 00:34:36 dickey 
Exp $
-XCOMM
 
 /* Uncomment SCROLLBAR_RIGHT if you want the scroll bar to be on the right */
 SCROLLBAR_RIGHT = -DSCROLLBAR_RIGHT
@@ -144,6 +142,14 @@ module.o: ; $(CC) -c defines $(CFLAGS) module.c
  OSMAJORVERSION = OSMajorVersion
  OSMINORVERSION = OSMinorVersion
 
+#ifdefined(NTOArchitecture)|| \
+   defined(LinuxArchitecture)  || \
+   defined(OpenBSDArchitecture)|| \
+   defined(SGIArchitecture)|| \
+   defined(SunArchitecture)
+TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
+#endif
+
 #if !defined(OS2Architecture)  !defined(__GNU__)
 #if defined(UseUtempter)
 UTMPDEF = -DUSE_UTEMPTER
diff --git a/MANIFEST b/MANIFEST
index 3b01936..fe2ab6d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-268, version xterm-268
+MANIFEST for xterm-269, version xterm-269
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index 2a6a265..e0f8586 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.174 2010/11/24 11:21:01 tom Exp $
+## $XTermId: Makefile.in,v 1.175 2011/02/13 18:17:55 tom Exp $
 # -
 # this file is part of xterm
 #
@@ -65,7 +65,7 @@ EXTRA_LOADFLAGS   = @IMAKE_LOADFLAGS@
 
 CPPFLAGS   = -I. -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@ $(EXTRA_CPPFLAGS)
 CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS)
-LDFLAGS= @LDFLAGS@
+LDFLAGS= @LDFLAGS@ @EXTRA_LDFLAGS@
 LIBS   = @LIBS@
 
 prefix = @prefix@
diff

xterm: Changes to 'debian-unstable'

2011-02-10 Thread Julien Cristau 
 MANIFEST |2 
 Makefile.in  |7 
 THANKS   |3 
 Tekproc.c|4 
 XTerm.ad |5 
 button.c |   53 +++---
 cachedGCs.c  |5 
 charproc.c   |  216 +++--
 ctlseqs.ms   |8 
 ctlseqs.txt  |5 
 debian/changelog |   12 -
 debian/local/xterm.faq.html  |  193 ++
 debian/patches/900_debian_xterm.diff |   14 -
 debian/patches/902_windowops.diff|2 
 debian/patches/904_fontops.diff  |2 
 input.c  |   14 -
 linedata.c   |6 
 main.c   |   47 ++---
 menu.c   |  297 +--
 menu.h   |   24 ++
 misc.c   |   91 +-
 package/debian/changelog |6 
 package/xterm.spec   |4 
 plink.sh |4 
 print.c  |   10 -
 ptydata.c|   12 -
 ptyx.h   |   22 ++
 screen.c |   52 +-
 scrollbar.c  |   28 ++-
 trace.c  |   20 +-
 util.c   |   12 -
 version.h|4 
 xterm.h  |   14 +
 xterm.log.html   |   45 +
 xterm.man|   64 +++
 35 files changed, 952 insertions(+), 355 deletions(-)

New commits:
commit 95e362b0735b15560fdf94365c94907f366d837e
Author: Julien Cristau jcris...@debian.org
Date:   Thu Feb 10 18:48:45 2011 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 48cb3ad..5def055 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (268-1) UNRELEASED; urgency=low
+xterm (268-1) unstable; urgency=low
 
   [ Sven Joachim ]
   * Prefer lynx-cur over lynx in Build-Depends.
@@ -19,7 +19,7 @@ xterm (268-1) UNRELEASED; urgency=low
   Options menu.  This also removes a special case added in patch #217
   which limited the effect of the reverseVideo resource (closes: #603808)
 
- -- Julien Cristau jcris...@debian.org  Mon, 22 Nov 2010 19:06:50 +0100
+ -- Julien Cristau jcris...@debian.org  Thu, 10 Feb 2011 18:48:37 +0100
 
 xterm (266-1) unstable; urgency=low
 

commit df445f38b14ca754f0bd81bee419ee36709a3905
Author: Julien Cristau jcris...@debian.org
Date:   Thu Feb 10 18:48:14 2011 +0100

Update copy of XTerm FAQ to revision 1.167 (dated 2010/11/25)

diff --git a/debian/changelog b/debian/changelog
index abdba13..48cb3ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ xterm (268-1) UNRELEASED; urgency=low
 care of that.
 
   [ Julien Cristau ]
-  * Update copy of XTerm FAQ to revision 1.158 (dated 2010/11/10)
+  * Update copy of XTerm FAQ to revision 1.167 (dated 2010/11/25)
   * New upstream release (267)
 + add copy-selection action (request by Timo Juhani Lindfors,
   closes: #588785
diff --git a/debian/local/xterm.faq.html b/debian/local/xterm.faq.html
index 2838893..d2fa477 100644
--- a/debian/local/xterm.faq.html
+++ b/debian/local/xterm.faq.html
@@ -20,11 +20,11 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF   *
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.*
  *
-  $XTermId: xterm.faq.html,v 1.158 2010/11/10 10:28:18 tom Exp $
+  $XTermId: xterm.faq.html,v 1.167 2010/11/25 14:10:03 tom Exp $
   --
 HTML
 HEAD
-TITLEXTERM ndash; Frequently Asked Questions (FAQ)/TITLE
+TITLEXTERM - Frequently Asked Questions (FAQ)/TITLE
 LINK REV=MADE HREF=mailto:dic...@invisible-island.net;
 meta http-equiv=Content-Type content=text/html; charset=iso-8859-1
 /HEAD
@@ -42,6 +42,7 @@ is the latest version of this file.
 LIA HREF=#what_platformsWhat platforms does it run on?/A
 LIA HREF=#latest_versionWhat is the latest version?/A
 LIA HREF=#other_versionsWhat versions are available?/A
+LIA HREF=#compare_versionsComparing versions, by counting controls/A
 LIA HREF=#how_do_iHow do I .../A
 LIA HREF=#frequent_problemsFrequent problems/A
 LIA HREF=#known_bugsKnown Bugs in XTERM/A
@@ -284,30 +285,154 @@ include
 (I am aware of a few others, such as
 STRONGxcterm/STRONG, but have not seen
 a working version of these).
+
+h2A name=compare_versionsComparing versions, by counting 
controls/a/h2
+p
+Several of these programs are claimed (either by their developers,
+or their users) to emulate most of xterm.
+To me, most would be something quantifiable, e.g., 80 percent.
+To satisfy my curiousity, I

xterm: Changes to 'debian-unstable'

2010-11-22 Thread Julien Cristau 
 MANIFEST |2 
 Makefile.in  |7 
 aclocal.m4   |  178 ++-
 button.c |   50 
 charproc.c   |   30 
 configure| 2434 ++-
 configure.in |4 
 ctlseqs.ms   | 1134 +++--
 ctlseqs.txt  | 1039 ++--
 debian/changelog |7 
 misc.c   |4 
 package/debian/changelog |6 
 package/xterm.spec   |4 
 trace.h  |9 
 version.h|4 
 xterm.h  |5 
 xterm.log.html   |   39 
 xterm.man|   16 
 xtermcfg.hin |3 
 19 files changed, 3159 insertions(+), 1816 deletions(-)

New commits:
commit 31d78d266cc24120ac44f78163e010961fedb0e8
Author: Julien Cristau jcris...@debian.org
Date:   Mon Nov 22 19:16:11 2010 +0100

Bump changelog

diff --git a/debian/changelog b/debian/changelog
index 5fc33b7..7ef4bef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (266-2) UNRELEASED; urgency=low
+xterm (267-1) UNRELEASED; urgency=low
 
   [ Sven Joachim ]
   * Prefer lynx-cur over lynx in Build-Depends.
@@ -11,8 +11,11 @@ xterm (266-2) UNRELEASED; urgency=low
 
   [ Julien Cristau ]
   * Update copy of XTerm FAQ to revision 1.158 (dated 2010/11/10)
+  * New upstream release
++ add copy-selection action (request by Timo Juhani Lindfors,
+  closes: #588785
 
- -- Sven Joachim svenj...@gmx.de  Sat, 20 Nov 2010 13:14:37 +0100
+ -- Julien Cristau jcris...@debian.org  Mon, 22 Nov 2010 19:06:50 +0100
 
 xterm (266-1) unstable; urgency=low
 

commit 8c231dcdea0b7c5e697b7a724ccd63c6ff8bc21c
Author: Julien Cristau jcris...@debian.org
Date:   Mon Nov 22 19:05:14 2010 +0100

Import xterm 267

diff --git a/MANIFEST b/MANIFEST
index ad9bc8d..c5e1d32 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-266, version xterm-266
+MANIFEST for xterm-267, version xterm-267
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index ed86ce2..4d59cb1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.172 2010/10/23 18:15:25 tom Exp $
+## $XTermId: Makefile.in,v 1.173 2010/11/13 12:52:34 tom Exp $
 # -
 # this file is part of xterm
 #
@@ -339,8 +339,11 @@ mostlyclean :
 clean : mostlyclean
-$(RM) $(PROGRAMS)
 
-distclean : clean
+distclean :: clean
-$(RM) Makefile config.status config.cache config.log xtermcfg.h
+
+distclean \
+docs-clean ::
-$(RM) *.ps *.pdf *.png
-$(SHELL) -c 'for p in xterm resize uxterm koi8rxterm; \
do \
diff --git a/aclocal.m4 b/aclocal.m4
index 0a05548..e0800dc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.285 2010/06/14 21:44:02 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.293 2010/11/19 10:44:13 tom Exp $
 dnl
 dnl ---
 dnl
@@ -162,13 +162,26 @@ dnl $1 = libraries to add, with the -l, etc.
 dnl $2 = variable to update (default $LIBS)
 AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])=$1 
[$]ifelse($2,,LIBS,[$2])])dnl
 dnl ---
-dnl CF_ANSI_CC_CHECK version: 9 updated: 2001/12/30 17:53:34
+dnl CF_ADD_LIB_AFTER version: 2 updated: 2010/11/08 20:33:46
+dnl 
+dnl Add a given library after another, e.g., following the one it satisfies a
+dnl dependency for.
+dnl
+dnl $1 = the first library
+dnl $2 = its dependency
+AC_DEFUN([CF_ADD_LIB_AFTER],[
+CF_VERBOSE(...before $LIBS)
+LIBS=`echo $LIBS | sed -e s/[[  ]][[]]*/ /g -e s,$1 ,$1 $2 , -e 
's/  / /g'`
+CF_VERBOSE(...after  $LIBS)
+])dnl
+dnl ---
+dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32
 dnl 
 dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
 dnl in the sharutils 4.2 distribution.
 AC_DEFUN([CF_ANSI_CC_CHECK],
 [
-AC_CACHE_CHECK(for ${CC-cc} option to accept ANSI C, cf_cv_ansi_cc,[
+AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[
 cf_cv_ansi_cc=no
 cf_save_CFLAGS=$CFLAGS
 cf_save_CPPFLAGS=$CPPFLAGS
@@ -600,7 +613,7 @@ else
 fi
 ])dnl
 dnl ---
-dnl CF_GCC_ATTRIBUTES version: 13 updated: 2009/08/11 20:19:56
+dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32
 dnl -
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary
@@ -627,7

xterm: Changes to 'debian-unstable'

2010-11-20 Thread Sven Joachim 
 debian/README.source   |2 +-
 debian/changelog   |   12 
 debian/control |9 +++--
 debian/rules   |9 +++--
 debian/xsfbs/xsfbs.mk  |   35 ++-
 debian/xterm.README.Debian |6 +++---
 debian/xterm.dirs  |4 
 debian/xterm.docs  |2 +-
 8 files changed, 45 insertions(+), 34 deletions(-)

New commits:
commit 8d4dd176b48c4cbd3255fc704ad7bbbe9ca73cf5
Author: Sven Joachim svenj...@gmx.de
Date:   Sat Nov 20 14:48:25 2010 +0100

Let dh_compress deal with xterm.faq

The comment in debian/rules that dh_compress would not recognize the
file name extension was rather misleading, because dh_compress gzips
everything except for a few known extensions.

diff --git a/debian/changelog b/debian/changelog
index 21025dc..768992c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ xterm (266-2) UNRELEASED; urgency=low
   * Drop useless debian/xterm.dirs.
   * Stop recommending the transitional xutils package.
   * Mention ncurses-base in README.Debian (Closes: #373139).
+  * Do not manually gzip the text version of the FAQ, dh_compress can take
+care of that.
 
  -- Sven Joachim svenj...@gmx.de  Sat, 20 Nov 2010 13:14:37 +0100
 
diff --git a/debian/rules b/debian/rules
index d92b017..2879066 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,7 +72,7 @@ $(STAMP_DIR)/configure: $(STAMP_DIR)/patch
 
 .PHONY: build
 build: $(STAMP_DIR)/build
-$(STAMP_DIR)/build: $(STAMP_DIR)/configure debian/local/xterm.faq.gz
+$(STAMP_DIR)/build: $(STAMP_DIR)/configure debian/local/xterm.faq
dh_testdir
cd build  $(MAKE)
touch $@
@@ -83,7 +83,7 @@ clean: xsfclean
dh_testroot
rm -rf $(STAMP_DIR)
rm -rf build
-   dh_clean debian/local/xterm.faq.gz
+   dh_clean debian/local/xterm.faq
 
 .PHONY: install
 install: build
@@ -108,11 +108,8 @@ install: build
dh_install --sourcedir=debian/tmp --list-missing
 
 # Generate plain text XTerm FAQ from HTML.
-debian/local/xterm.faq.gz: debian/local/xterm.faq.html
+debian/local/xterm.faq: debian/local/xterm.faq.html
$(HTML2TEXT) $ debian/local/xterm.faq
-   # dh_compress doesn't recognize this file extension, so we must
-   # compress it manually.
-   gzip -9f debian/local/xterm.faq
 
 .PHONY: binary
 binary: binary-arch
diff --git a/debian/xterm.docs b/debian/xterm.docs
index a4b2c19..4e67b55 100644
--- a/debian/xterm.docs
+++ b/debian/xterm.docs
@@ -3,6 +3,6 @@ ctlseqs.ms
 ctlseqs.txt
 xterm.log.html
 debian/local/xterm.faq.html
-debian/local/xterm.faq.gz
+debian/local/xterm.faq
 debian/tmp/usr/lib/xterm.termcap
 debian/tmp/usr/lib/xterm.terminfo

commit c611342d649a26c5072155320125d104d66264f3
Author: Sven Joachim svenj...@gmx.de
Date:   Sat Nov 20 14:06:01 2010 +0100

Mention ncurses-base in README.Debian

diff --git a/debian/changelog b/debian/changelog
index d083479..21025dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xterm (266-2) UNRELEASED; urgency=low
   * Update xsfbs.
   * Drop useless debian/xterm.dirs.
   * Stop recommending the transitional xutils package.
+  * Mention ncurses-base in README.Debian (Closes: #373139).
 
  -- Sven Joachim svenj...@gmx.de  Sat, 20 Nov 2010 13:14:37 +0100
 
diff --git a/debian/xterm.README.Debian b/debian/xterm.README.Debian
index df8ea6b..d37ab86 100644
--- a/debian/xterm.README.Debian
+++ b/debian/xterm.README.Debian
@@ -17,9 +17,9 @@ numeric keypad, the one with Page Up, Page Down, etc. on a PC 
keyboard).
 DEC VT100's, the text terminal wich xterm was designed to emulate, had no
 keypad delete key.  ^[[3~ is also what the Linux console terminal type
 generates for the keypad delete key.  Note that the terminal definitions
-that a Debian system uses are in the ncurses-term package, not in the xterm
-package itself, though the (pre-compiled) terminfo and termcap files that
-Debian uses may be found in the xterm documentation directory,
+that a Debian system uses are in the ncurses-base and ncurses-term
+packages, not in the xterm package itself, though the terminfo and termcap
+files that Debian uses may be found in the xterm documentation directory,
 /usr/share/doc/xterm.  People interested in reading further to stock up
 ammo for their backspace/delete and terminal type wars should consult Tom
 Dickey's (current maintainer of the xterm source code) FAQ, available in

commit a9b17443ca7dc3869f39a6eb685798d93bafef06
Author: Sven Joachim svenj...@gmx.de
Date:   Sat Nov 20 13:43:09 2010 +0100

Drop OR'ed recommendation on xutils

It has been a transitional package since Lenny.

diff --git a/debian/changelog b/debian/changelog
index 0aa96e3..d083479 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xterm (266-2) UNRELEASED; urgency=low
   * Prefer lynx-cur over lynx in Build-Depends.
   * Update xsfbs.
   * Drop useless debian/xterm.dirs.
+  * Stop

xterm: Changes to 'debian-unstable'

2010-11-20 Thread Sven Joachim 
 debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 66ef44c30b62f902a6b94bf4d8570706709373dc
Author: Sven Joachim svenj...@gmx.de
Date:   Sat Nov 20 18:23:24 2010 +0100

Fix misleading comment in debian/control

Thanks to Julien Cristau for noticing.

diff --git a/debian/control b/debian/control
index eddd9af..2d6b79f 100644
--- a/debian/control
+++ b/debian/control
@@ -99,7 +99,7 @@ Build-Depends:
 #   detect
 #   debhelper (= 5)debian/compat = 5
 #   quilt   patch management system
-#   lynx-cur | lynx generates plain-text version of Debian X 
FAQ
+#   lynx-cur | lynx generates plain-text version of xterm faq
 
 Package: xterm
 Architecture: any


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pjraj-0004hs...@alioth.debian.org

xterm: Changes to 'debian-unstable'

2010-10-27 Thread Cyril Brulebois 
 MANIFEST |2 +-
 button.c |   39 ---
 debian/changelog |8 
 fontutils.c  |8 
 version.h|4 ++--
 xterm.log.html   |   15 ++-
 6 files changed, 49 insertions(+), 27 deletions(-)

New commits:
commit 8df1ee112d2a24b6e3daa4daaab34bfc85b07729
Author: Cyril Brulebois k...@debian.org
Date:   Fri Oct 22 21:10:04 2010 +0200

New upstream release

Fix a regression in fontname logic from patch #263, thanks to Vincent
Lefevre (Closes: #600707).

diff --git a/debian/changelog b/debian/changelog
index 0066bb8..cd67ce7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xterm (265-1) UNRELEASED; urgency=low
+
+  * New upstream release:
++ Fix a regression in fontname logic from patch #263, thanks to
+  Vincent Lefevre (Closes: #600707).
+
+ -- Cyril Brulebois k...@debian.org  Fri, 22 Oct 2010 21:07:27 +0200
+
 xterm (264-1) unstable; urgency=low
 
   * New upstream release:

commit 7c49776bdc523ca345d765ef91020b9726346e71
Author: Cyril Brulebois k...@debian.org
Date:   Fri Oct 22 21:05:11 2010 +0200

Import xterm 265

diff --git a/MANIFEST b/MANIFEST
index 5f04908..fb673de 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-264, version xterm-264
+MANIFEST for xterm-265, version xterm-265
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/button.c b/button.c
index abaa880..9693186 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.389 2010/10/13 09:37:08 tom Exp $ */
+/* $XTermId: button.c,v 1.390 2010/10/22 00:53:57 tom Exp $ */
 
 /*
  * Copyright 1999-2009,2010 by Thomas E. Dickey
@@ -180,9 +180,10 @@ EmitMousePosition(TScreen * screen, Char line[], unsigned 
count, int value)
   ? EXT_MOUSE_LIMIT
   : MOUSE_LIMIT);
 
-/* Add pointer position to key sequence
-
- * In extended mode we encode large positions as two-byte UTF-8 
+/*
+ * Add pointer position to key sequence
+ *
+ * In extended mode we encode large positions as two-byte UTF-8.
  *
  * NOTE: historically, it was possible to emit 256, which became
  * zero by truncation to 8 bits. While this was arguably a bug,
@@ -211,29 +212,30 @@ SendMousePosition(XtermWidget xw, XEvent * event)
 switch (screen-send_mouse_pos) {
 case MOUSE_OFF:
/* If send_mouse_pos mode isn't on, we shouldn't be here */
-   return False;
+   break;
 
 case BTN_EVENT_MOUSE:
 case ANY_EVENT_MOUSE:
-   /* xterm extension for motion reporting. June 1998 */
-   /* EditorButton() will distinguish between the modes */
-   switch (event-type) {
-   case MotionNotify:
-   my_event-button = 0;
-   /* FALLTHRU */
-   case ButtonPress:
-   /* FALLTHRU */
-   case ButtonRelease:
-   EditorButton(xw, my_event);
-   result = True;
-   break;
+   if (KeyModifiers(event) == 0 || KeyModifiers(event) == ControlMask) {
+   /* xterm extension for motion reporting. June 1998 */
+   /* EditorButton() will distinguish between the modes */
+   switch (event-type) {
+   case MotionNotify:
+   my_event-button = 0;
+   /* FALLTHRU */
+   case ButtonPress:
+   /* FALLTHRU */
+   case ButtonRelease:
+   EditorButton(xw, my_event);
+   result = True;
+   break;
+   }
}
break;
 
 default:
/* Make sure the event is an appropriate type */
if (IsBtnEvent(event)) {
-
switch (screen-send_mouse_pos) {
case X10_MOUSE: /* X10 compatibility sequences */
 
@@ -315,7 +317,6 @@ SendLocatorPosition(XtermWidget xw, XButtonEvent * event)
 
 /* Make sure the event is an appropriate type */
 if ((!IsBtnEvent(event) 
-
 !screen-loc_filter) ||
(BtnModifiers(event) != 0  BtnModifiers(event) != ControlMask))
return (False);
diff --git a/fontutils.c b/fontutils.c
index 34c6498..2fce86a 100644
--- a/fontutils.c
+++ b/fontutils.c
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.350 2010/10/14 09:27:25 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.351 2010/10/22 09:02:10 tom Exp $ */
 
 /
 
@@ -235,7 +235,7 @@ check_fontname(const char *name)
 {
 Boolean result = True;
 
-if (name == 0) {
+if (IsEmpty(name)) {
TRACE((fontname missing\n));
result = False;
 } else if (strlen(name) = MAX_FONTNAME - 1) {
@@ -1238,7 +1238,7 @@ typedef struct {
 } SubResourceRec;
 
 #define MERGE_SUBFONT(src,dst,name) \
-   if (dst.name == 0) { \
+   if (IsEmpty(dst.name)) { \
TRACE((MERGE_SUBFONT  #dst

xterm: Changes to 'debian-unstable'

2010-10-27 Thread Cyril Brulebois 
 MANIFEST  |   17 +++
 Makefile.in   |   43 
 THANKS|   12 ++
 charproc.c|   10 -
 debian/changelog  |7 -
 debian/watch  |2 
 fontutils.c   |   16 +--
 package/debian/changelog  |5 
 package/debian/color.sed  |4 
 package/debian/compat |1 
 package/debian/control|   21 +++
 package/debian/copyright  |  221 ++
 package/debian/rules  |  185 +++
 package/debian/source/format  |1 
 package/debian/watch  |4 
 package/debian/xterm-dev.docs |8 +
 package/debian/xterm-xres.sed |8 +
 package/xterm.spec|  175 +
 version.h |4 
 xterm.log.html|   10 +
 xtermcfg.hin  |   41 ---
 21 files changed, 738 insertions(+), 57 deletions(-)

New commits:
commit dc1e8ca6b4bd4588ef4c97b5d772d2fea433fd51
Author: Cyril Brulebois k...@debian.org
Date:   Wed Oct 27 14:23:11 2010 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index dc8ec28..01328b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-xterm (266-1) UNRELEASED; urgency=low
+xterm (266-1) unstable; urgency=low
 
   * New upstream release (Closes: #601103, yay for patience…):
 + Fix a regression in fontname logic from patch #263, thanks to
   Vincent Lefevre (Closes: #600707).
   * Fix watch file: use PASV mode.
 
- -- Cyril Brulebois k...@debian.org  Fri, 22 Oct 2010 21:07:27 +0200
+ -- Cyril Brulebois k...@debian.org  Wed, 27 Oct 2010 14:23:02 +0200
 
 xterm (264-1) unstable; urgency=low
 

commit b719206326e8e3ab9398622548975a95188b926f
Author: Cyril Brulebois k...@debian.org
Date:   Wed Oct 27 14:22:59 2010 +0200

Close #601103, request for new version.

diff --git a/debian/changelog b/debian/changelog
index b48ba4e..dc8ec28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 xterm (266-1) UNRELEASED; urgency=low
 
-  * New upstream release:
+  * New upstream release (Closes: #601103, yay for patience…):
 + Fix a regression in fontname logic from patch #263, thanks to
   Vincent Lefevre (Closes: #600707).
   * Fix watch file: use PASV mode.

commit ed44241ff968c586abce57fb7c2661f894514c23
Author: Cyril Brulebois k...@debian.org
Date:   Wed Oct 27 12:43:23 2010 +0200

Fix watch file: use PASV mode.

diff --git a/debian/changelog b/debian/changelog
index bf73d43..b48ba4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xterm (266-1) UNRELEASED; urgency=low
   * New upstream release:
 + Fix a regression in fontname logic from patch #263, thanks to
   Vincent Lefevre (Closes: #600707).
+  * Fix watch file: use PASV mode.
 
  -- Cyril Brulebois k...@debian.org  Fri, 22 Oct 2010 21:07:27 +0200
 
diff --git a/debian/watch b/debian/watch
index 08af957..79ddea9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-ftp://invisible-island.net/xterm/ xterm-(.*).tgz
+opts=pasv ftp://invisible-island.net/xterm/ xterm-(.*).tgz

commit 1b1025b284473662c552e10bb867bb2f9ad57e28
Author: Cyril Brulebois k...@debian.org
Date:   Wed Oct 27 12:42:26 2010 +0200

Bump version number, we didn't ship patch #265.

diff --git a/debian/changelog b/debian/changelog
index cd67ce7..bf73d43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (265-1) UNRELEASED; urgency=low
+xterm (266-1) UNRELEASED; urgency=low
 
   * New upstream release:
 + Fix a regression in fontname logic from patch #263, thanks to

commit 73d90d5e5a4411620f5e1710930adf8c38bf30eb
Author: Cyril Brulebois k...@debian.org
Date:   Wed Oct 27 12:40:14 2010 +0200

Import xterm 266

diff --git a/MANIFEST b/MANIFEST
index fb673de..ad9bc8d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-265, version xterm-265
+MANIFEST for xterm-266, version xterm-266
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
@@ -115,6 +115,21 @@ icons/xterm_32x32.xcf   gimp file, for editing 
32x32 icon
 icons/xterm_32x32.xpm   32x32 monochrome icon
 icons/xterm_48x48.xcf   gimp file, for editing 48x48 icon
 icons/xterm_48x48.xpm   48x48 monochrome icon
+package/debian  subdirectory
+package/debian/changelogbuild-script
+package/debian/color.sedbuild-script
+package/debian/compat   build-script
+package/debian/control  build-script
+package/debian/copyrightbuild-script
+package/debian/rulesbuild-script
+package/debian/source   subdirectory
+package/debian/source/formatbuild-script
+package/debian  subdirectory

xterm: Changes to 'debian-unstable'

2010-10-14 Thread Cyril Brulebois 
 MANIFEST |3 
 Tekproc.c|   22 ++-
 VTPrsTbl.c   |  340 +-
 VTparse.def  |5 
 VTparse.h|6 
 button.c |  370 +++
 charproc.c   |  250 +
 ctlseqs.ms   |  210 ++-
 ctlseqs.txt  |  153 +++---
 debian/changelog |   10 +
 debian/control   |2 
 fontutils.c  |   60 
 fontutils.h  |4 
 misc.c   |  363 +
 ptyx.h   |   17 +-
 screen.c |   36 +
 trace.h  |   47 ++
 util.c   |   45 +-
 version.h|4 
 vms.c|5 
 vms.h|2 
 xcharmouse.h |5 
 xterm.h  |   15 +-
 xterm.log.html   |   80 +++
 xterm.man|  370 +++
 xutf8.h  |8 -
 26 files changed, 1820 insertions(+), 612 deletions(-)

New commits:
commit 132064f408713fcea0edb9a944f2525234941a14
Author: Cyril Brulebois k...@debian.org
Date:   Thu Oct 14 23:54:13 2010 +0200

Upload to unstable.

diff --git a/debian/changelog b/debian/changelog
index aa5bb43..0066bb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (264-1) UNRELEASED; urgency=low
+xterm (264-1) unstable; urgency=low
 
   * New upstream release:
 + Fix active-icon in specific cases (Closes: #591265).
@@ -6,7 +6,7 @@ xterm (264-1) UNRELEASED; urgency=low
 + Fix segmentation fault with -fb and other options (Closes: #600129).
   * Add myself to Uploaders.
 
- -- Cyril Brulebois k...@debian.org  Thu, 14 Oct 2010 23:35:52 +0200
+ -- Cyril Brulebois k...@debian.org  Thu, 14 Oct 2010 23:53:57 +0200
 
 xterm (261-1) unstable; urgency=low
 

commit 2bad1b86e5084e6723fd87a1479aedaed70707c7
Author: Cyril Brulebois k...@debian.org
Date:   Thu Oct 14 23:43:55 2010 +0200

Add myself to Uploaders.

diff --git a/debian/changelog b/debian/changelog
index 4734495..aa5bb43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xterm (264-1) UNRELEASED; urgency=low
 + Fix active-icon in specific cases (Closes: #591265).
 + Fix pointer visibility issues (Closes: #594856).
 + Fix segmentation fault with -fb and other options (Closes: #600129).
+  * Add myself to Uploaders.
 
  -- Cyril Brulebois k...@debian.org  Thu, 14 Oct 2010 23:35:52 +0200
 
diff --git a/debian/control b/debian/control
index 42841aa..e31daf0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xterm
 Section: x11
 Priority: optional
 Maintainer: Debian X Strike Force debian-x@lists.debian.org
-Uploaders: David Nusinow dnusi...@debian.org
+Uploaders: David Nusinow dnusi...@debian.org, Cyril Brulebois 
k...@debian.org
 Standards-Version: 3.8.4
 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xterm.git
 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xterm

commit 3fcf3ddfa242049a6dd3256ee305cfa5f70d3d8c
Author: Cyril Brulebois k...@debian.org
Date:   Thu Oct 14 23:42:14 2010 +0200

Bump changelog.

diff --git a/debian/changelog b/debian/changelog
index 30dc5ad..4734495 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xterm (264-1) UNRELEASED; urgency=low
+
+  * New upstream release:
++ Fix active-icon in specific cases (Closes: #591265).
++ Fix pointer visibility issues (Closes: #594856).
++ Fix segmentation fault with -fb and other options (Closes: #600129).
+
+ -- Cyril Brulebois k...@debian.org  Thu, 14 Oct 2010 23:35:52 +0200
+
 xterm (261-1) unstable; urgency=low
 
   * New upstream release

commit 53211c86b585e9586d68fafc83be7ae98da7a569
Author: Cyril Brulebois k...@debian.org
Date:   Thu Oct 14 20:46:56 2010 +0200

Import xterm 264

diff --git a/MANIFEST b/MANIFEST
index 19c0128..5f04908 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-263, version xterm-263
+MANIFEST for xterm-264, version xterm-264
 

 MANIFESTthis file
 256colres.h resource-definitions for 256-color mode
diff --git a/Tekproc.c b/Tekproc.c
index f6d8aef..a7bcf8f 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.183 2010/10/13 22:36:12 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.184 2010/10/14 08:07:03 tom Exp $ */
 
 /*
  *
@@ -1396,9 +1396,10 @@ TekInitialize(Widget wrequest,
 
 init_Sres(tek.initial_font);
 init_Sres(tek.gin_terminator_str);
+#if OPT_TOOLBAR
 init_Ires(tek.tb_info.menu_height);
-
 wnew-tek.tb_info.menu_bar = request-tek.tb_info.menu_bar;
+#endif
 }
 
 static void
diff --git a/fontutils.c b/fontutils.c
index ae75ddd..34c6498 100644
--- a/fontutils.c
+++ b/fontutils.c
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.348 2010/10/11 08:26:24 tom Exp $ */

xterm: Changes to 'debian-unstable'

2010-06-28 Thread Julien Cristau 
 charproc.c   |   15 ++-
 debian/changelog |8 
 version.h|4 ++--
 xterm.log.html   |   10 +-
 4 files changed, 29 insertions(+), 8 deletions(-)

New commits:
commit 0638f6fc9291e950f91cda7eba1ed3824e71d979
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 28 21:53:31 2010 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index f607171..30dc5ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xterm (261-1) UNRELEASED; urgency=low
+xterm (261-1) unstable; urgency=low
 
   * New upstream release
 + fix regression in renderFont logic, from patch #260 changes
   (closes: #587428)
 
- -- Julien Cristau jcris...@debian.org  Mon, 28 Jun 2010 21:51:27 +0100
+ -- Julien Cristau jcris...@debian.org  Mon, 28 Jun 2010 21:53:28 +0100
 
 xterm (260-1) unstable; urgency=low
 

commit 83f8fcac92e5f7c3a7c6c191899d8a618002ca3c
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 28 21:53:00 2010 +0100

Bump changelog

diff --git a/debian/changelog b/debian/changelog
index d8e44ca..f607171 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xterm (261-1) UNRELEASED; urgency=low
+
+  * New upstream release
++ fix regression in renderFont logic, from patch #260 changes
+  (closes: #587428)
+
+ -- Julien Cristau jcris...@debian.org  Mon, 28 Jun 2010 21:51:27 +0100
+
 xterm (260-1) unstable; urgency=low
 
   * New upstream release

commit 400e8ed360cd27710233916db075673bb3c78a2a
Author: Julien Cristau jcris...@debian.org
Date:   Mon Jun 28 21:50:38 2010 +0100

Imported Upstream version 261

diff --git a/charproc.c b/charproc.c
index a0b2d7f..b75a093 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1070 2010/06/20 21:39:59 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1071 2010/06/28 09:03:42 tom Exp $ */
 
 /*
 
@@ -6551,10 +6551,15 @@ VTInitialize(Widget wrequest,
 wnew-misc.render_font =
(Boolean) extendedBoolean(wnew-misc.render_font_s,
  tblRenderFont, erLast);
-if (wnew-misc.render_font == erDefault  IsEmpty(wnew-misc.face_name)) {
-   wnew-misc.face_name = x_strdup(DEFFACENAME_AUTO);
-   TRACE((will allow runtime switch to render_font using \%s\\n,
-  wnew-misc.face_name));
+if (wnew-misc.render_font == erDefault) {
+   if (IsEmpty(wnew-misc.face_name)) {
+   wnew-misc.face_name = x_strdup(DEFFACENAME_AUTO);
+   TRACE((will allow runtime switch to render_font using \%s\\n,
+  wnew-misc.face_name));
+   } else {
+   wnew-misc.render_font = erTrue;
+   TRACE((initially using TrueType font\n));
+   }
 }
 /* minor tweak to make debug traces consistent: */
 if (wnew-misc.render_font) {
diff --git a/version.h b/version.h
index 296dcf0..08a4fe2 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 /*
- * $XTermId: version.h,v 1.318 2010/06/13 16:03:59 tom Exp $
+ * $XTermId: version.h,v 1.319 2010/06/28 08:49:07 tom Exp $
  * 
  * this file is part of xterm
  *
@@ -39,7 +39,7 @@
  * version of X to which this version of xterm has been built.  The number in
  * parentheses is my patch number (Thomas E. Dickey).
  */
-#define XTERM_PATCH   260
+#define XTERM_PATCH   261
 
 #ifndef __vendorversion__
 #define __vendorversion__ XTerm
diff --git a/xterm.log.html b/xterm.log.html
index deab291..2e33935 100644
--- a/xterm.log.html
+++ b/xterm.log.html
@@ -31,7 +31,7 @@
  * sale, use or other dealings in this Software without prior written*
  * authorization.*
  *
-  $XTermId: xterm.log.html,v 1.954 2010/06/21 00:40:58 tom Exp $
+  $XTermId: xterm.log.html,v 1.957 2010/06/28 09:25:58 tom Exp $
   --
 HTML
 HEAD
@@ -56,6 +56,7 @@ Most of these are summarized in the XFree86 CHANGELOG
 is the latest version of this file.
 
 UL
+LIA HREF=#xterm_261Patch #261 - 2010/6/28/A
 LIA HREF=#xterm_260Patch #260 - 2010/6/20/A
 LIA HREF=#xterm_259Patch #259 - 2010/6/5/A
 LIA HREF=#xterm_258Patch #258 - 2010/5/1/A
@@ -319,6 +320,13 @@ is the latest version of this file.
 LIA HREF=#xterm_01Patch #1 - 1996/1/6/A
 /UL
 
+H1A NAME=xterm_261Patch #261 - 2010/6/28/A/H1
+ul
+   lifix regression in coderenderFont/code logic, from
+   a href=#xterm_260patch #260/a changes
+   (report by Joseph Quinsey).
+/ul
+
 H1A NAME=xterm_260Patch #260 - 2010/6/20/A/H1
 ul
limodify codeplink.sh/code to work around problem linking to


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1otls3-0007dm...@alioth.debian.org

xterm: Changes to 'debian-unstable'

2010-06-25 Thread Julien Cristau 
 debian/changelog |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bec6b78ef7b84787fc3e278ec664f73d37ebb195
Author: Julien Cristau jcris...@debian.org
Date:   Fri Jun 25 19:59:32 2010 +0100

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 1196b20..d8e44ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (260-1) UNRELEASED; urgency=low
+xterm (260-1) unstable; urgency=low
 
   * New upstream release
 + extend renderFont resource to allow deferred switch to TrueType fonts
@@ -10,7 +10,7 @@ xterm (260-1) UNRELEASED; urgency=low
 + undo a change to limit-check in ScrnRefresh in patch #257, which broke
   fastScroll feature (closes: #584841)
 
- -- Julien Cristau jcris...@debian.org  Wed, 23 Jun 2010 15:19:03 +0100
+ -- Julien Cristau jcris...@debian.org  Fri, 25 Jun 2010 19:58:38 +0100
 
 xterm (259-1) unstable; urgency=low
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1osewy-0004oq...@alioth.debian.org

xterm: Changes to 'debian-unstable'

2010-06-23 Thread Julien Cristau 
 INSTALL   |   24 
 MANIFEST  |2 
 Tekproc.c |  192 +++--
 VTPrsTbl.c|4 
 VTparse.def   |4 
 VTparse.h |4 
 XTerm.ad  |8 
 aclocal.m4|   42 -
 charproc.c|  385 +++
 configure | 1244 --
 configure.in  |   19 
 ctlseqs.ms|   10 
 ctlseqs.txt   |4 
 debian/changelog  |   14 
 debian/patches/902_windowops.diff |2 
 doublechr.c   |4 
 fontutils.c   |   22 
 fontutils.h   |4 
 input.c   |8 
 main.c|   21 
 main.h|   10 
 menu.c|  140 ++--
 misc.c|   85 +-
 os2main.c |   17 
 plink.sh  |6 
 print.c   |4 
 ptydata.c |   17 
 ptyx.h|   24 
 screen.c  |9 
 scrollbar.c   |   14 
 trace.c   |4 
 trace.h   |4 
 util.c|4 
 uxterm.desktop|4 
 version.h |4 
 vms.c |4 
 xterm.desktop |4 
 xterm.h   |   20 
 xterm.log.html|   47 +
 xterm.man |  127 +++
 xtermcap.c|6 
 41 files changed, 1520 insertions(+), 1051 deletions(-)

New commits:
commit 43798791b4903e496e1e8960c999437d9308f061
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jun 23 15:55:43 2010 +0100

Refresh 902_windowops.diff

diff --git a/debian/patches/902_windowops.diff 
b/debian/patches/902_windowops.diff
index 52ff570..0681ce6 100644
--- a/debian/patches/902_windowops.diff
+++ b/debian/patches/902_windowops.diff
@@ -2,7 +2,7 @@ Index: xterm/xterm.man
 ===
 --- xterm.orig/xterm.man
 +++ xterm/xterm.man
-@@ -2115,8 +2115,9 @@
+@@ -2165,8 +2165,9 @@
  from \fIdtterm\fP the operation number).
  The default value is
  .RS

commit 61b946f36774bef658a11f69ae5e6a07aeb3f948
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jun 23 15:21:54 2010 +0100

Bump changelog

diff --git a/debian/changelog b/debian/changelog
index 04b950f..1196b20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+xterm (260-1) UNRELEASED; urgency=low
+
+  * New upstream release
++ extend renderFont resource to allow deferred switch to TrueType fonts
+  without affecting existing resource settings (closes: #585620)
++ change configure script default for --enable-broken-st (i.e., the
+  brokenStringTerm feature) to normally enable it.  If the corresponding
+  resource is enabled, this feature eliminates an apparent freeze of xterm
+  when sending mis-encoded data to the screen (closes: #584801)
++ undo a change to limit-check in ScrnRefresh in patch #257, which broke
+  fastScroll feature (closes: #584841)
+
+ -- Julien Cristau jcris...@debian.org  Wed, 23 Jun 2010 15:19:03 +0100
+
 xterm (259-1) unstable; urgency=low
 
   * README.Debian: drop obsolete content, including a link to the old Debian X

commit 17deb5faec7299f1fe7d849319dfe64f9a1ed05e
Author: Julien Cristau jcris...@debian.org
Date:   Wed Jun 23 15:18:55 2010 +0100

Imported Upstream version 260

diff --git a/INSTALL b/INSTALL
index d2afa33..4f1cd8c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.122 2010/04/14 10:56:29 tom Exp $
+-- $XTermId: INSTALL,v 1.123 2010/06/14 08:57:22 tom Exp $
 ---
 -- Copyright 1997-2009,2010 by Thomas E. Dickey
 --
@@ -105,6 +105,19 @@ The options (in alphabetic order):
e.g., to make boxes.  When xterm loads a font, it checks if those
characters are present, and draws its own if they are missing.
 
+  --disable-broken-st disallow broken string-terminators],
+
+   Do not compile-in code that works around a bug in some ISDN routers
+   (and possibly other applications written by the same people):  they
+   send an unterminated control string in their banner text, making xterm
+   freeze.
+
+   The workaround tells xterm to stop processing the control string when
+   it receives one of the whitespace control characters such as newline.
+   That was the behavior before patch #171.
+
+   See also --enable-broken-osc
+
   --disable-c1-print  disallow -k8 option for

xterm: Changes to 'debian-unstable'

2010-06-06 Thread Julien Cristau 
 MANIFEST  |3 
 Tekproc.c |   17 
 aclocal.m4|  296 +++-
 button.c  |   14 
 charproc.c|  100 -
 configure | 2265 ++
 configure.in  |8 
 debian/changelog  |   11 
 debian/copyright  |2 
 debian/gbp.conf   |6 
 debian/local/xterm.faq.html   |  662 ---
 debian/patches/902_windowops.diff |2 
 debian/patches/904_fontops.diff   |6 
 error.h   |3 
 fontutils.c   |   11 
 main.c|  142 +-
 menu.c|4 
 misc.c|   91 -
 os2main.c |9 
 print.c   |6 
 ptyx.h|   12 
 resize.c  |   21 
 screen.c  |   76 -
 scrollbar.c   |   25 
 trace.c   |   94 -
 trace.h   |7 
 util.c|   28 
 version.h |4 
 vttests/query-fonts.pl|  166 ++
 xterm.log.html|   44 
 xterm.man |   72 -
 xterm_io.h|   10 
 xtermcap.c|4 
 33 files changed, 2961 insertions(+), 1260 deletions(-)

New commits:
commit 52bb9b6bfb634ce0aed2d5370b57e028535621a2
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jun 6 14:39:29 2010 +0200

Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index e826c26..04b950f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xterm (259-1) UNRELEASED; urgency=low
+xterm (259-1) unstable; urgency=low
 
   * README.Debian: drop obsolete content, including a link to the old Debian X
 FAQ (closes: #581647).  Thanks, Bob Proulx!
@@ -12,7 +12,7 @@ xterm (259-1) UNRELEASED; urgency=low
   * Update copy of XTerm FAQ to revision 1.138 (dated 2010/05/15).
   * Bump copyright year in debian/copyright.
 
- -- Julien Cristau jcris...@debian.org  Sun, 06 Jun 2010 13:49:43 +0200
+ -- Julien Cristau jcris...@debian.org  Sun, 06 Jun 2010 14:39:27 +0200
 
 xterm (258-1) unstable; urgency=low
 

commit c3dd4f2d45516ba5c449552a037b04c5a95a078d
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jun 6 14:39:25 2010 +0200

Bump copyright year in debian/copyright.

diff --git a/debian/changelog b/debian/changelog
index 763d4f4..e826c26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xterm (259-1) UNRELEASED; urgency=low
   supposedly unused key has been useful for various rebindings
   (closes: #580946)
   * Update copy of XTerm FAQ to revision 1.138 (dated 2010/05/15).
+  * Bump copyright year in debian/copyright.
 
  -- Julien Cristau jcris...@debian.org  Sun, 06 Jun 2010 13:49:43 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 88e3717..48740bc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ This package was debianized by first time by David Martinez 
Moreno
 
 Upstream sources: http://invisible-island.net/xterm/xterm.html
 
-Copyright 1997-2009 by Thomas E. Dickey
+Copyright 1997-2010 by Thomas E. Dickey
 Copyright 1999-2000 by Steve Wall
 
 All Rights Reserved

commit 0503569a7e8968f6a7bdb8ec2aab93b165aa038e
Author: Julien Cristau jcris...@debian.org
Date:   Sun Jun 6 14:36:49 2010 +0200

Update copy of XTerm FAQ to revision 1.138 (dated 2010/05/15).

diff --git a/debian/changelog b/debian/changelog
index cd7323b..763d4f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xterm (259-1) UNRELEASED; urgency=low
 + change default for allowScrollLock resource to false, noting that the
   supposedly unused key has been useful for various rebindings
   (closes: #580946)
+  * Update copy of XTerm FAQ to revision 1.138 (dated 2010/05/15).
 
  -- Julien Cristau jcris...@debian.org  Sun, 06 Jun 2010 13:49:43 +0200
 
diff --git a/debian/local/xterm.faq.html b/debian/local/xterm.faq.html
index 2324466..7de3a7d 100644
--- a/debian/local/xterm.faq.html
+++ b/debian/local/xterm.faq.html
@@ -1,7 +1,7 @@
 !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.01 Transitional//EN
 !--
  *
- * Copyright 1997-2007,2009 by Thomas E. Dickey  *
+ * Copyright 1997-2009,2010 by Thomas E. Dickey  *
  * All Rights Reserved.  *
  *   *
  * Permission to use, copy, modify, and distribute this software and its *
@@ -20,19 +20,19 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS

  1   2   >