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

[Alexander Dreyer]

The following commit has been merged in the master branch:
commit efe2fba3a547c4364417ab5a8acd93398aff31f0
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Sun Jan 27 04:30:39 2013 +0100

    Moving recurring config variables to custom.py; better test target

diff --git a/debian/custom.py b/debian/custom.py
new file mode 100644
index 0000000..676ff91
--- /dev/null
+++ b/debian/custom.py
@@ -0,0 +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/"
+PKGCONFIGPATH="$DEVEL_LIB_PREFIX/pkgconfig/"
+M4RIURL=''
+
+from os import environ
+LINKFLAGS = environ["LDFLAGS"]
+CCFLAGS = environ["CPPFLAGS"]
+CFLAGS = environ["CFLAGS"]
+CXXFLAGS = environ["CXXFLAGS"]
+
+DEVEL_LIB_PREFIX = "/please/set/DEVEL_LIB_PREFIX"
+TMPINSTALLDIR = "/please/set/TMPINSTALLDIR/"
+
diff --git a/debian/rules b/debian/rules
index 7bac155..8b2731e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,20 +16,14 @@ 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 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 PYTHON=$(PYTHON) \
-		LINKFLAGS="$(LDFLAGS)" \
-		CCFLAGS="$(CPPFLAGS)" \
-		CFLAGS="$(CFLAGS)" \
-		CXXFLAGS="$(CXXFLAGS)" \
+	scons $(SCONSPARFLAGS) prepare-install prepare-devel \
+		PYINSTALLPREFIX=$(TMPDEST)/$(PYTHONSITE) PYTHON=$(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  HAVE_PYDOC=False
+		TMPINSTALLDIR=$(TMPDEST) \
+		DOCS=False HAVE_PYDOC=False
 
 override_dh_auto_build-arch: $(PYVERS:%=build-python%)
 
@@ -39,72 +33,43 @@ install-python%: PYTHONSITE=`/usr/bin/python$* -c 'import distutils.sysconfig; p
 
 
 install-python%:
-	scons $(SCONSPARFLAGS) install devel-install 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 PYTHON=$(PYTHON) \
-		LINKFLAGS="$(LDFLAGS)" \
-		CCFLAGS="$(CPPFLAGS)" \
-		CFLAGS="$(CFLAGS)" \
-		CXXFLAGS="$(CXXFLAGS)" \
+	scons $(SCONSPARFLAGS) install devel-install \
+		PYINSTALLPREFIX=$(TMPDEST)/$(PYTHONSITE) PYTHON=$(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  HAVE_PYDOC=False 
+                TMPINSTALLDIR=$(TMPDEST) \
+		DOCS=False  HAVE_PYDOC=False 
 
 override_dh_auto_install-arch: $(PYVERS:%=install-python%)
 
 
 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)" \
+	scons $(SCONSPARFLAGS) docs \
 		LEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
-		TMPINSTALLDIR=$(TMPDEST) \
-                M4RIURL=''
+		TMPINSTALLDIR=$(TMPDEST) 
 
 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)" \
+	scons $(SCONSPARFLAGS) install-docs \
 		LEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
 		TMPINSTALLDIR=$(TMPDEST) \
-		M4RIURL=''
 
 
 
-
-test-python%:
-	scons $(SCONSPARFLAGS) testsuite/unittests 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)" \
+test-unittests:
+	scons $(SCONSPARFLAGS) testsuite/unittests \
 		LEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
-		TMPINSTALLDIR=$(TMPDEST) \
-		M4RIURL=''
+		TMPINSTALLDIR=$(TMPDEST)
 	testsuite/unittests
-	ipbori/ipbori -t 
 
-override_dh_auto_test: $(PYVERS:%=test-python%)
+test-python%:
+	python$* ipbori/ipbori -t 
+
+override_dh_auto_test: test-unittests $(PYVERS:%=test-python%)
 
 # Manually cleaning, since upstream is broken (Called before patches apply, too.)
 override_dh_auto_clean:
 	scons . --keep-going --clean || true
 	dh_auto_clean
+	rm -f custom.py
 
 PBORIVER=0.8
 PBORIREL=3

-- 
polybori: Polynomials over Boolean Rings