diffstat for xterm-330 xterm-330 changelog | 20 ++++++++++++++++++++ control | 7 ++++--- gbp.conf | 2 +- patches/950_ubuntu_charclass_highlight.diff | 13 +++++++++++++ patches/951_uxterm_utf8_title.diff | 11 +++++++++++ patches/series | 2 ++ 6 files changed, 51 insertions(+), 4 deletions(-) diff -Nru xterm-330/debian/changelog xterm-330/debian/changelog --- xterm-330/debian/changelog 2017-06-23 16:27:27.000000000 +0000 +++ xterm-330/debian/changelog 2017-12-14 18:37:39.000000000 +0000 @@ -1,3 +1,23 @@ +xterm (330-1ubuntu2) bionic; urgency=medium + + * debian/control: stop depending on the transitional lynx-cur package. + + -- Łukasz 'sil2100' Zemczak Thu, 14 Dec 2017 19:37:39 +0100 + +xterm (330-1ubuntu1) bionic; urgency=medium + + * Sync with Debian; remaining changes: + - Add 950_ubuntu_charclass_highlight.diff: + + Enable URL highlighting. + - Add 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. + - Modify debian/gbp.conf: Set "debian-branch" to "Ubuntu" + + -- Jeremy Bicha Sat, 28 Oct 2017 15:40:25 -0400 + xterm (330-1) unstable; urgency=medium * New upstream release. diff -Nru xterm-330/debian/control xterm-330/debian/control --- xterm-330/debian/control 2017-06-22 17:54:13.000000000 +0000 +++ xterm-330/debian/control 2017-12-14 18:37:26.000000000 +0000 @@ -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: 4.0.0 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/app/xterm.git @@ -18,7 +19,7 @@ debhelper (>= 10), autotools-dev, autoconf-dickey (>= 2.52+20170501), - lynx | lynx-cur, + lynx, xorg-docs-core, desktop-file-utils, @@ -108,7 +109,7 @@ # 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 +# lynx generates plain-text version of xterm faq # desktop-file-utils for installing xterm.desktop Package: xterm diff -Nru xterm-330/debian/gbp.conf xterm-330/debian/gbp.conf --- xterm-330/debian/gbp.conf 2017-06-22 17:22:04.000000000 +0000 +++ xterm-330/debian/gbp.conf 2017-10-28 19:40:25.000000000 +0000 @@ -1,6 +1,6 @@ [DEFAULT] pristine-tar = True -debian-branch = debian-unstable +debian-branch = ubuntu upstream-branch = upstream-unstable debian-tag = xterm-%(version)s upstream-tag = xterm-%(version)s diff -Nru xterm-330/debian/patches/950_ubuntu_charclass_highlight.diff xterm-330/debian/patches/950_ubuntu_charclass_highlight.diff --- xterm-330/debian/patches/950_ubuntu_charclass_highlight.diff 1970-01-01 00:00:00.000000000 +0000 +++ xterm-330/debian/patches/950_ubuntu_charclass_highlight.diff 2017-10-28 19:40:25.000000000 +0000 @@ -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:]]))+ diff -Nru xterm-330/debian/patches/951_uxterm_utf8_title.diff xterm-330/debian/patches/951_uxterm_utf8_title.diff --- xterm-330/debian/patches/951_uxterm_utf8_title.diff 1970-01-01 00:00:00.000000000 +0000 +++ xterm-330/debian/patches/951_uxterm_utf8_title.diff 2017-10-28 19:40:25.000000000 +0000 @@ -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? diff -Nru xterm-330/debian/patches/series xterm-330/debian/patches/series --- xterm-330/debian/patches/series 2017-06-22 17:22:04.000000000 +0000 +++ xterm-330/debian/patches/series 2017-10-28 19:40:25.000000000 +0000 @@ -1,3 +1,5 @@ 900_debian_xterm.diff 902_windowops.diff 904_fontops.diff +950_ubuntu_charclass_highlight.diff +951_uxterm_utf8_title.diff