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

[Alexander Dreyer]

The following commit has been merged in the master branch:
commit 275f0f34a6cb5ee9eda65b26aa5e92c3c5a39050
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Sat Jan 26 00:40:47 2013 +0100

    Avoid to many python doc copies

diff --git a/debian/patches/0003-Generate-doc-python-only-if-necessary.patch b/debian/patches/0003-Generate-doc-python-only-if-necessary.patch
new file mode 100644
index 0000000..7fe6d4a
--- /dev/null
+++ b/debian/patches/0003-Generate-doc-python-only-if-necessary.patch
@@ -0,0 +1,42 @@
+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/series b/debian/patches/series
index ebb03a2..a7d4b4c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 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
diff --git a/debian/rules b/debian/rules
index 8ef9b83..7bac155 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,7 @@ build-python%:
 		DEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
 		PKGCONFIGPATH=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/ TMPINSTALLDIR=$(TMPDEST) \
 		DESKTOPPATH=$(TMPDEST)/usr/share/applications/ \
-		M4RIURL='' DOCS=False
+		M4RIURL='' DOCS=False  HAVE_PYDOC=False
 
 override_dh_auto_build-arch: $(PYVERS:%=build-python%)
 
@@ -50,7 +50,7 @@ install-python%:
 		DEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
                 PKGCONFIGPATH=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/ TMPINSTALLDIR=$(TMPDEST) \
 		DESKTOPPATH=$(TMPDEST)/usr/share/applications/ \
-		M4RIURL='' DOCS=False
+		M4RIURL='' DOCS=False  HAVE_PYDOC=False 
 
 override_dh_auto_install-arch: $(PYVERS:%=install-python%)
 
@@ -66,7 +66,7 @@ override_dh_auto_build-indep:
 		CXXFLAGS="$(CXXFLAGS)" \
 		LEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
 		TMPINSTALLDIR=$(TMPDEST) \
-                M4RIURL='' 
+                M4RIURL=''
 
 override_dh_auto_install-indep:
 	scons $(SCONSPARFLAGS) install-docs INSTALLDIR=$(TMPDEST)/usr/share/polybori \

-- 
polybori: Polynomials over Boolean Rings