[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 7021fdc7c28a4a8cd7a2ece3ef790891cadf9ee6
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Mon Jan 28 02:08:45 2013 +0100

    pyroot version specific

diff --git a/debian/patches/0006-pyroot-uses-version-specific-settings.patch b/debian/patches/0006-pyroot-uses-version-specific-settings.patch
new file mode 100644
index 0000000..742404c
--- /dev/null
+++ b/debian/patches/0006-pyroot-uses-version-specific-settings.patch
@@ -0,0 +1,56 @@
+From: Alexander Dreyer <adreyer at gmx.de>
+Date: Mon, 28 Jan 2013 02:05:53 +0100
+Subject: pyroot uses version specific settings
+
+---
+ SConstruct |   27 +++++++++++++++++++++++----
+ 1 file changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index b4ea835..037bb04 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1317,19 +1317,38 @@ if HAVE_PYTHON_EXTENSION:
+         init_py_in = """# File: %(target)s
+ # Automatically generated by PolyBoRi
+ # This file is just for developing, it should not be installed.
++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
++
+ import imp
+-imp.load_dynamic("polybori.dynamic.PyPolyBoRi", "%(source)s")
++imp.load_dynamic("polybori.dynamic.PyPolyBoRi", _location())
+ """
+-
+         init_py = file(target[0].path, "w")
+         init_py.write(init_py_in  % dict(target = target[0].path, 
+                                    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.write(init_py_in % dict(target = target[1].path, 
++                                        source = source[0].abspath))
++        init_py.close()
+     def init_message(target, *args):
+         return target[0].path + " building..."
+         
+-    dynamic_init_py = env.Command(PyRootPath('polybori/dynamic/__init__.py'), 
++    dynamic_init_py = env.Command([PyRootPath('polybori/dynamic', elt) for elt\
++                                       in ['__init__.py', 
++                                           'initpy' + \
++                                               pyconf.version.replace('.','') +\
++                                               '.py']], 
+                                   pypb, 
+                                   action = env.Action(init_build, init_message))
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 09e4a27..be7048d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Generate-doc-python-only-if-necessary.patch
 0004-Using-DESTDIR-instead-of-TMPINSTALLDIR.patch
 0005-Ensure-ipbori2.x-and-PolyGUI2.x-access-the-desired-m.patch
+0006-pyroot-uses-version-specific-settings.patch

-- 
polybori: Polynomials over Boolean Rings