diff -u bzr-0.9/debian/changelog bzr-0.9/debian/changelog
--- bzr-0.9/debian/changelog
+++ bzr-0.9/debian/changelog
@@ -1,3 +1,14 @@
+bzr (0.9-0ubuntu2) edgy; urgency=low
+
+  * Add debian/patches/timezone_utc_none_fix.diff:
+    - bzrlib/xml5.py: Fix handling of UTC timezone.
+    - Should also fixes FTBFS on buildds.
+    - Patch suggested by John Arbash Meinel at
+      https://lists.ubuntu.com/archives/bazaar-ng/2006q3/015690.html (not yet
+      committed upstream).
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 14 Aug 2006 10:47:54 +0200
+
 bzr (0.9-0ubuntu1) edgy; urgency=low
 
   * New upstream release (UVF exception approved by Matt Zimmerman).
diff -u bzr-0.9/debian/patches/series bzr-0.9/debian/patches/series
--- bzr-0.9/debian/patches/series
+++ bzr-0.9/debian/patches/series
@@ -1,0 +2 @@
+timezone_utc_none_fix.diff
only in patch2:
unchanged:
--- bzr-0.9.orig/debian/patches/timezone_utc_none_fix.diff
+++ bzr-0.9/debian/patches/timezone_utc_none_fix.diff
@@ -0,0 +1,13 @@
+Index: bzr-0.9/bzrlib/xml5.py
+===================================================================
+--- bzr-0.9.orig/bzrlib/xml5.py	2006-08-14 10:46:48.000000000 +0200
++++ bzr-0.9/bzrlib/xml5.py	2006-08-14 10:47:14.000000000 +0200
+@@ -83,7 +83,7 @@
+                        inventory_sha1 = rev.inventory_sha1,
+                        format='5',
+                        )
+-        if rev.timezone:
++        if rev.timezone is not None:
+             root.set('timezone', str(rev.timezone))
+         root.text = '\n'
+         msg = SubElement(root, 'message')