Merge branch '620nmu'

Conflicts:
	debian/changelog

debian/changelog

@@ -4,6 +4,25 @@ offlineimap (6.2.0.1) unstable; urgency=low
 
  -- John Goerzen <jgoerzen@complete.org>  Tue, 08 Jun 2010 10:21:58 -0500
 
+offlineimap (6.2.0+nmu2) unstable; urgency=low
+
+  * Non-maintainer upload, for the upcoming Python 2.6 transition
+  * debian/rules
+    - add '--prefix=/usr' to 'setup.py install' since Python 2 .6 installs by
+      default in /usr/local; thanks to Jakub Wilk for the report and to Luca
+      Falavigna for the patch; Closes: #557912
+
+ -- Sandro Tosi <morph@debian.org>  Sat, 12 Dec 2009 09:44:03 +0100
+
+offlineimap (6.2.0+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload needed to fix xpdf's RC bugs:
+  * Use pdftops from poppler-utils rather than xpdf-utils
+    (Closes: #549392)
+  * Also use ghostscript instead of the transitional gs package
+
+ -- Moritz Muehlenhoff <jmm@debian.org>  Tue, 17 Nov 2009 22:02:45 +0100
+
 offlineimap (6.2.0) unstable; urgency=low
 
   * FIX: Removed imaplib2 entirely.  It was the cause of numerous

debian/control

@@ -3,7 +3,7 @@ Section: mail
 Priority: optional
 Maintainer: Debian QA Group <packages@qa.debian.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, poppler-utils, ghostscript, man-db
 Build-Conflicts-Indep: docbook-ebnf
 Standards-Version: 3.7.3
 Homepage: http://software.complete.org/offlineimap

debian/rules

@@ -56,7 +56,7 @@ install: build
 
 	# 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 --prefix=/usr
 
 
 # Build architecture-dependent files here.