[SCM] polybori: Polynomials over Boolean Rings branch, master, updated. upstream/0.8.2-162-gb82bbe7
Alexander Dreyer
adreyer at gmx.de
Mon Jan 28 02:02:18 UTC 2013
The following commit has been merged in the master branch:
commit 67fdc2606f6c47334b3a73988523959ae8e75f92
Author: Alexander Dreyer <adreyer at gmx.de>
Date: Sun Jan 27 23:38:37 2013 +0100
Using DESTDIR, move more config stuff to custom.py
diff --git a/debian/control b/debian/control
index 230a892..d656a0b 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Build-Depends: debhelper (>= 9),
python-all-dev,
libgd2-xpm-dev
Build-Depends-Indep: doxygen,
- tex4ht
+ tex4ht,
+ texlive-latex-base
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/custom.py b/debian/custom.py
index 676ff91..861817e 100644
--- a/debian/custom.py
+++ b/debian/custom.py
@@ -1,18 +1,18 @@
-INSTALLDIR = "$TMPINSTALLDIR/usr/share/polybori"
-MANDIR = "$TMPINSTALLDIR/usr/share/man"
-PREFIX = "$TMPINSTALLDIR/usr"
-EPREFIX = "$TMPINSTALLDIR/usr/bin"
-DOCDIR = "$TMPINSTALLDIR/usr/share/doc/polybori"
-DESKTOPPATH = "$TMPINSTALLDIR/usr/share/applications/"
+INSTALLDIR = "$DESTDIR/usr/share/polybori"
+MANDIR = "$DESTDIR/usr/share/man"
+PREFIX = "$DESTDIR/usr"
+EPREFIX = "$DESTDIR/usr/bin"
+DOCDIR = "$DESTDIR/usr/share/doc/polybori"
+DESKTOPPATH = "$DESTDIR/usr/share/applications/"
PKGCONFIGPATH="$DEVEL_LIB_PREFIX/pkgconfig/"
M4RIURL=''
from os import environ
-LINKFLAGS = environ["LDFLAGS"]
-CCFLAGS = environ["CPPFLAGS"]
-CFLAGS = environ["CFLAGS"]
-CXXFLAGS = environ["CXXFLAGS"]
+LINKFLAGS = environ.get("LDFLAGS", '')
+CCFLAGS = environ.get("CPPFLAGS", '')
+CFLAGS = environ.get("CFLAGS", '')
+CXXFLAGS = environ.get("CXXFLAGS", '')
+DESTDIR = environ.get("DESTDIR", 'debian/tmp')
-DEVEL_LIB_PREFIX = "/please/set/DEVEL_LIB_PREFIX"
-TMPINSTALLDIR = "/please/set/TMPINSTALLDIR/"
+DEVEL_LIB_PREFIX = "$DESTDIR/usr/lib/" + environ.get("DEB_HOST_MULTIARCH", '')
diff --git a/debian/patches/0004-Using-DESTDIR-instead-of-TMPINSTALLDIR.patch b/debian/patches/0004-Using-DESTDIR-instead-of-TMPINSTALLDIR.patch
new file mode 100644
index 0000000..bc97700
--- /dev/null
+++ b/debian/patches/0004-Using-DESTDIR-instead-of-TMPINSTALLDIR.patch
@@ -0,0 +1,49 @@
+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/series b/debian/patches/series
index a7d4b4c..4dfb665 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
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
diff --git a/debian/rules b/debian/rules
index 8b2731e..839e7d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,58 +6,42 @@ PYVERS=$(shell pyversions -vr)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
NUMJOBS=$(filter parallel=%,$(DEB_BUILD_OPTIONS))
SCONSPARFLAGS=$(subst parallel=,-j, $(NUMJOBS))
-
+DESTDIR=debian/tmp/
%:
dh $@ --with python2
-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() '`
override_dh_auto_configure:
cp debian/custom.py .
build-python%:
scons $(SCONSPARFLAGS) prepare-install prepare-devel \
- PYINSTALLPREFIX=$(TMPDEST)/$(PYTHONSITE) PYTHON=$(PYTHON) \
- DEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
- TMPINSTALLDIR=$(TMPDEST) \
+ PYTHON=$(PYTHON) \
DOCS=False HAVE_PYDOC=False
override_dh_auto_build-arch: $(PYVERS:%=build-python%)
-install-python%: TMPDEST=debian/tmp/
install-python%: PYTHON=/usr/bin/python$*
-install-python%: PYTHONSITE=`/usr/bin/python$* -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib() '`
-
install-python%:
scons $(SCONSPARFLAGS) install devel-install \
- PYINSTALLPREFIX=$(TMPDEST)/$(PYTHONSITE) PYTHON=$(PYTHON) \
- DEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
- TMPINSTALLDIR=$(TMPDEST) \
+ PYTHON=$(PYTHON) \
DOCS=False HAVE_PYDOC=False
override_dh_auto_install-arch: $(PYVERS:%=install-python%)
override_dh_auto_build-indep:
- scons $(SCONSPARFLAGS) docs \
- LEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
- TMPINSTALLDIR=$(TMPDEST)
+ scons $(SCONSPARFLAGS) docs
override_dh_auto_install-indep:
- scons $(SCONSPARFLAGS) install-docs \
- LEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
- TMPINSTALLDIR=$(TMPDEST) \
-
+ scons $(SCONSPARFLAGS) install-docs
test-unittests:
- scons $(SCONSPARFLAGS) testsuite/unittests \
- LEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
- TMPINSTALLDIR=$(TMPDEST)
+ scons $(SCONSPARFLAGS) testsuite/unittests
testsuite/unittests
test-python%:
--
polybori: Polynomials over Boolean Rings
More information about the debian-science-commits
mailing list