diff -u xterm-229/debian/changelog xterm-229/debian/changelog
--- xterm-229/debian/changelog
+++ xterm-229/debian/changelog
@@ -1,3 +1,14 @@
+xterm (229-1ubuntu1) hardy; urgency=low
+
+  * debian/patches/950_ubuntu_charclass_highlight.diff: (LP: #17601)
+    - Re-added old fix for
+      https://bugs.edge.launchpad.net/ubuntu/+source/xterm/+bug/17601
+  * debian/rules: 
+    - changed rm -f to rm -rf .pc patches, fixes a bug when .pc is a directory
+  * Updated maintainer field
+
+ -- Stephan Hermann <sh@sourcecode.de>  Sat, 19 Jan 2008 10:31:30 +0100
+
 xterm (229-1) unstable; urgency=low
 
   * Fix typo in uxterm(1) (LP: #128136).
diff -u xterm-229/debian/control xterm-229/debian/control
--- xterm-229/debian/control
+++ xterm-229/debian/control
@@ -1,7 +1,8 @@
 Source: xterm
 Section: x11
 Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Martínez Moreno <ender@debian.org>, David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
 Standards-Version: 3.7.2
 Build-Depends: libncurses5-dev | libncurses-dev, libxft-dev (>> 2.1.2), libxrender-dev (>> 1:0.9.0), libxaw7-dev, debhelper (>= 4.1.16), quilt, lynx
diff -u xterm-229/debian/patches/series xterm-229/debian/patches/series
--- xterm-229/debian/patches/series
+++ xterm-229/debian/patches/series
@@ -2,0 +3 @@
+950_ubuntu_charclass_highlight.diff
diff -u xterm-229/debian/rules xterm-229/debian/rules
--- xterm-229/debian/rules
+++ xterm-229/debian/rules
@@ -121,7 +121,7 @@
 clean: unpatch
 	dh_testdir
 	dh_testroot
-	rm -f .pc patches
+	rm -rf .pc patches
 	rm -rf $(STAMP_DIR)
 	rm -rf obj-$(DEB_BUILD_GNU_TYPE)
 	dh_clean debian/local/xterm.faq.gz
only in patch2:
unchanged:
--- xterm-229.orig/debian/patches/950_ubuntu_charclass_highlight.diff
+++ xterm-229/debian/patches/950_ubuntu_charclass_highlight.diff
@@ -0,0 +1,14 @@
+Index: xterm-229/XTerm.ad
+===================================================================
+--- xterm-229.orig/XTerm.ad	2008-01-19 10:30:14.950022261 +0100
++++ xterm-229/XTerm.ad	2008-01-19 10:30:56.581019973 +0100
+@@ -186,6 +186,9 @@
+ ! vt100 widget:
+ *SimpleMenu*borderWidth: 2
+ 
++! Charclass map for highlighting email addresses and IPs
++*charClass: 33:48,37:48,43:48,45-47:48,64:48,126:48,95:48
++
+ ! 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
+ !