diffstat of debian/ for xterm_322-1 xterm_322-1ubuntu1 debian/patches/950_ubuntu_charclass_highlight.diff | 13 +++++++ debian/patches/951_uxterm_utf8_title.diff | 11 ++++++ xterm-322/debian/changelog | 37 +++++++++++++++++++++ xterm-322/debian/control | 3 + xterm-322/debian/gbp.conf | 6 --- xterm-322/debian/patches/series | 2 + 6 files changed, 66 insertions(+), 6 deletions(-) diff -u xterm-322/debian/changelog xterm-322/debian/changelog --- xterm-322/debian/changelog +++ xterm-322/debian/changelog @@ -1,3 +1,18 @@ +xterm (322-1ubuntu1) xenial; urgency=medium + + * Merge with Debian; remaining changes: + - debian/patches/950_ubuntu_charclass_highlight.diff: + - Enable URL highlighting. + - debian/patches/Add 951_uxterm_utf8_title.diff: + - 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. + - debian/gbp.conf: + - Use "Ubuntu" in "debian-branch" directly. + + -- Matthias Klose Wed, 17 Feb 2016 19:11:21 +0100 + xterm (322-1) unstable; urgency=medium * New upstream release. @@ -33,6 +48,28 @@ -- Sven Joachim Sat, 22 Aug 2015 09:10:05 +0200 +xterm (318-2ubuntu2) xenial; urgency=medium + + * No-change rebuild for ncurses6 transition. + + -- Matthias Klose Sun, 07 Feb 2016 15:53:26 +0000 + +xterm (318-2ubuntu1) wily; urgency=medium + + * Merge with Debian, remaining Ubuntu changes: + * debian/patches/ + * debian/patches/950_ubuntu_charclass_highlight.diff: + - Enable URL highlighting. + * debian/patches/Add 951_uxterm_utf8_title.diff: + - 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. + * debian/gbp.conf: + - Use "Ubuntu" in "debian-branch" directly. + + -- Robert Ancell Tue, 14 Jul 2015 10:21:01 +1200 + xterm (318-2) unstable; urgency=low * Upload to unstable. diff -u xterm-322/debian/control xterm-322/debian/control --- xterm-322/debian/control +++ xterm-322/debian/control @@ -1,7 +1,8 @@ Source: xterm Section: x11 Priority: optional -Maintainer: Debian X Strike Force +Maintainer: Ubuntu Developers +XSBC-Original-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 diff -u xterm-322/debian/gbp.conf xterm-322/debian/gbp.conf --- xterm-322/debian/gbp.conf +++ xterm-322/debian/gbp.conf @@ -2,5 +2 @@ -pristine-tar = True -debian-branch = debian-unstable -upstream-branch = upstream-unstable -debian-tag = xterm-%(version)s -upstream-tag = xterm-%(version)s +debian-branch = ubuntu diff -u xterm-322/debian/patches/series xterm-322/debian/patches/series --- xterm-322/debian/patches/series +++ xterm-322/debian/patches/series @@ -3,0 +4,2 @@ +950_ubuntu_charclass_highlight.diff +951_uxterm_utf8_title.diff --- xterm-322.orig/debian/patches/950_ubuntu_charclass_highlight.diff +++ xterm-322/debian/patches/950_ubuntu_charclass_highlight.diff @@ -0,0 +1,13 @@ +Index: b/XTerm.ad +=================================================================== +--- a/XTerm.ad ++++ b/XTerm.ad +@@ -237,7 +237,7 @@ + !*faceSize: 8 + + ! Here is a pattern that is useful for double-clicking on a URL: +-!*charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,95:48,126:48 ++*charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,95:48,126:48 + ! + ! Alternatively, + !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+ --- xterm-322.orig/debian/patches/951_uxterm_utf8_title.diff +++ xterm-322/debian/patches/951_uxterm_utf8_title.diff @@ -0,0 +1,11 @@ +diff -Nurp xterm-253/UXTerm.ad xterm-253-working/UXTerm.ad +--- xterm-253/UXTerm.ad 2006-02-12 17:14:58.000000000 -0800 ++++ xterm-253-working/UXTerm.ad 2010-01-08 13:26:23.000000000 -0800 +@@ -39,6 +39,7 @@ + + *fontMenu.Label: Unicode Fonts + *VT100.utf8: 1 ++*utf8Title: true + + ! This includes "XTerm-color" which includes "XTerm", which defines fonts. + ! Why set them here?