debian/changelog |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 12e82368d8f47dbd03589afcd6767249c120fa62
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date:   Thu Aug 4 17:27:01 2011 +0300

    Add a note about the debian merge to the changelog.

diff --git a/debian/changelog b/debian/changelog
index 9f47d2f..c9d0cad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,15 @@
 xterm (271-1ubuntu1) UNRELEASED; 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.
 


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qoytd-0004vk...@vasks.debian.org

Reply via email to