[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 1437b7410f4f330e3ece946ce59bdc5fdd221120
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Mon Jan 28 02:32:28 2013 +0100

    ensuredir should obey env

diff --git a/debian/patches/0007-ensuredir-should-obey-env.patch b/debian/patches/0007-ensuredir-should-obey-env.patch
new file mode 100644
index 0000000..3559a2a
--- /dev/null
+++ b/debian/patches/0007-ensuredir-should-obey-env.patch
@@ -0,0 +1,68 @@
+From: Alexander Dreyer <adreyer at gmx.de>
+Date: Mon, 28 Jan 2013 02:31:51 +0100
+Subject: ensuredir should obey env
+
+---
+ SConstruct |   13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 037bb04..ddf369b 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -33,7 +33,8 @@ m4ri=[path.join("M4RI/m4ri", m) for m in m4ri]
+ 
+ m4ri_inc = 'M4RI'
+ 
+-def ensure_dir(target):
++def ensure_dir(target, env):
++    target = env.subst(target)
+     if not path.exists(target):
+         try:
+             os.makedirs(target)
+@@ -778,7 +779,7 @@ if not env.GetOption('clean'):
+ 
+                     import tarfile
+                     tar = tarfile.open(tmpfile)
+-                    if not path.exists(tmpdir): ensure_dir(tmpdir)
++                    if not path.exists(tmpdir): ensure_dir(tmpdir, env)
+                     tar.extractall(tmpdir)
+                     tar.close()
+                     env.Execute(Move(path.join(tmpdir, path.basename(url)), tmpfile))
+@@ -1530,7 +1531,7 @@ def cp_all(target, source, env):
+     source = source[0].path
+     target = target[0].path
+ 
+-    ensure_dir(target)
++    ensure_dir(target, env)
+ 
+     for patt in env['COPYALL_PATTERNS']:
+         for filename in glob(path.join(source, patt)):
+@@ -1553,7 +1554,7 @@ def cp_pydoc(target, source, env):
+     import re
+     patt = re.compile('(file:|)/[^\" ]*' + pyroot, re.VERBOSE)
+ 
+-    ensure_dir(target)
++    ensure_dir(target, env)
+ 
+     showpath = env.relpath(env.Dir(target).abspath,
+                            env.Dir(env['PYINSTALLPREFIX']).abspath)
+@@ -1792,7 +1793,7 @@ if rpm_generation:
+                            pbspec + rpmsrcs)
+ 
+     def provide_builddir(target, source, env):
+-        ensure_dir(RPMPath('BUILD'))
++        ensure_dir(RPMPath('BUILD'), env)
+     
+     env.AddPreAction(pbrpm, provide_builddir)
+     env.AlwaysBuild(pbrpm)
+@@ -1963,7 +1964,7 @@ if 'install' in COMMAND_LINE_TARGETS or 'install-docs' in COMMAND_LINE_TARGETS:
+         env.Depends(instdocu, cxxdocinst)
+         env.Depends(cxxdocinst, tutorialinst)
+ 
+-    ensure_dir(InstDocPath())
++    ensure_dir(InstDocPath(), env)
+     
+     # Non-executables to be installed
+     pyfile_srcs = glob(PyRootPath('polybori/*.py'))
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index be7048d..2d6d52d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 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
+0007-ensuredir-should-obey-env.patch

-- 
polybori: Polynomials over Boolean Rings