[med-svn] r3810 - trunk/packages/python-biopython/trunk/debian

[Philipp Benner]

Author: philipp
Date: 2009-08-24 09:30:29 +0000 (Mon, 24 Aug 2009)
New Revision: 3810

Modified:
   trunk/packages/python-biopython/trunk/debian/changelog
   trunk/packages/python-biopython/trunk/debian/python-biopython-sql.files
   trunk/packages/python-biopython/trunk/debian/python-biopython.files
   trunk/packages/python-biopython/trunk/debian/rules
Log:
merged patch from ubuntu

Modified: trunk/packages/python-biopython/trunk/debian/changelog
===================================================================
--- trunk/packages/python-biopython/trunk/debian/changelog	2009-08-24 08:30:47 UTC (rev 3809)
+++ trunk/packages/python-biopython/trunk/debian/changelog	2009-08-24 09:30:29 UTC (rev 3810)
@@ -1,3 +1,10 @@
+python-biopython (1.51final-2) unstable; urgency=low
+
+  * Merged patch from ubuntu to make the package ready for
+    python2.6 (Closes: #543236).
+
+ -- Philipp Benner <philipp at debian.org>  Mon, 24 Aug 2009 09:29:27 +0000
+
 python-biopython (1.51final-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/python-biopython/trunk/debian/python-biopython-sql.files
===================================================================
--- trunk/packages/python-biopython/trunk/debian/python-biopython-sql.files	2009-08-24 08:30:47 UTC (rev 3809)
+++ trunk/packages/python-biopython/trunk/debian/python-biopython-sql.files	2009-08-24 09:30:29 UTC (rev 3810)
@@ -1 +1 @@
-usr/lib/python*/site-packages/BioSQL
+usr/lib/python*/*-packages/BioSQL

Modified: trunk/packages/python-biopython/trunk/debian/python-biopython.files
===================================================================
--- trunk/packages/python-biopython/trunk/debian/python-biopython.files	2009-08-24 08:30:47 UTC (rev 3809)
+++ trunk/packages/python-biopython/trunk/debian/python-biopython.files	2009-08-24 09:30:29 UTC (rev 3810)
@@ -1 +1 @@
-usr/lib/python*/site-packages/Bio
+usr/lib/python*/*-packages/Bio

Modified: trunk/packages/python-biopython/trunk/debian/rules
===================================================================
--- trunk/packages/python-biopython/trunk/debian/rules	2009-08-24 08:30:47 UTC (rev 3809)
+++ trunk/packages/python-biopython/trunk/debian/rules	2009-08-24 09:30:29 UTC (rev 3810)
@@ -18,13 +18,13 @@
 	dh_testdir
 	dh_testroot
 
-	yes | python$* setup.py install --root $(CURDIR)/debian/python$*-tmp
+	yes | python$* setup.py install --root $(CURDIR)/debian/python$*-tmp --install-layout=deb
 
 # <bugfix>
-	chmod 644 debian/python$*-tmp/usr/lib/python$*/site-packages/Bio/EUtils/DTDs/*dtd
-	chmod 644 debian/python$*-tmp/usr/lib/python$*/site-packages/Bio/Entrez/DTDs/*dtd
+	chmod 644 debian/python$*-tmp/usr/lib/python$*/*-packages/Bio/EUtils/DTDs/*dtd
+	chmod 644 debian/python$*-tmp/usr/lib/python$*/*-packages/Bio/Entrez/DTDs/*dtd
 
-	for i in `find ./debian/python$*-tmp/usr/lib/python$*/site-packages -name "*.py"`; do	\
+	for i in `find ./debian/python$*-tmp/usr/lib/python$*/*-packages -name "*.py"`; do	\
 		sed -ir "s/^#\!\/usr\/bin\/env python\(2\.[234]\)\?$$//" $$i;			\
 		sed -ir "s/^#\![ ]*\/usr\/bin\/python[ ]*\(-OO\)\?\(-i\)\?$$//" $$i;		\
 		$(RM) $$i\r;									\