diff -u postr-0.12.3/debian/changelog postr-0.12.3/debian/changelog
--- postr-0.12.3/debian/changelog
+++ postr-0.12.3/debian/changelog
@@ -1,3 +1,12 @@
+postr (0.12.3-1ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable (LP: #309878), Ubuntu remaining changes:
+    - Continue to remove python-elementtree from Depends,
+      it's in python 2.5.
+    - Depends on python-nautilus.
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Sat, 20 Dec 2008 01:50:45 +0100
+
 postr (0.12.3-1) unstable; urgency=low
 
   * New upstream release
@@ -5,6 +14,17 @@
 
  -- Ross Burton <ross@debian.org>  Fri, 19 Dec 2008 14:55:23 +0000
 
+postr (0.12.2-1ubuntu1) intrepid; urgency=low
+
+  * Merge with Debian unstable (LP: #240191), remaining changes:
+    - debian/control:
+      + removed python-elementtree from Depends as it is in
+         python 2.5
+      + added python-nautilus to Depends
+      + Modified Maintainer field as per spec
+
+ -- Nicolai Spohrer <nicolai@xeve.de>  Thu, 26 Jun 2008 17:27:41 +0200
+
 postr (0.12.2-1) unstable; urgency=low
 
   * New upstream release.
@@ -47,6 +67,17 @@
 
  -- Ross Burton <ross@debian.org>  Fri, 04 Jan 2008 11:01:14 +0000
 
+postr (0.9-1ubuntu1) hardy; urgency=low
+
+  * setup.py:
+    update harcoded nautilus extension path to extensions-2.0 (LP: #219121)
+  * debian/control:
+    - removed python-elementtree from depends (included in python 2.5)
+    - add python-nautilus to depends
+    - modify Maintainer value to match the DebianMaintainerField specification.
+
+ -- Cesare Tirabassi <norsetto@ubuntu.com>  Fri, 18 Apr 2008 13:54:33 +0200
+
 postr (0.9-1) unstable; urgency=low
 
   * New upstream release
@@ -106,0 +138 @@
+
diff -u postr-0.12.3/debian/control postr-0.12.3/debian/control
--- postr-0.12.3/debian/control
+++ postr-0.12.3/debian/control
@@ -1,14 +1,15 @@
 Source: postr
 Section: graphics
 Priority: optional
-Maintainer: Ross Burton <ross@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ross Burton <ross@debian.org>
 Build-Depends: debhelper (>= 5.0.0), cdbs, python
 Build-Depends-Indep: python-support (>= 0.5.3)
 Standards-Version: 3.7.3
 
 Package: postr
 Architecture: all
-Depends: ${python:Depends}, python-gtk2, python-glade2, python-gnome2, python-twisted-web, python-elementtree, epiphany-browser | www-browser
+Depends: ${python:Depends}, python-gtk2, python-glade2, python-gnome2, python-twisted-web, python-nautilus, epiphany-browser | www-browser
 XB-Python-Version: ${python:Versions}
 Description: upload photos to Flickr
  Postr is a tool to upload photographs to Flickr, with tight integration into