diff -u albatross-1.36/doc/Makefile albatross-1.36/doc/Makefile
--- albatross-1.36/doc/Makefile
+++ albatross-1.36/doc/Makefile
@@ -1,12 +1,14 @@
 PYTHON = python
 
-MKHOWTO = /usr/lib/python2.3/doc/tools/mkhowto
+MKHOWTO = /usr/lib/python2.7/doc/tools/mkhowto
 PYDIR=$(shell $(PYTHON) -c 'import os; print os.path.dirname(os.__file__)')
 
 DOC_ROOT = $(PYDIR)/doc
 MKHOWTO = $(DOC_ROOT)/tools/mkhowto
 ICONS = $(DOC_ROOT)/html/icons
 
+MKHOWTO = /usr/lib/python2.7/doc/tools/mkhowto
+
 .PHONY: html
 
 PAPER = a4
diff -u albatross-1.36/debian/control albatross-1.36/debian/control
--- albatross-1.36/debian/control
+++ albatross-1.36/debian/control
@@ -1,10 +1,12 @@
 Source: albatross
 Section: python
 Priority: optional
-Maintainer: Fabian Fagerholm <fabbe@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Fabian Fagerholm <fabbe@debian.org>
 Build-Depends: debhelper (>= 5.0.37.1), python-all (>= 2.6.6-3~)
 Build-Depends-Indep: docbook-to-man, texlive-base, texlive-fonts-recommended, texlive-extra-utils, texlive-latex-base, texlive-latex-extra, texlive-latex-recommended, texlive-font-utils, dia (>= 0.94.0), ghostscript, fakeroot, python-old-doctools
 Standards-Version: 3.8.0
+X-Python-Version: >=2.5
 Homepage: http://www.object-craft.com.au/projects/albatross/
 
 Package: python-albatross
@@ -13,6 +15,7 @@
 Suggests: python-albatross-common
 Conflicts: python2.3-albatross (<< 1.33-3), python2.4-albatross (<< 1.33-3)
 Replaces: python2.3-albatross (<< 1.33-3), python2.4-albatross (<< 1.33-3)
+Breaks: python-albatross-common (<< 1.36-5.4ubuntu2)
 Description: Toolkit for Stateful Web Applications
  Albatross is a small and flexible Python toolkit for developing highly
  stateful web applications. It includes, among other things:
@@ -27,6 +30,7 @@
 Package: python-albatross-common
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-albatross, adduser, lsb-base (>= 3.0-6)
+Breaks: python-albatross (<< 1.36-5.4ubuntu2)
 Description: Toolkit for Stateful Web Applications (common files)
  Albatross is a small and flexible Python toolkit for developing highly
  stateful web applications.
diff -u albatross-1.36/debian/changelog albatross-1.36/debian/changelog
--- albatross-1.36/debian/changelog
+++ albatross-1.36/debian/changelog
@@ -1,3 +1,15 @@
+albatross (1.36-5.5ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable (LP: #1189942). Remaining changes:
+    - debian/control
+      + Set X-Python-Version to >=2.5
+      + Add python-albatross-common (<< 1.36-5.4ubuntu2) to Breaks
+        of python-albatross package
+      + Add python-albatross (<< 1.36-5.4ubuntu2) to Breaks
+        of python-albatross-common package
+
+ -- Prasad Murthy <phoenix_firebrd@yahoo.com>  Mon, 03 Jun 2013 03:40:11 +0000
+
 albatross (1.36-5.5) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -5,6 +17,27 @@
 
  -- Luca Falavigna <dktrkranz@debian.org>  Sun, 26 May 2013 21:25:26 +0200
 
+albatross (1.36-5.4ubuntu3) precise; urgency=low
+
+  * Rebuild to drop python2.6 dependencies.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 31 Dec 2011 02:00:27 +0000
+
+albatross (1.36-5.4ubuntu2) oneiric; urgency=low
+
+  * Convert to dh_python2.
+  * doc/Makefile: Update path to mkhowto for oneiric's
+    python-old-doctools package.
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Sun, 14 Aug 2011 16:01:18 -0400
+
+albatross (1.36-5.4ubuntu1) natty; urgency=low
+
+  * doc/Makefile: Hard code path to mkhowto for natty's
+    python-old-doctools package.  (LP: #747225)
+
+ -- Barry Warsaw <barry@ubuntu.com>  Tue, 05 Apr 2011 18:29:14 -0400
+
 albatross (1.36-5.4) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -308,0 +342 @@
+