diffstat for xterm_278-1 xterm_278-1ubuntu2endless1 debian/patches/950_ubuntu_charclass_highlight.diff | 13 debian/patches/951_uxterm_utf8_title.diff | 11 debian/patches/endless-nodisplay-desktop-files.patch | 20 + xterm-278/debian/changelog | 269 ++++++++++++++++++- xterm-278/debian/control | 4 xterm-278/debian/gbp.conf | 6 xterm-278/debian/patches/series | 3 xterm-278/debian/xterm.install | 1 8 files changed, 320 insertions(+), 7 deletions(-) diff -u xterm-278/debian/control xterm-278/debian/control --- xterm-278/debian/control +++ xterm-278/debian/control @@ -1,7 +1,8 @@ Source: xterm Section: x11 Priority: optional -Maintainer: Debian X Strike Force +Maintainer: Ubuntu X-SWAT +XSBC-Original-Maintainer: Debian X Strike Force Uploaders: Cyril Brulebois Standards-Version: 3.9.2 Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xterm.git @@ -105,6 +106,7 @@ Package: xterm Architecture: any +Multi-Arch: foreign Depends: xbitmaps, ${shlibs:Depends}, diff -u xterm-278/debian/xterm.install xterm-278/debian/xterm.install --- xterm-278/debian/xterm.install +++ xterm-278/debian/xterm.install @@ -1,5 +1,6 @@ etc/X11/app-defaults/* usr/bin/* +usr/share/applications/* usr/share/man/man1/* usr/share/pixmaps usr/share/applications/* diff -u xterm-278/debian/gbp.conf xterm-278/debian/gbp.conf --- xterm-278/debian/gbp.conf +++ xterm-278/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-278/debian/changelog xterm-278/debian/changelog --- xterm-278/debian/changelog +++ xterm-278/debian/changelog @@ -1,3 +1,31 @@ +xterm (278-1ubuntu2endless1) eos; urgency=low + + * debian/patches/endless-nodisplay-desktop-files.patch: + Add NoDisplay=true to the desktop files. + + -- Cosimo Cecchi Wed, 07 Jan 2015 22:16:34 +0800 + +xterm (278-1ubuntu2) quantal; urgency=low + + * Mark xterm Multi-Arch: foreign (LP: #1054344) + + -- Mark Russell Thu, 27 Sep 2012 17:45:12 -0400 + +xterm (278-1ubuntu1) quantal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/950_ubuntu_charclass_highlight.diff: Enabled 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 + - Install .desktop files. + + -- Logan Rosen Tue, 10 Jul 2012 03:41:01 -0400 + xterm (278-1) unstable; urgency=low * New upstream release @@ -64,6 +92,30 @@ -- Julien Cristau Sat, 15 Oct 2011 19:38:42 +0200 +xterm (271-1ubuntu2) oneiric; urgency=low + + * Purge utempter-reversal cruft a bit harder. + * Remove obsolete xterm.dirs. + + -- Timo Aaltonen Thu, 11 Aug 2011 15:52:33 +0300 + +xterm (271-1ubuntu1) oneiric; urgency=low + + * Merge from Debian unstable (LP: #756273), remaining changes: + - debian/patches/950_ubuntu_charclass_highlight.diff: Enabled 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 + - Install .desktop files. + * control: Revert the change to Vcs headers. + * xterm.overrides: Purge old utempter-reversal cruft. + + -- Timo Aaltonen Thu, 11 Aug 2011 15:04:15 +0300 + xterm (271-1) unstable; urgency=low * New upstream release @@ -75,6 +127,37 @@ -- Julien Cristau Sat, 23 Jul 2011 13:55:37 +0200 +xterm (270-1ubuntu3) oneiric; urgency=low + + * Also update xterm.dirs and .install. + + -- Loïc Minier Wed, 13 Jul 2011 17:46:51 +0200 + +xterm (270-1ubuntu2) oneiric; urgency=low + + * Rename Vcs-* to XS-Debian-Vcs-* in control as the ubuntu branch in + xterm.git hasn't been used for a year. + * Add desktop-file-utils build-dep and add "install-desktop" target to the + "make install" run as to install a xterm.desktop file; this is useful to + get the xterm icon in Unity's list of running apps when running xterm as + it's looked up via the Icon field. + + -- Loïc Minier Wed, 13 Jul 2011 16:15:56 +0200 + +xterm (270-1ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining changes: + - debian/patches/950_ubuntu_charclass_highlight.diff: Enabled 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 + + -- Michael Vogt Fri, 17 Jun 2011 10:40:36 +0200 + xterm (270-1) unstable; urgency=low * New upstream release: @@ -93,6 +176,20 @@ -- Cyril Brulebois Sat, 05 Mar 2011 17:05:05 +0100 +xterm (268-1ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #717301), remaining changes: + - debian/patches/950_ubuntu_charclass_highlight.diff: Enabled 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 + + -- Lorenzo De Liso Sat, 12 Feb 2011 15:58:09 +0100 + xterm (268-1) unstable; urgency=low [ Sven Joachim ] @@ -116,6 +213,31 @@ -- Julien Cristau Thu, 10 Feb 2011 18:48:37 +0100 +xterm (267-0ubuntu1) natty; urgency=low + + * New upstream release (LP: #677129): + + Minor formatting changes to ctlseqs.ms to simplify a script which + extracts the feature information + + Add docs-clean makefile rule + + Add copy-selection action (request by Timo Juhani Lindfors, + Debian #588785) + + Trim leading/trailing blanks from string used for "Selection" font-menu + data + + Trim leading/trailing blanks from color resource values + + Configure script improvements: + + Add workaround for removal of X11 dependency from Xt's package file + (report by Robert Hooker) + + Add workaround for removal of fontconfig dependency from Xft's package + file (report by Jeremy Huddleston) + + Add workaround for removal of Xmu dependency from Xaw's package file + (report by Jeremy Huddleston) + + Improve workaround in CF_X_TOOLKIT macro, checking for other possible + packages where Xt's dependencies may be given + + Prefer ${name:=value} to ${name-value}, since recent bash changes + break legacy support for that feature + + -- Lorenzo De Liso Wed, 24 Nov 2010 22:54:46 +0100 + xterm (266-1) unstable; urgency=low * New upstream release (Closes: #601103, yay for patience…): @@ -135,6 +257,32 @@ -- Cyril Brulebois Thu, 14 Oct 2010 23:53:57 +0200 +xterm (261-1ubuntu3) maverick; urgency=low + + * Remove setgid bit from the xterm binary (LP: #616100) + + -- Mikhail Turov Wed, 11 Aug 2010 16:09:30 +0100 + +xterm (261-1ubuntu2) maverick; urgency=low + + * debian/control: re-add libutempter-dev to Build-Depends, + it's in main now (LP: 616100) + + -- Mikhail Turov Tue, 10 Aug 2010 23:30:03 +0100 + +xterm (261-1ubuntu1) maverick; urgency=low + + * 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) + + -- Mikhail Turov Tue, 27 Jul 2010 23:18:26 +0100 + xterm (261-1) unstable; urgency=low * New upstream release @@ -157,6 +305,19 @@ -- Julien Cristau Fri, 25 Jun 2010 19:58:38 +0100 +xterm (259-1ubuntu1) maverick; urgency=low + + * 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) + + -- Robert Hooker Thu, 10 Jun 2010 22:13:44 -0400 + xterm (259-1) unstable; urgency=low * README.Debian: drop obsolete content, including a link to the old Debian X @@ -185,6 +346,13 @@ -- Julien Cristau Sat, 08 May 2010 13:48:12 +0200 +xterm (256-1ubuntu1) lucid; urgency=low + + * Merge from Debian unstable. + * Revert the libutempter change for lucid. (LP: #539473) + + -- Timo Aaltonen Wed, 31 Mar 2010 12:32:27 +0300 + xterm (256-1) unstable; urgency=low * New upstream release. @@ -214,6 +382,22 @@ -- Julien Cristau Wed, 03 Mar 2010 14:38:17 +0100 +xterm (253-1ubuntu1) lucid; urgency=low + + * 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) + + -- Bryce Harrington Fri, 08 Jan 2010 13:41:38 -0800 + xterm (253-1) unstable; urgency=low * New upstream release @@ -330,6 +514,14 @@ -- Julien Cristau Mon, 10 Aug 2009 16:30:29 +0200 +xterm (243-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - Enabled URL highlighting + - rm -rf for .pc patches + + -- Muharem Hrnjadovic Wed, 03 Jun 2009 13:00:55 +0200 + xterm (243-1) unstable; urgency=low * New upstream release (closes: #526334) @@ -341,12 +533,28 @@ -- Julien Cristau Mon, 25 May 2009 19:58:19 +0200 +xterm (242-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #372492 + - Enabled URL hilighting + - rm -rf for .pc patches + + -- Bhavani Shankar Wed, 06 May 2009 05:13:35 +0530 + xterm (242-1) unstable; urgency=low * New upstream release. -- Julien Cristau Wed, 18 Mar 2009 15:37:18 +0100 +xterm (241-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Enabled URL hilighting + - rm -rf for .pc patches + + -- Bryce Harrington Thu, 26 Feb 2009 13:53:17 -0800 + xterm (241-1) unstable; urgency=low * New upstream release. @@ -356,6 +564,14 @@ -- Julien Cristau Sun, 01 Feb 2009 00:15:50 +0100 +xterm (239-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Enabled URL hilighting + - rm -rf for .pc patches + + -- Bryce Harrington Mon, 26 Jan 2009 17:27:49 -0800 + xterm (239-1) unstable; urgency=low * New upstream release. @@ -365,12 +581,28 @@ -- Julien Cristau Sat, 10 Jan 2009 19:22:31 +0100 +xterm (238-2ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Enabled URL hilighting + - rm -rf for .pc patches + + -- Timo Aaltonen Mon, 05 Jan 2009 15:08:33 +0200 + xterm (238-2) unstable; urgency=low * Also default allowTcapOps to false, as suggested by Florian Weimer. -- Julien Cristau Sun, 04 Jan 2009 14:57:43 +0100 +xterm (238-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - Enabled URL hilighting + - rm -rf for .pc patches + + -- Timo Aaltonen Sun, 04 Jan 2009 23:24:52 +0200 + xterm (238-1) unstable; urgency=low * New upstream release. @@ -381,6 +613,16 @@ -- Julien Cristau Sat, 03 Jan 2009 17:35:46 +0100 +xterm (237-1ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Enabled URL hilighting + - Maintainer field + - rm -rf for .pc patches + * Closes (LP: #301451) + + -- Ryan Kavanagh Sun, 23 Nov 2008 17:15:10 -0500 + xterm (237-1) unstable; urgency=low * debian/rules: don't fail in patch if the patches are already applied; also @@ -406,6 +648,18 @@ -- Julien Cristau Tue, 09 Sep 2008 01:21:27 +0100 +xterm (235-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - Enabled URL highlighting + - Changed rm -f to rm -rf .pc patches, fixes a bug when .pc is a directory + - Updated maintainer field + * Noteworthy changes since Hardy: + - Correct initialization of bold- and wide-, wide-bold fonts, which may be + set via the utf8Fonts subresource (Closes LP: #194078) + + -- Bryce Harrington Mon, 05 May 2008 14:55:59 -0700 + xterm (235-1) unstable; urgency=low * New upstream release. @@ -481,6 +735,19 @@ -- Julien Cristau Thu, 03 Jan 2008 12:07:38 +0100 +xterm (229-1ubuntu1) hardy; urgency=low + + [ Stephan Hermann ] + * debian/rules: + - changed rm -f to rm -rf .pc patches, fixes a bug when .pc is a directory + * Updated maintainer field + + [ Tormod Volden ] + * debian/patches/950_ubuntu_charclass_highlight.diff: + - enable URL highlighting (LP: #17601) + + -- Tormod Volden Wed, 06 Feb 2008 20:11:29 +0100 + xterm (229-1) unstable; urgency=low * Fix typo in uxterm(1) (LP: #128136). @@ -691,7 +958,7 @@ * 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/ diff -u xterm-278/debian/patches/series xterm-278/debian/patches/series --- xterm-278/debian/patches/series +++ xterm-278/debian/patches/series @@ -3,0 +4,3 @@ +950_ubuntu_charclass_highlight.diff +951_uxterm_utf8_title.diff +endless-nodisplay-desktop-files.patch only in patch2: unchanged: --- xterm-278.orig/debian/patches/950_ubuntu_charclass_highlight.diff +++ xterm-278/debian/patches/950_ubuntu_charclass_highlight.diff @@ -0,0 +1,13 @@ +Index: xterm-229/XTerm.ad +=================================================================== +--- xterm-229.orig/XTerm.ad 2008-02-06 19:24:14.000000000 +0100 ++++ xterm-229/XTerm.ad 2008-02-06 20:10:01.000000000 +0100 +@@ -187,7 +187,7 @@ + *SimpleMenu*borderWidth: 2 + + ! 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:]]))+ only in patch2: unchanged: --- xterm-278.orig/debian/patches/951_uxterm_utf8_title.diff +++ xterm-278/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? only in patch2: unchanged: --- xterm-278.orig/debian/patches/endless-nodisplay-desktop-files.patch +++ xterm-278/debian/patches/endless-nodisplay-desktop-files.patch @@ -0,0 +1,20 @@ +--- a/xterm.desktop ++++ b/xterm.desktop +@@ -36,6 +36,7 @@ + Exec=xterm + Terminal=false + Type=Application ++NoDisplay=true + Encoding=UTF-8 + Icon=xterm-color_48x48 + Categories=System;TerminalEmulator; +--- a/uxterm.desktop ++++ b/uxterm.desktop +@@ -36,6 +36,7 @@ + Exec=uxterm + Terminal=false + Type=Application ++NoDisplay=true + Encoding=UTF-8 + Icon=xterm-color_48x48 + Categories=System;TerminalEmulator;