diff -pruN 403-1/debian/changelog 403-1ubuntu1/debian/changelog
--- 403-1/debian/changelog	2025-11-02 16:21:57.000000000 +0000
+++ 403-1ubuntu1/debian/changelog	2025-11-03 12:52:03.000000000 +0000
@@ -1,3 +1,17 @@
+xterm (403-1ubuntu1) resolute; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 03 Nov 2025 13:52:03 +0100
+
 xterm (403-1) unstable; urgency=medium
 
   * New upstream release.
@@ -12,6 +26,20 @@ xterm (403-1) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Sun, 02 Nov 2025 17:21:57 +0100
 
+xterm (402-1ubuntu1) questing; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 23 Sep 2025 18:38:26 +0200
+
 xterm (402-1) unstable; urgency=medium
 
   * New upstream release.
@@ -38,6 +66,20 @@ xterm (399-1) experimental; urgency=low
 
  -- Sven Joachim <svenjoac@gmx.de>  Thu, 05 Jun 2025 18:01:25 +0200
 
+xterm (398-1ubuntu1) questing; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 01 May 2025 09:18:18 +0200
+
 xterm (398-1) unstable; urgency=medium
 
   * New upstream release.
@@ -49,6 +91,20 @@ xterm (398-1) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Tue, 15 Apr 2025 19:43:44 +0200
 
