diff -Nru offlineimap-6.1.2/debian/changelog offlineimap-6.1.2ubuntu1/debian/changelog
--- offlineimap-6.1.2/debian/changelog	2009-07-16 10:57:46.000000000 -0500
+++ offlineimap-6.1.2ubuntu1/debian/changelog	2009-07-21 10:44:42.000000000 -0500
@@ -1,3 +1,13 @@
+offlineimap (6.1.2ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #402278), remaining changes:
+    - debian/rules: Add "--install-layout deb" to setup.py install so the
+      script gets installed to /usr/bin.
+  * debian/control: Build-Depends on ghostscript-x rather than gs, which has
+    become obsolete according to lintian.
+
+ -- Andres Rodriguez <andreserl@ubuntu.com>  Tue, 21 Jul 2009 10:44:32 -0500
+
 offlineimap (6.1.2) unstable; urgency=low
 
   * Applied patch from Peter Colberg to remove usage of hard linking.
@@ -14,6 +24,14 @@
 
  -- John Goerzen <jgoerzen@complete.org>  Thu, 16 Jul 2009 10:52:30 -0500
 
+offlineimap (6.1.1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/rules: Add "--install-layout deb" to setup.py install so the
+    script gets installed to /usr/bin.
+
+ -- Andreas Wenning <awen@awen.dk>  Tue, 07 Jul 2009 01:21:19 +0200
+
 offlineimap (6.1.1) unstable; urgency=low
 
   * Fix minimum Python version.  Closes: #535481.
@@ -59,6 +77,14 @@
 
  -- John Goerzen <jgoerzen@complete.org>  Wed, 01 Jul 2009 20:49:58 -0500
 
+offlineimap (6.0.3ubuntu1) jaunty; urgency=low
+
+  * Fix use of deprecated md5 and ssl functions.
+  * debian/rules: Add "--install-layout deb" to setup.py install so the
+    script gets installed to /usr/bin.
+
+ -- Andreas Wenning <awen@awen.dk>  Wed, 08 Apr 2009 18:17:57 +0200
+
 offlineimap (6.0.3) unstable; urgency=low
 
   * Removed call to task_done, which required Python 2.5.  Closes: #494982.
diff -Nru offlineimap-6.1.2/debian/control offlineimap-6.1.2ubuntu1/debian/control
--- offlineimap-6.1.2/debian/control	2008-05-10 21:04:20.000000000 -0500
+++ offlineimap-6.1.2ubuntu1/debian/control	2009-07-21 10:36:44.000000000 -0500
@@ -1,9 +1,10 @@
 Source: offlineimap
 Section: mail
 Priority: optional
-Maintainer: John Goerzen <jgoerzen@complete.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: John Goerzen <jgoerzen@complete.org>
 Build-Depends: debhelper (>> 6)
-Build-Depends-Indep: python-dev, groff, docbook-utils, python-support (>= 0.4.0), gtk-doc-tools, sgml2x, jade, lynx, scons, xpdf-utils, gs, man-db
+Build-Depends-Indep: python-dev, groff, docbook-utils, python-support (>= 0.4.0), gtk-doc-tools, sgml2x, jade, lynx, scons, xpdf-utils, ghostscript-x, man-db
 Build-Conflicts-Indep: docbook-ebnf
 Standards-Version: 3.7.3
 Homepage: http://software.complete.org/offlineimap
diff -Nru offlineimap-6.1.2/debian/rules offlineimap-6.1.2ubuntu1/debian/rules
--- offlineimap-6.1.2/debian/rules	2008-05-10 21:04:20.000000000 -0500
+++ offlineimap-6.1.2ubuntu1/debian/rules	2009-07-17 00:59:19.000000000 -0500
@@ -56,7 +56,7 @@
 
 	# Add here commands to install the package into debian/pygopherd.
 	#$(MAKE) install DESTDIR=$(CURDIR)/debian/pygopherd
-	$(PYTHON) setup.py install --root=`pwd`/debian/$(PACKAGE) --no-compile
+	$(PYTHON) setup.py install --root=`pwd`/debian/$(PACKAGE) --no-compile --install-layout deb
 
 
 # Build architecture-dependent files here.