[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 416ebe9f3d7a3b7fffbbc59defca8593821d89f9
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Mon Jan 28 01:03:06 2013 +0100

    Ensure ipbori2.x and PolyGUI2.x access the desired modules

diff --git a/debian/patches/0005-Ensure-ipbori2.x-and-PolyGUI2.x-access-the-desired-m.patch b/debian/patches/0005-Ensure-ipbori2.x-and-PolyGUI2.x-access-the-desired-m.patch
new file mode 100644
index 0000000..31554b9
--- /dev/null
+++ b/debian/patches/0005-Ensure-ipbori2.x-and-PolyGUI2.x-access-the-desired-m.patch
@@ -0,0 +1,65 @@
+From: Alexander Dreyer <adreyer at gmx.de>
+Date: Mon, 28 Jan 2013 01:02:38 +0100
+Subject: Ensure ipbori2.x and PolyGUI2.x access the desired modules
+
+---
+ SConstruct |   26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 3300739..b4ea835 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -1883,17 +1883,17 @@ if 'install' in COMMAND_LINE_TARGETS or 'install-docs' in COMMAND_LINE_TARGETS:
+                                      '$PYINSTALLPREFIX')
+     
+     for instfile in [ IPBPath('ipbori')]:
+-        FinalizeExecs(env.SubstInstallAs(InstPath(instfile), instfile))
++        FinalizeExecs(env.SubstInstallAs(InstPath(instfile + pyconf.version), instfile))
+ 
+     for instfile in [ GUIPath('PolyGUI') ]:
+-        FinalizeExecs(env.SubstInstallAs(InstPath(instfile), instfile))
++        FinalizeExecs(env.SubstInstallAs(InstPath(instfile + pyconf.version), instfile))
+ 
+     for instfile in [GUIPath('cnf2ideal.py')]:
+         pyfiles += env.InstallAs(InstPath(instfile), instfile)
+         
+     for instfile in [ GUIPath('polybori.png') ]:
+         env.InstallAs(InstPath(instfile), instfile)
+-    
++
+     # Copy c++ documentation
+     if HAVE_DOXYGEN:
+         cxxdocinst = env.CopyAll(env.Dir(InstDocPath('c++')),
+@@ -1972,20 +1972,20 @@ if 'install' in COMMAND_LINE_TARGETS or 'install-docs' in COMMAND_LINE_TARGETS:
+                                           '$PYINSTALLPREFIX')       
+ 
+     # Symlink from executable into bin directory
+-    ipboribin = env.SymLink(InstExecPath('ipbori'),
+-                            InstPath(IPBPath('ipbori'))) + \
++    ipboribin = env.SymLink(InstExecPath('ipbori' + pyconf.version),
++                            InstPath(IPBPath('ipbori' + pyconf.version))) + \
+     env.SymLink(InstExecPath('ipbori' + pyconf.major),
+-                InstExecPath('ipbori')) + \
+-    env.SymLink(InstExecPath('ipbori' + pyconf.version),
+-                InstExecPath('ipbori'))
++                InstExecPath('ipbori' + pyconf.version)) + \
++    env.SymLink(InstExecPath('ipbori'),
++                InstExecPath('ipbori' + pyconf.version))
+ 
+ 
+-    guibin = env.SymLink(InstExecPath('PolyGUI'),
+-                         InstPath(GUIPath('PolyGUI'))) + \
++    guibin = env.SymLink(InstExecPath('PolyGUI' + pyconf.version),
++                         InstPath(GUIPath('PolyGUI' + pyconf.version))) + \
+     env.SymLink(InstExecPath('PolyGUI' + pyconf.major),
+-                InstExecPath('PolyGUI')) + \
+-    env.SymLink(InstExecPath('PolyGUI' + pyconf.version),
+-                InstExecPath('PolyGUI'))
++                InstExecPath('PolyGUI' + pyconf.version)) + \
++    env.SymLink(InstExecPath('PolyGUI'),
++                InstExecPath('PolyGUI' + pyconf.version))
+     
+     env.AlwaysBuild(ipboribin)   
+     env.Alias('install', ipboribin)
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 4dfb665..09e4a27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Correctly-detecting-libm4ri-s-png-support.patch
 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

-- 
polybori: Polynomials over Boolean Rings