+xterm (397-1ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 11 Feb 2025 11:00:27 +0100
+
 xterm (397-1) unstable; urgency=medium
 
   * New upstream release.
@@ -57,18 +113,60 @@ xterm (397-1) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Mon, 10 Feb 2025 17:49:15 +0100
 
+xterm (396-1ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 09 Dec 2024 17:40:31 +0100
+
 xterm (396-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Sven Joachim <svenjoac@gmx.de>  Thu, 05 Dec 2024 18:25:45 +0100
 
+xterm (395-1ubuntu1) plucky; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 30 Oct 2024 17:50:23 +0100
+
 xterm (395-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Sven Joachim <svenjoac@gmx.de>  Mon, 28 Oct 2024 18:56:33 +0100
 
+xterm (394-1ubuntu1) oracular; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 16 Sep 2024 13:59:21 +0200
+
 xterm (394-1) unstable; urgency=medium
 
   [ Sven Joachim ]
@@ -81,18 +179,60 @@ xterm (394-1) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Thu, 12 Sep 2024 18:47:28 +0200
 
+xterm (393-1ubuntu1) oracular; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 15 Jul 2024 16:13:14 +0200
+
 xterm (393-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Sven Joachim <svenjoac@gmx.de>  Sun, 14 Jul 2024 17:42:19 +0200
 
+xterm (392-1ubuntu1) oracular; urgency=medium
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 30 May 2024 09:15:25 +0200
+
 xterm (392-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Sven Joachim <svenjoac@gmx.de>  Mon, 27 May 2024 18:03:18 +0200
 
+xterm (391-1ubuntu1) oracular; urgency=medium
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 27 May 2024 08:23:03 +0200
+
 xterm (391-1) unstable; urgency=medium
 
   * New upstream release.
@@ -100,12 +240,52 @@ xterm (391-1) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Mon, 20 May 2024 17:23:44 +0200
 
+xterm (390-1ubuntu3) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 31 Mar 2024 17:32:54 +0000
+
+xterm (390-1ubuntu2) noble; urgency=medium
+
+  * No-change rebuild against libxt6t64
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 09 Mar 2024 01:04:20 +0000
+
+xterm (390-1ubuntu1) noble; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 22 Feb 2024 08:55:52 +0100
+
 xterm (390-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Sven Joachim <svenjoac@gmx.de>  Wed, 21 Feb 2024 18:26:20 +0100
 
+xterm (389-1ubuntu1) noble; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 04 Jan 2024 08:37:05 +0100
+
 xterm (389-1) unstable; urgency=medium
 
   * New upstream release.
@@ -113,6 +293,20 @@ xterm (389-1) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Wed, 03 Jan 2024 17:06:48 +0100
 
+xterm (388-1ubuntu1) noble; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 26 Oct 2023 08:50:24 +0200
+
 xterm (388-1) unstable; urgency=medium
 
   * New upstream release.
@@ -144,6 +338,20 @@ xterm (385-1) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Sat, 07 Oct 2023 17:20:35 +0200
 
+xterm (384-1ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 13 Jul 2023 09:45:15 +0200
+
 xterm (384-1) unstable; urgency=medium
 
   * New upstream release.
@@ -152,6 +360,20 @@ xterm (384-1) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Wed, 12 Jul 2023 18:00:23 +0200
 
+xterm (383-1ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 01 Jul 2023 01:12:08 +0200
+
 xterm (383-1) unstable; urgency=medium
 
   * New upstream release.
@@ -159,6 +381,20 @@ xterm (383-1) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Fri, 30 Jun 2023 17:10:01 +0200
 
+xterm (382-2ubuntu1) mantic; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 20 Jun 2023 22:45:34 +0200
+
 xterm (382-2) unstable; urgency=medium
 
   * Drop alternate build-dependency on bsdmainutils.
@@ -195,12 +431,40 @@ xterm (380-1) experimental; urgency=low
 
  -- Sven Joachim <svenjoac@gmx.de>  Thu, 11 May 2023 18:26:42 +0200
 
+xterm (379-1ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 19 Feb 2023 08:48:39 +0100
+
 xterm (379-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Sven Joachim <svenjoac@gmx.de>  Fri, 17 Feb 2023 18:01:17 +0100
 
+xterm (378-1ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 12 Jan 2023 14:46:34 +0100
+
 xterm (378-1) unstable; urgency=medium
 
   * New upstream release.
@@ -213,6 +477,20 @@ xterm (378-1) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Tue, 10 Jan 2023 19:43:51 +0100
 
+xterm (377-1ubuntu1) lunar; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 03 Dec 2022 09:38:40 +0100
+
 xterm (377-1) unstable; urgency=medium
 
   [ Sven Joachim ]
@@ -265,12 +543,40 @@ xterm (373-1) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Sun, 02 Oct 2022 17:59:19 +0200
 
+xterm (372-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 11 Mar 2022 23:13:33 +0100
+
 xterm (372-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Sven Joachim <svenjoac@gmx.de>  Fri, 11 Mar 2022 18:10:00 +0100
 
+xterm (371-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 04 Mar 2022 13:34:28 +0100
+
 xterm (371-1) unstable; urgency=medium
 
   * New upstream release.
@@ -282,6 +588,20 @@ xterm (371-1) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Thu, 03 Mar 2022 18:27:23 +0100
 
+xterm (370-2ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 02 Feb 2022 10:21:32 +0100
+
 xterm (370-2) unstable; urgency=medium
 
   * Cherry-pick sixel graphics fixes from xterm 370d and 370f.
@@ -291,6 +611,20 @@ xterm (370-2) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Tue, 01 Feb 2022 20:56:55 +0100
 
+xterm (370-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 20 Nov 2021 09:35:55 +0100
+
 xterm (370-1) unstable; urgency=medium
 
   * New upstream release.
@@ -298,6 +632,20 @@ xterm (370-1) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Wed, 17 Nov 2021 19:10:10 +0100
 
+xterm (369-1ubuntu1) jammy; urgency=low
+
+  * Merge from Debian unstable. 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"
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 03 Nov 2021 09:20:04 +0100
+
 xterm (369-1) unstable; urgency=medium
 
   * New upstream release.
@@ -326,6 +674,27 @@ xterm (367-1) experimental; urgency=medi
 
  -- Sven Joachim <svenjoac@gmx.de>  Sun, 28 Mar 2021 17:58:08 +0200
 
+xterm (366-1ubuntu1) impish; urgency=medium
+
+  * Merge with Debian unstable. 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"
+  * Dropped changes:
+    - debian/patches/CVE-2021-27135.patch: correct upper-limit for
+      selection buffer, accounting for combining characters in button.c.
+      [Included in 366-1]
+    - debian/patches/CVE-2021-27135-2.patch: check realloc return code,
+      add some casts in button.c.
+      [Included in 366-1]
+
+ -- Utkarsh Gupta <utkarsh@debian.org>  Tue, 25 May 2021 11:04:02 +0530
+
 xterm (366-1) unstable; urgency=medium
 
   * New upstream release
@@ -360,6 +729,38 @@ xterm (362-1) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Sun, 15 Nov 2020 16:34:36 +0100
 
+xterm (361-1ubuntu3) hirsute; urgency=medium
+
+  * SECURITY UPDATE: crash when handling crafted unicode content
+    - debian/patches/CVE-2021-27135-2.patch: check realloc return code,
+      add some casts in button.c.
+    - CVE-2021-27135
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Mon, 22 Feb 2021 12:59:13 -0500
+
+xterm (361-1ubuntu2) hirsute; urgency=medium
+
+  * SECURITY UPDATE: crash when handling crafted unicode content
+    - debian/patches/CVE-2021-27135.patch: correct upper-limit for
+      selection buffer, accounting for combining characters in button.c.
+    - CVE-2021-27135
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Thu, 11 Feb 2021 09:11:30 -0500
+
+xterm (361-1ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable.  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"
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Wed, 11 Nov 2020 17:59:49 +0100
+
 xterm (361-1) unstable; urgency=medium
 
   * New upstream release.
@@ -445,6 +846,20 @@ xterm (354-1) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Wed, 29 Apr 2020 18:03:39 +0200
 
+xterm (353-1ubuntu1) focal; 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"
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 26 Feb 2020 11:49:57 +0200
+
 xterm (353-1) unstable; urgency=medium
 
   * New upstream release.
@@ -495,6 +910,20 @@ xterm (349-1) unstable; urgency=medium
 
  -- Sven Joachim <svenjoac@gmx.de>  Mon, 30 Sep 2019 18:25:13 +0200
 
+xterm (348-2ubuntu1) eoan; 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"
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Wed, 18 Sep 2019 15:11:35 +0300
+
 xterm (348-2) unstable; urgency=medium
 
   * Update patch 900_debian_xterm.diff:
diff -pruN 403-1/debian/patches/950_ubuntu_charclass_highlight.diff 403-1ubuntu1/debian/patches/950_ubuntu_charclass_highlight.diff
--- 403-1/debian/patches/950_ubuntu_charclass_highlight.diff	1970-01-01 00:00:00.000000000 +0000
+++ 403-1ubuntu1/debian/patches/950_ubuntu_charclass_highlight.diff	2022-02-02 09:21:26.000000000 +0000
@@ -0,0 +1,13 @@
+Index: b/XTerm.ad
+===================================================================
+--- a/XTerm.ad
++++ b/XTerm.ad
+@@ -248,7 +248,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 -pruN 403-1/debian/patches/951_uxterm_utf8_title.diff 403-1ubuntu1/debian/patches/951_uxterm_utf8_title.diff
--- 403-1/debian/patches/951_uxterm_utf8_title.diff	1970-01-01 00:00:00.000000000 +0000
+++ 403-1ubuntu1/debian/patches/951_uxterm_utf8_title.diff	2021-05-25 05:30:46.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 -pruN 403-1/debian/patches/series 403-1ubuntu1/debian/patches/series
--- 403-1/debian/patches/series	2025-11-01 15:17:29.000000000 +0000
+++ 403-1ubuntu1/debian/patches/series	2025-11-02 21:38:23.000000000 +0000
@@ -1,3 +1,5 @@
+950_ubuntu_charclass_highlight.diff
+951_uxterm_utf8_title.diff
 900_debian_xterm.diff
 902_windowops.diff
 904_fontops.diff
