[SCM] polybori: Polynomials over Boolean Rings branch, master, updated. upstream/0.8.2-174-g5b14c47
Alexander Dreyer
adreyer at gmx.de
Mon Jan 28 22:00:52 UTC 2013
The following commit has been merged in the master branch:
commit 878e9e5899b85e266b93d6acc5cbf9e0ca756816
Author: Alexander Dreyer <adreyer at gmx.de>
Date: Mon Jan 28 22:48:26 2013 +0100
Updating sources to rc2 of PolyBoRi 0.8.3
diff --git a/debian/changelog b/debian/changelog
index b2d2516..7e5f551 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-polybori (0.8.3~rc1-1~exp1) experimental; urgency=low
+polybori (0.8.3~rc2-1~exp1) experimental; urgency=low
* Updating to recent Debian standards
- supported by Frédéric-Emmanuel Picca <picca at debian.org>
diff --git a/debian/patches/0001-Add-target-only-if-they-can-be-build.patch b/debian/patches/0001-Add-target-only-if-they-can-be-build.patch
deleted file mode 100644
index 4bc6012..0000000
--- a/debian/patches/0001-Add-target-only-if-they-can-be-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Alexander Dreyer <adreyer at gmx.de>
-Date: Wed, 23 Jan 2013 02:07:47 +0100
-Subject: Add target only if they can be build
-
----
- SConstruct | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index e4d788b..86db408 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -40,7 +40,7 @@ def ensure_dir(target):
- except:
- # Maybe just a race condition occured, because two processes trixy
- # to generate the directory at the same time. (This I could ignore.)
-- if not path.exists(target) and os.isdir(target):
-+ if not path.exists(target):
- raise RuntimeError, "Could not mkdir " + target
-
-
-@@ -1721,7 +1721,12 @@ if have_l2h or have_t4h or HAVE_DOXYGEN:
- env.Dir(DocPath(srcs)) for srcs in documastersubdirs ])
-
- # build-independent doc targets
-- env.Alias('prepare-docs', docmstr + [DocPath('c++'), DocPath('tutorial')])
-+ if have_l2h or have_t4h:
-+ env.Alias('prepare-docs', DocPath('tutorial'))
-+ if HAVE_DOXYGEN:
-+ env.Alias('prepare-docs', DocPath('c++'))
-+
-+ env.Alias('prepare-docs', docmstr)
- env.Alias('docs', 'prepare-docs')
-
- # Clean, even, if L2H/TexToHt are not available anymore
-@@ -2069,8 +2074,6 @@ Type=Application
- env.Alias('prepare-static', stlibs)
- env.Alias('prepare-install', dylibs + readabledevellibs)
-
--if have_l2h or have_t4h or HAVE_DOXYGEN or have_pydoc:
-- env.Alias('prepare-install', [DocPath()])
-
- if HAVE_PYTHON_EXTENSION:
- env.Alias('prepare-install', [BuildPyPBPath(), pyroot])
---
diff --git a/debian/patches/0002-Correctly-detecting-libm4ri-s-png-support.patch b/debian/patches/0002-Correctly-detecting-libm4ri-s-png-support.patch
deleted file mode 100644
index c7bcede..0000000
--- a/debian/patches/0002-Correctly-detecting-libm4ri-s-png-support.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Alexander Dreyer <adreyer at gmx.de>
-Date: Thu, 24 Jan 2013 22:01:54 +0100
-Subject: Correctly detecting libm4ri's png support
-
----
- SConstruct | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index 86db408..40534db 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -936,7 +936,11 @@ if not env.GetOption('clean'):
- libm4ri = ['m4ri']
- if conf.CheckFunc('testing_m4ri_PNGs', """
- #include <m4ri/io.h>
-- #define testing_m4ri_PNGs() mzd_to_png(NULL,"",0,"",0)"""):
-+ #if defined(__M4RI_HAVE_LIBPNG) && __M4RI_HAVE_LIBPNG
-+ #define testing_m4ri_PNGs()
-+ #else
-+ #define testing_m4ri_PNGs() fail fail fail
-+ #endif """):
- m4ri_png = True
-
- else:
---
diff --git a/debian/patches/0003-Generate-doc-python-only-if-necessary.patch b/debian/patches/0003-Generate-doc-python-only-if-necessary.patch
deleted file mode 100644
index 7fe6d4a..0000000
--- a/debian/patches/0003-Generate-doc-python-only-if-necessary.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Alexander Dreyer <adreyer at gmx.de>
-Date: Sat, 26 Jan 2013 01:06:13 +0100
-Subject: Generate doc/python* only if necessary
-
----
- SConstruct | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 40534db..87af090 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1903,11 +1903,12 @@ if 'install' in COMMAND_LINE_TARGETS or 'install-docs' in COMMAND_LINE_TARGETS:
- htmlpatterns = Split("*.html *.css *.png *gif *.jpg")
-
- # Copy python documentation
-- pydocuinst = env.CopyPyDoc(env.Dir(InstDocPath(docpybase)),
-- env.Dir(DocPyPath()))
-+ if have_pydoc and HAVE_PYTHON_EXTENSION:
-+ pydocuinst = env.CopyPyDoc(env.Dir(InstDocPath(docpybase)),
-+ env.Dir(DocPyPath()))
-
-- env.Depends(pydocuinst, pydocu)
-- env.Clean(pydocuinst, pydocuinst)
-+ env.Depends(pydocuinst, pydocu)
-+ env.Clean(pydocuinst, pydocuinst)
-
- # Copy Cudd documentation
- #CopyAll(InstDocPath('cudd'), 'Cudd/cudd/doc', env)
-@@ -1925,8 +1926,9 @@ if 'install' in COMMAND_LINE_TARGETS or 'install-docs' in COMMAND_LINE_TARGETS:
-
-
- # Generate html master
-- instdocumastersubdirs = ["tutorial", "c++"] + [
-- path.basename(elt) for elt in glob("doc/python*")]
-+ instdocumastersubdirs = ["tutorial", "c++"]
-+ if have_pydoc and HAVE_PYTHON_EXTENSION:
-+ instdocumastersubdirs += [path.basename(elt) for elt in glob("doc/python*")]
-
- if ('install' in COMMAND_LINE_TARGETS) and \
- (docpybase not in instdocumastersubdirs):
---
diff --git a/debian/patches/0004-Using-DESTDIR-instead-of-TMPINSTALLDIR.patch b/debian/patches/0004-Using-DESTDIR-instead-of-TMPINSTALLDIR.patch
deleted file mode 100644
index bc97700..0000000
--- a/debian/patches/0004-Using-DESTDIR-instead-of-TMPINSTALLDIR.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Alexander Dreyer <adreyer at gmx.de>
-Date: Sun, 27 Jan 2013 23:57:45 +0100
-Subject: Using DESTDIR instead of TMPINSTALLDIR
-
----
- SConstruct | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 87af090..3300739 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -348,7 +348,7 @@ def setup_env(defaultenv):
- opts.Add('GD_LIBS', 'Library gb and its dependencies (if needed)',
- ["gd"], converter = Split)
-
-- opts.Add('PREFIX', 'installation prefix directory', '/usr/local')
-+ opts.Add('PREFIX', 'installation prefix directory', '$DESTDIR/usr/local')
- opts.Add('EPREFIX','executables installation prefix directory', '$PREFIX/bin')
-
- opts.Add('INSTALLDIR', 'end user installation directory',
-@@ -359,7 +359,7 @@ def setup_env(defaultenv):
- '$PREFIX/man')
- opts.Add('ICONDIR', 'Icon installation directory', '$PREFIX/share/pixmaps')
- opts.Add('PYINSTALLPREFIX',
-- 'python modules directory (default is built-in site)', '$PYTHONSITE')
-+ 'python modules directory (default is built-in site)', '$DESTDIR$PYTHONSITE')
-
- opts.Add('DEVEL_PREFIX',
- 'development version installation directory','$PREFIX' )
-@@ -454,7 +454,7 @@ def setup_env(defaultenv):
- opts.Add('DESKTOPPATH',
- "Generate .desktop file in given path, if given", '')
-
-- opts.Add('TMPINSTALLDIR', "Temporary installation directory, if given", '')
-+ opts.Add('DESTDIR', "Temporary installation directory, if given", '')
-
- opts.Add('M4RIURL',
- """Source destinations for missing m4ri download:
-@@ -2026,7 +2026,7 @@ Libs: %s
- """ % (env.File(target[0]).name.replace('.pc',''),
- pboriversion + '.' + pborirelease,
- libs, libflags)
-- page = localenv.subst_target_source(page).replace(env.subst("$TMPINSTALLDIR"),'') + '\n'
-+ page = localenv.subst_target_source(page).replace(env.subst("$DESTDIR"),'') + '\n'
- open(str(target[0]), 'w').writelines(page)
-
- return None
---
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
deleted file mode 100644
index 31554b9..0000000
--- a/debian/patches/0005-Ensure-ipbori2.x-and-PolyGUI2.x-access-the-desired-m.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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/0006-pyroot-uses-version-specific-settings.patch b/debian/patches/0006-pyroot-uses-version-specific-settings.patch
deleted file mode 100644
index 742404c..0000000
--- a/debian/patches/0006-pyroot-uses-version-specific-settings.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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/0007-ensuredir-should-obey-env.patch b/debian/patches/0007-ensuredir-should-obey-env.patch
deleted file mode 100644
index 3559a2a..0000000
--- a/debian/patches/0007-ensuredir-should-obey-env.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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/0008-Store-temp-config-as-plain-file.patch b/debian/patches/0008-Store-temp-config-as-plain-file.patch
deleted file mode 100644
index fe64088..0000000
--- a/debian/patches/0008-Store-temp-config-as-plain-file.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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
deleted file mode 100644
index 76a7caa..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,8 +0,0 @@
-0001-Add-target-only-if-they-can-be-build.patch
-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
-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 0c6e4e0..839e7d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,6 @@ 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
More information about the debian-science-commits
mailing list