lp://staging/~groldster/ubuntu/maverick/xterm/xterm-merge-610628

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntu/maverick/xterm at revision 29

Daniel Holbach: Approve on 2010-08-03

Diff: 7999 lines (+1561/-1058)

41 files modified

INSTALL (+14/-10)
MANIFEST (+1/-1)
Tekproc.c (+105/-91)
VTPrsTbl.c (+2/-2)
VTparse.def (+2/-2)
VTparse.h (+2/-2)
XTerm.ad (+7/-1)
aclocal.m4 (+29/-13)
charproc.c (+241/-149)
configure (+673/-581)
configure.in (+11/-8)
ctlseqs.ms (+5/-5)
ctlseqs.txt (+2/-2)
debian/changelog (+35/-0)
debian/patches/902_windowops.diff (+1/-1)
doublechr.c (+2/-2)
fontutils.c (+11/-11)
fontutils.h (+2/-2)
input.c (+4/-4)
main.c (+11/-10)
main.h (+9/-1)
menu.c (+84/-56)
misc.c (+49/-36)
os2main.c (+9/-8)
plink.sh (+5/-1)
print.c (+2/-2)
ptydata.c (+9/-8)
ptyx.h (+22/-2)
screen.c (+5/-4)
scrollbar.c (+7/-7)
trace.c (+2/-2)
trace.h (+2/-2)
util.c (+2/-2)
uxterm.desktop (+2/-2)
version.h (+2/-2)
vms.c (+2/-2)
xterm.desktop (+2/-2)
xterm.h (+10/-10)
xterm.log.html (+54/-1)
xterm.man (+119/-8)
xtermcap.c (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #320388: accentuated characters wrongly displayed (encoding problem) in title bar	High	Fix Released
Bug #408496: set XTerm*utf8Title to true	Undecided	Fix Released
Bug #539473: drop libutempter build dependency	High	Fix Released
Bug #610628: Please merge 261-1 (main) from Debian unstable (main)	Undecided	Fix Released

Link a bug report

Related blueprints

28. By Mikhail Turov on 2010-07-27

* Merge from debian unstable (LP: #610628). Remaining Ubuntu changes:
  - Revert the libutempter change because it's in universe. (LP: #539473)
  - Enabled URL highlighting
  - Add 100_uxterm_utf8_title.patch: Set utf8Titles to true by default
    when using uxterm, so that it displays utf8 directories in titles
    properly. May cause issues with apps that use control sequences for
    updating the xterm titlebar - users should use xterm or set utf8Title
    to false in this case. (LP: #320388, #408496)
* New upstream release
  + fix regression in renderFont logic, from patch #260 changes
    (closes: #587428)
* 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)

27. By Robert Hooker on 2010-06-10

* Merge from debian unstable. Remaining Ubuntu changes:
  - Revert the libutempter change because it's in universe. (LP: #539473)
  - Enabled URL highlighting
  - Add 100_uxterm_utf8_title.patch: Set utf8Titles to true by default
    when using uxterm, so that it displays utf8 directories in titles
    properly. May cause issues with apps that use control sequences for
    updating the xterm titlebar - users should use xterm or set utf8Title
    to false in this case. (LP: #320388, #408496)

26. By Timo Aaltonen on 2010-03-31

* Merge from Debian unstable.
* Revert the libutempter change for lucid. (LP: #539473)

25. By Bryce Harrington on 2010-01-08

* Merge from Debian Unstable. (LP: #501150)
  + document in xterm manpage the limited availability of resources color16
    to color255 as noted in patch #188 (LP: #438850)
  Remaining Ubuntu changes:
  - Enabled URL highlighting
* Add 100_uxterm_utf8_title.patch: Set utf8Titles to true by default
  when using uxterm, so that it displays utf8 directories in titles
  properly. May cause issues with apps that use control sequences for
  updating the xterm titlebar - users should use xterm or set utf8Title
  to false in this case.
  (LP: #320388, #408496)

24. By Muharem Hrnjadovic on 2009-06-03

* Merge from debian unstable, remaining changes:
  - Enabled URL highlighting
  - rm -rf for .pc patches

23. By Bhavani Shankar on 2009-05-06

* Merge from debian unstable, remaining changes: LP: #372492
  - Enabled URL hilighting
  - rm -rf for .pc patches

22. By Bryce Harrington on 2009-02-26

* Merge from debian unstable, remaining changes:
  - Enabled URL hilighting
  - rm -rf for .pc patches

21. By Bryce Harrington on 2009-01-26

* Merge from debian unstable, remaining changes:
  - Enabled URL hilighting
  - rm -rf for .pc patches

20. By Timo Aaltonen on 2009-01-05

* Merge from debian unstable, remaining changes:
  - Enabled URL hilighting
  - rm -rf for .pc patches

19. By James Westby on 2009-01-04

Import packaging changes for version 238-1ubuntu1