diff -u feedparser-4.1/debian/changelog feedparser-4.1/debian/changelog
--- feedparser-4.1/debian/changelog
+++ feedparser-4.1/debian/changelog
@@ -1,3 +1,21 @@
+feedparser (4.1-11ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Add utf8_decoding.patch to stop errors to stop errors decoding feeds with
+      invalid characters.
+
+ -- David Futcher <bobbo@ubuntu.com>  Wed, 24 Sep 2008 22:49:00 +0100
+
+feedparser (4.1-11) unstable; urgency=low
+
+  [ Carlos Galisteo ]
+  * debian/control
+    - Homepage field added.
+  * Standards-Version updated (3.8.0)
+  * Added override_title.patch (Closes: #490613)
+
+ -- Carlos Galisteo <cgalisteo@k-rolus.net>  Mon, 07 Jul 2008 15:29:58 +0000
+
 feedparser (4.1-10ubuntu1) intrepid; urgency=low
 
   * Add utf8_decoding.patch to stop errors to stop errors decoding feeds with
diff -u feedparser-4.1/debian/control feedparser-4.1/debian/control
--- feedparser-4.1/debian/control
+++ feedparser-4.1/debian/control
@@ -7,7 +7,8 @@
 Build-Depends: debhelper (>= 5.0.37.2), python-dev (>= 2.3.5-11), python-support (>= 0.3), quilt (>= 0.39-2)
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/feedparser/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/feedparser/trunk/?op=log
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
+Homepage: http://www.feedparser.org
 
 Package: python-feedparser
 Architecture: all
diff -u feedparser-4.1/debian/patches/series feedparser-4.1/debian/patches/series
--- feedparser-4.1/debian/patches/series
+++ feedparser-4.1/debian/patches/series
@@ -1,3 +1,4 @@
+title_override.patch
 democracynow_feedparser_fix.patch
 auth_handlers_not_working.patch
 doc_css_path.diff
only in patch2:
unchanged:
--- feedparser-4.1.orig/debian/patches/title_override.patch
+++ feedparser-4.1/debian/patches/title_override.patch
@@ -0,0 +1,33 @@
+--- trunk.orig/feedparser.py
++++ trunk/feedparser.py
+@@ -1186,8 +1186,13 @@
+ 
+     def _start_title(self, attrsD):
+         self.pushContent('title', attrsD, 'text/plain', self.infeed or self.inentry or self.insource)
+-    _start_dc_title = _start_title
+-    _start_media_title = _start_title
++
++    def _start_title_low_pri(self, attrsD):
++        if not self._getContext().has_key('title'):
++            self._start_title(attrsD)
++
++    _start_dc_title = _start_title_low_pri
++    _start_media_title = _start_title_low_pri
+ 
+     def _end_title(self):
+         value = self.popContent('title')
+@@ -1196,8 +1201,12 @@
+             context['textinput']['title'] = value
+         elif self.inimage:
+             context['image']['title'] = value
+-    _end_dc_title = _end_title
+-    _end_media_title = _end_title
++
++    def _end_title_low_pri(self):
++        if not self._getContext().has_key('title'):
++            self._end_title()
++    _end_dc_title = _end_title_low_pri
++    _end_media_title = _end_title_low_pri
+ 
+     def _start_description(self, attrsD):
+         context = self._getContext()