diff -u straw-0.27/debian/control straw-0.27/debian/control
--- straw-0.27/debian/control
+++ straw-0.27/debian/control
@@ -1,7 +1,8 @@
 Source: straw
 Section: gnome
 Priority: optional
-Maintainer: Hanna Wallach <hmw26@cam.ac.uk>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Hanna Wallach <hmw26@cam.ac.uk>
 Uploaders: Moray Allan <moray@debian.org>
 Build-Depends: debhelper (>= 5.0.38), cdbs, intltool, libgtk2.0-dev, python-gtk2, python-gtk2-dev, gconf2, python-dev (>= 2.3.5-11)
 Build-Depends-Indep: python-central (>= 0.5.6)
@@ -10,7 +11,7 @@

 Package: straw
 Architecture: all
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-egenix-mxdatetime, python-gtk2 (>= 2.8.6-3), python-glade2 (>= 2.8.6-3), python-gnome2 (>= 2.12.4-2), python-gnome2-extras, python-feedparser
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-egenix-mxdatetime, python-gtk2 (>= 2.8.6-3), python-glade2 (>= 2.8.6-3), python-gnome2 (>= 2.12.4-2), python-gnome2-extras, python-feedparser, python-gtkhtml2
 Recommends: python-adns
 XB-Python-Version: ${python:Versions}
 Description: desktop news aggregator for GNOME
diff -u straw-0.27/debian/changelog straw-0.27/debian/changelog
--- straw-0.27/debian/changelog
+++ straw-0.27/debian/changelog
@@ -1,3 +1,11 @@
+straw (0.27-0.1ubuntu1) hardy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Add python-gtkhtml2 to Depends in control file.
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec.
+
+ -- Marco Rodrigues <gothicx@sapo.pt>  Sat, 24 Nov 2007 12:36:00 +0000
+
 straw (0.27-0.1) unstable; urgency=low

   * Non-maintainer upload.
@@ -36,6 +44,25 @@

  -- Kumar Appaiah <akumar@ee.iitm.ac.in>  Wed, 31 Oct 2007 16:40:03 +0530

+straw (0.26.dsfg.1-2.1ubuntu2) gutsy; urgency=low
+
+  [ Patrick A. Treptau ]
+  * Fixed dependency: python-gtkhtml2 (Closes: #322)
+
+  [ Daniel Holbach ]
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+  * fixed upload target.
+
+ -- Patrick A. Treptau <ptreptau@ioxo.net>  Thu, 30 Aug 2007 22:10:41 +0600
+
+straw (0.26.dsfg.1-2.1ubuntu1) feisty; urgency=low
+
+  * Merged with Debian.  Retained changes:
+    - Python Policy conversion
+
+ -- Emmet Hikory <emmet.hikory@gmail.com>  Thu, 11 Jan 2007 12:05:31 +0900
+
 straw (0.26.dsfg.1-2.1) unstable; urgency=medium

   * Non-maintainer upload.
@@ -58,6 +85,12 @@

  -- Moray Allan <moray@debian.org>  Sat, 28 Oct 2006 17:10:56 +0100

+straw (0.26-3ubuntu1) edgy; urgency=low
+
+  * Convert to updated python policy.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 17 Oct 2006 17:01:59 +0200
+
 straw (0.26-3) unstable; urgency=low

   * debian/rules: Fix python2.4-gtk2, python2.4-glade2 and