[SCM] polybori: Polynomials over Boolean Rings branch, master, updated. upstream/0.8.2-141-g2f2ed93
Alexander Dreyer
adreyer at gmx.de
Wed Jan 23 01:23:19 UTC 2013
The following commit has been merged in the master branch:
commit 2f2ed93f87f10f77d4f427ed5e90420bba054135
Author: Alexander Dreyer <adreyer at gmx.de>
Date: Wed Jan 23 00:44:47 2013 +0100
Make use of independent target for documentation.)
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/control b/debian/control
index 3451cc0..21fc82f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,9 @@ Build-Depends: debhelper (>= 9),
libboost-dev,
libboost-python-dev,
libm4ri-dev (>= 20120613),
- doxygen,
- hevea | tex4ht,
python-all-dev
+Build-Depends-Indep: doxygen,
+ hevea | tex4ht
Standards-Version: 3.9.3
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/polybori.git
Vcs-Git: git://git.debian.org/git/debian-science/packages/polybori.git
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
new file mode 100644
index 0000000..4bc6012
--- /dev/null
+++ b/debian/patches/0001-Add-target-only-if-they-can-be-build.patch
@@ -0,0 +1,45 @@
+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/series b/debian/patches/series
index e69de29..2e9fefc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Add-target-only-if-they-can-be-build.patch
diff --git a/debian/rules b/debian/rules
index 52664ff..f80a6a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ SCONSPARFLAGS=$(subst parallel=,-j, $(NUMJOBS))
dh $@ --with python2
-build-python%: TMPDEST=debian/tmp/
+TMPDEST=debian/tmp/
build-python%: PYTHON=/usr/bin/python$*
build-python%: PYTHONSITE=`/usr/bin/python$* -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib() '`
@@ -29,9 +29,9 @@ 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=''
+ M4RIURL='' DOCS=False
-override_dh_auto_build: $(PYVERS:%=build-python%)
+override_dh_auto_build: $(PYVERS:%=build-python%) override_dh_auto_build-indep
install-python%: TMPDEST=debian/tmp/
install-python%: PYTHON=/usr/bin/python$*
@@ -50,11 +50,40 @@ 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=''
+ M4RIURL='' DOCS=False
-override_dh_auto_install: $(PYVERS:%=install-python%)
+override_dh_auto_install: $(PYVERS:%=install-python%) override_dh_auto_install-indep
mkdir -p debian/tmp/usr/share/applications/
+override_dh_auto_build-indep:
+ scons $(SCONSPARFLAGS) docs INSTALLDIR=$(TMPDEST)/usr/share/polybori \
+ PYINSTALLPREFIX=$(TMPDEST)/$(PYTHONSITE) MANDIR=$(TMPDEST)/usr/share/man \
+ PREFIX=$(TMPDEST)/usr EPREFIX=$(TMPDEST)/usr/bin \
+ DOCDIR=$(TMPDEST)/usr/share/doc/polybori \
+ LINKFLAGS="$(LDFLAGS)" \
+ CCFLAGS="$(CPPFLAGS)" \
+ CFLAGS="$(CFLAGS)" \
+ CXXFLAGS="$(CXXFLAGS)" \
+ LEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
+ TMPINSTALLDIR=$(TMPDEST) \
+ M4RIURL=''
+
+override_dh_auto_install-indep:
+ scons $(SCONSPARFLAGS) install-docs INSTALLDIR=$(TMPDEST)/usr/share/polybori \
+ PYINSTALLPREFIX=$(TMPDEST)/$(PYTHONSITE) MANDIR=$(TMPDEST)/usr/share/man \
+ PREFIX=$(TMPDEST)/usr EPREFIX=$(TMPDEST)/usr/bin \
+ DOCDIR=$(TMPDEST)/usr/share/doc/polybori \
+ LINKFLAGS="$(LDFLAGS)" \
+ CCFLAGS="$(CPPFLAGS)" \
+ CFLAGS="$(CFLAGS)" \
+ CXXFLAGS="$(CXXFLAGS)" \
+ LEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
+ TMPINSTALLDIR=$(TMPDEST) \
+ M4RIURL=''
+
+
+
+
test-python%:
ipbori/ipbori -t
--
polybori: Polynomials over Boolean Rings
More information about the debian-science-commits
mailing list