* 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.