[Python-modules-commits] r10462 - in packages/epsilon/trunk/debian (5 files)

[jwilk-guest at users.alioth.debian.org]

    Date: Sunday, November 15, 2009 @ 14:40:38
  Author: jwilk-guest
Revision: 10462

Apply patch from Fabrice Coutadeur to make package ready for Python 2.6
transition (closes: #546847).

Added:
  packages/epsilon/trunk/debian/patches/python-2.6.diff
Modified:
  packages/epsilon/trunk/debian/changelog
  packages/epsilon/trunk/debian/patches/series
  packages/epsilon/trunk/debian/rules
  packages/epsilon/trunk/debian/runtrial.py

Modified: packages/epsilon/trunk/debian/changelog
===================================================================
--- packages/epsilon/trunk/debian/changelog	2009-11-14 19:54:59 UTC (rev 10461)
+++ packages/epsilon/trunk/debian/changelog	2009-11-15 14:40:38 UTC (rev 10462)
@@ -1,3 +1,11 @@
+epsilon (0.5.12-2) UNRELEASED; urgency=low
+
+  [ Jakub Wilk ]
+  * Apply patch from Fabrice Coutadeur to make package ready for Python 2.6
+    transition (closes: #546847).
+
+ -- Jakub Wilk <ubanus at users.sf.net>  Sun, 15 Nov 2009 14:57:07 +0100
+
 epsilon (0.5.12-1) unstable; urgency=low
 
   * New upstream release.

Added: packages/epsilon/trunk/debian/patches/python-2.6.diff
===================================================================
--- packages/epsilon/trunk/debian/patches/python-2.6.diff	                        (rev 0)
+++ packages/epsilon/trunk/debian/patches/python-2.6.diff	2009-11-15 14:40:38 UTC (rev 10462)
@@ -0,0 +1,15 @@
+# patch the search routine to avoid detecting temporary build directory
+Index: epsilon-0.5.12/epsilon/setuphelper.py
+===================================================================
+--- epsilon-0.5.12.orig/epsilon/setuphelper.py  2009-09-16 04:39:38.000000000 +0000
++++ epsilon-0.5.12/epsilon/setuphelper.py       2009-09-16 04:39:44.000000000 +0000
+@@ -43,7 +43,8 @@
+         pkgName = dirpath[2:].replace('/', '.')
+         if '__init__.py' in filenames:
+             # The current directory is a Python package
+-            packages.append(pkgName)
++            if 'build' not in dirpath:
++                packages.append(pkgName)
+         elif 'plugins' in dirnames:
+             # The current directory is for the Twisted plugin system
+             pluginPackages.append(pkgName)

Modified: packages/epsilon/trunk/debian/patches/series
===================================================================
--- packages/epsilon/trunk/debian/patches/series	2009-11-14 19:54:59 UTC (rev 10461)
+++ packages/epsilon/trunk/debian/patches/series	2009-11-15 14:40:38 UTC (rev 10462)
@@ -1,2 +1,3 @@
 use-proc-mounts.diff
 fix-test_cmp.diff
+python-2.6.diff

Modified: packages/epsilon/trunk/debian/rules
===================================================================
--- packages/epsilon/trunk/debian/rules	2009-11-14 19:54:59 UTC (rev 10461)
+++ packages/epsilon/trunk/debian/rules	2009-11-15 14:40:38 UTC (rev 10462)
@@ -8,10 +8,12 @@
 DEB_INSTALL_MANPAGES_python-epsilon := debian/epsilon-benchmark.1
 
 install/python-epsilon::
-	rm $(PKGDIR)/usr/lib/python*/site-packages/epsilon/release.py
-	rm $(PKGDIR)/usr/lib/python*/site-packages/epsilon/test/test_release.py
-	rm -r $(PKGDIR)/usr/lib/python*/site-packages/build
+	rm $(PKGDIR)/usr/lib/python*/*-packages/epsilon/release.py
+	rm $(PKGDIR)/usr/lib/python*/*-packages/epsilon/test/test_release.py
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	$(call cdbs_python_binary,python$(cdbs_python_compile_version)) debian/runtrial.py $(PKGDIR) epsilon
 endif
 	mv $(PKGDIR)/usr/bin/benchmark $(PKGDIR)/usr/bin/epsilon-benchmark
+
+clean::
+	rm -rf _trial_temp

Modified: packages/epsilon/trunk/debian/runtrial.py
===================================================================
--- packages/epsilon/trunk/debian/runtrial.py	2009-11-14 19:54:59 UTC (rev 10461)
+++ packages/epsilon/trunk/debian/runtrial.py	2009-11-15 14:40:38 UTC (rev 10462)
@@ -9,6 +9,7 @@
 _path = sys.path[:]
 sys.path[:] = []
 addsitedir(join(root, site_packages[1:]))
+addsitedir(join(root, 'usr/lib/python2.6/site-packages')) #for whatever reason cdbs still installs python modules in site-packages
 sys.path.extend(_path)
 
 from twisted.scripts.trial import run