[pkg-fetchmail-maint] Bug#586867: fetchmail: fix for python2.6 compatibility (site-packages vs. dist-packages)

[Steve Langasek]

Package: fetchmail
Version: 6.3.16-1
Severity: serious
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu maverick ubuntu-patch

Hi guys,

Ok, one more patch. :)

Building fetchmail from source with debuild -b (i.e., building the arch: all
packages) fails in unstable now that python points to python2.6 by default,
because python2.6 uses a different path for modules than python2.5 did
(dist-packages vs. site-packages):

 gzip -9
 /home/devel/canonical/maverick/fetchmail-6.3.17/debian/tmp/usr/share/man/man1/fetchmail.1
 mkdir -p debian/fetchmailconf/usr/lib/python2.6/site-packages/
 mv debian/tmp/usr/lib/python2.6/site-packages/fetchmailconf.py \
         debian/fetchmailconf/usr/lib/python2.6/site-packages/
 mv: cannot stat
 `debian/tmp/usr/lib/python2.6/site-packages/fetchmailconf.py': No such file or directory
 make: *** [install] Error 1
 dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2

The attached patch corrects for this while simplifying debian/rules at the
same time.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
=== modified file 'debian/fetchmailconf.install'
--- debian/fetchmailconf.install	2008-08-09 14:13:32 +0000
+++ debian/fetchmailconf.install	2010-06-22 23:22:06 +0000
@@ -1,2 +1,3 @@
 usr/bin/fetchmailconf
 usr/share/pixmaps/fetchmailconf.xpm
+usr/lib/python*.*/*-packages/fetchmailconf.py

=== modified file 'debian/rules'
--- debian/rules	2010-02-04 13:02:29 +0000
+++ debian/rules	2010-06-22 23:21:36 +0000
@@ -148,9 +148,6 @@
 	gzip -9 $(tmpdir)/usr/share/man/man1/fetchmail.1
 #	not needed we set a symlink
 #	gzip -9 $(tmpdir)/usr/share/man/man1/fetchmailconf.1
-	mkdir -p debian/fetchmailconf/usr/lib/python$(PYVER)/site-packages/
-	mv debian/tmp/usr/lib/python$(PYVER)/site-packages/fetchmailconf.py \
-	debian/fetchmailconf/usr/lib/python$(PYVER)/site-packages/
 
 # Build architecture-independent files here. [ fetchmailconf ]
 binary-indep: build-stamp install