[SCM] polybori: Polynomials over Boolean Rings branch, master, updated. upstream/0.8.2-162-gb82bbe7

[Alexander Dreyer]

The following commit has been merged in the master branch:
commit b82bbe7231603a4f53161c06e825eed615b9b717
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Mon Jan 28 02:46:14 2013 +0100

    Store temp config as plain file

diff --git a/debian/patches/0008-Store-temp-config-as-plain-file.patch b/debian/patches/0008-Store-temp-config-as-plain-file.patch
new file mode 100644
index 0000000..fe64088
--- /dev/null
+++ b/debian/patches/0008-Store-temp-config-as-plain-file.patch
@@ -0,0 +1,58 @@
+From: Alexander Dreyer <adreyer at gmx.de>
+Date: Mon, 28 Jan 2013 02:45:30 +0100
+Subject: Store temp config as plain file
+
+---
+ SConstruct |   20 +++++++-------------
+ 1 file changed, 7 insertions(+), 13 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index ddf369b..4fde165 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1322,9 +1322,9 @@ def _location():
+     import os
+     import sys
+     from distutils.sysconfig import get_python_version
+-    sys.path.append(os.path.dirname(os.path.realpath(__file__)))
+-    _tmp = __import__("initpy" + get_python_version().replace('.', ''))
+-    return _tmp.location
++    fname = os.path.join(os.path.dirname(os.path.realpath(__file__)),
++                         "initpy" + get_python_version().replace('.', ''))
++    return file(fname, "r").read()
+ 
+ import imp
+ imp.load_dynamic("polybori.dynamic.PyPolyBoRi", _location())
+@@ -1334,11 +1334,7 @@ imp.load_dynamic("polybori.dynamic.PyPolyBoRi", _location())
+                                    source = source[0].abspath))
+         init_py.close()
+         init_py = file(target[1].path, "w")
+-        init_py_in = """# File: %(target)s
+-# Automatically generated by PolyBoRi
+-# This file is just for developing, it should not be installed.
+-location = "%(source)s"
+-"""
++        init_py_in = """%(source)s"""
+         init_py.write(init_py_in % dict(target = target[1].path, 
+                                         source = source[0].abspath))
+         init_py.close()
+@@ -1346,15 +1342,13 @@ location = "%(source)s"
+         return target[0].path + " building..."
+         
+     dynamic_init_py = env.Command([PyRootPath('polybori/dynamic', elt) for elt\
+-                                       in ['__init__.py', 
+-                                           'initpy' + \
+-                                               pyconf.version.replace('.','') +\
+-                                               '.py']], 
++                                       in ['__init__.py', 'initpy' + \
++                                               pyconf.version.replace('.','')]],
+                                   pypb, 
+                                   action = env.Action(init_build, init_message))
+ 
+     env.Alias(BuildPath(), dynamic_init_py) # Developers also need this
+-
++    env.Clean(PyRootPath("polybori"), PyRootPath("polybori/dynamic"))
+     pypb_init_py = env.Command(BuildPyPBPath('__init__.py'), pypb, 
+                                [Touch("$TARGET")])
+     env.Depends(pypb_init_py, dynamic_init_py)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 2d6d52d..76a7caa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-Ensure-ipbori2.x-and-PolyGUI2.x-access-the-desired-m.patch
 0006-pyroot-uses-version-specific-settings.patch
 0007-ensuredir-should-obey-env.patch
+0008-Store-temp-config-as-plain-file.patch
diff --git a/debian/rules b/debian/rules
index 4282cb5..0c6e4e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,6 @@ test-unittests:
 	testsuite/unittests
 
 test-python%:
-	scons $(SCONSPARFLAGS) pyroot/ PYTHON=/usr/bin/python$*
 	python$* ipbori/ipbori -t 
 
 override_dh_auto_test: test-unittests $(PYVERS:%=test-python%)
@@ -55,6 +54,7 @@ override_dh_auto_clean:
 	scons . --keep-going --clean || true
 	dh_auto_clean
 	rm -f custom.py
+	rm -rf pyroot/polybori/dynamic/
 
 PBORIVER=0.8
 PBORIREL=3

-- 
polybori: Polynomials over Boolean Rings