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

[Alexander Dreyer]

The following commit has been merged in the master branch:
commit 654a2bd6c0be1b2767485d7988d60bcb4d019f6a
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Fri Dec 21 01:58:48 2012 +0100

    Multi-archizing debian build

diff --git a/debian/control b/debian/control
index 3470e62..6386e47 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Build-Depends: debhelper (>= 9),
                libboost-python-dev,
                doxygen,
                hevea | tex4ht,
-               python-all-dev
+               python-all-dev,
+               dh-exec
 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
@@ -68,6 +69,7 @@ Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Pre-Depends: multiarch-support
 Suggests: polybori-doc (= ${binary:Version})
 Description: polynomials over Boolean Rings, shared library
  The core of PolyBoRi is a C++ library, which provides high-level data
@@ -112,6 +114,7 @@ Depends: ${shlibs:Depends},
 Breaks:  libpolybori (<< 0.8)
 Replaces: libpolybori (<< 0.8)
 Suggests: polybori-doc (= ${binary:Version})
+Pre-Depends: multiarch-support
 Description: polynomials over Boolean Rings, shared library
  The core of PolyBoRi is a C++ library, which provides high-level data
  types for Boolean polynomials and monomials, exponent vectors, as
diff --git a/debian/libpolybori-0.8.2-1.install b/debian/libpolybori-0.8.2-1.install
old mode 100644
new mode 100755
index 194d5bf..9a17d59
--- a/debian/libpolybori-0.8.2-1.install
+++ b/debian/libpolybori-0.8.2-1.install
@@ -1 +1,2 @@
-debian/tmp/usr/lib/*polybori-*.so.* usr/lib/
+#! /usr/bin/dh-exec
+debian/tmp/usr/lib/*/*polybori-*.so.* usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/libpolybori-dev.install b/debian/libpolybori-dev.install
old mode 100644
new mode 100755
index 0f57a6c..fb50061
--- a/debian/libpolybori-dev.install
+++ b/debian/libpolybori-dev.install
@@ -1,3 +1,4 @@
+#! /usr/bin/dh-exec
 debian/tmp/usr/include usr/
-debian/tmp/usr/lib/*.a usr/lib/
-debian/tmp/usr/lib/*.so usr/lib/
+debian/tmp/usr/lib/*/*.a usr/lib/${DEB_HOST_MULTIARCH}/
+debian/tmp/usr/lib/*/*.so usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/libpolybori-groebner-0.8.2-1.install b/debian/libpolybori-groebner-0.8.2-1.install
old mode 100644
new mode 100755
index ba1f4b5..7c3d556
--- a/debian/libpolybori-groebner-0.8.2-1.install
+++ b/debian/libpolybori-groebner-0.8.2-1.install
@@ -1 +1,2 @@
-debian/tmp/usr/lib/*polybori_groebner*.so.* usr/lib/
+#! /usr/bin/dh-exec
+debian/tmp/usr/lib/*/*polybori_groebner*.so.* usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/rules b/debian/rules
index 42859e4..e9a83e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 # DH_VERBOSE=1
 
 PYVERS=$(shell pyversions -vr)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 
 build-stamp: $(PYVERS:%=stamp-build-python%)
 	touch $@
@@ -19,37 +21,39 @@ build-python%: PYTHONSITE=`/usr/bin/python$* -c 'import setuptools; print setupt
 
 build-python%:
 	scons prepare-install INSTALLDIR=$(TMPDEST)/usr/share/polybori \
-		PYINSTALLPREFIX=$(TMPDEST)$(PYTHONSITE) MANDIR=$(TMPDEST)/usr/share/man \
+		PYINSTALLPREFIX=$(TMPDEST)/$(PYTHONSITE) MANDIR=$(TMPDEST)/usr/share/man \
 		PREFIX=$(TMPDEST)/usr EPREFIX=$(TMPDEST)/usr/bin \
 		DOCDIR=$(TMPDEST)/usr/share/doc/polybori PYTHON=$(PYTHON) \
-		RELATIVEPYPREFIX=/usr/lib/python$*/site-packages \
 		LINKFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" \
 		CCFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" \
 		CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" \
 		CXXFLAGS="$(shell dpkg-buildflags --get CXXFLAGS)" \
-		LIBRARY_VERSION="1.0.0" \
-		PKGCONFIGFILE=$(TMPDEST)/usr/lib/pkgconfig/polybori.pc TMPINSTALLDIR=$(TMPDEST)
+		LIBRARY_VERSION="1.0.0"  DEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
+		PKGCONFIGFILE=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polybori.pc TMPINSTALLDIR=$(TMPDEST)
 	-mkdir -p $(TMPDEST)
 	scons install devel-install INSTALLDIR=$(TMPDEST)/usr/share/polybori \
-		PYINSTALLPREFIX=$(TMPDEST)$(PYTHONSITE) MANDIR=$(TMPDEST)/usr/share/man \
+		PYINSTALLPREFIX=$(TMPDEST)/$(PYTHONSITE) MANDIR=$(TMPDEST)/usr/share/man \
 		PREFIX=$(TMPDEST)/usr EPREFIX=$(TMPDEST)/usr/bin \
 		DOCDIR=$(TMPDEST)/usr/share/doc/polybori PYTHON=$(PYTHON) \
-		RELATIVEPYPREFIX=/usr/lib/python$*/site-packages \
 		LINKFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" \
 		CCFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" \
 		CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" \
 		CXXFLAGS="$(shell dpkg-buildflags --get CXXFLAGS)" \
-		LIBRARY_VERSION="1.0.0" \
-                PKGCONFIGFILE=$(TMPDEST)/usr/lib/pkgconfig/polybori.pc TMPINSTALLDIR=$(TMPDEST)
+		LIBRARY_VERSION="1.0.0" DEVEL_LIB_PREFIX=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH) \
+                PKGCONFIGFILE=$(TMPDEST)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polybori.pc TMPINSTALLDIR=$(TMPDEST)
 
 
 install-%:
 	-mkdir debian/tmp/
 	cp -a debian/python-polybori$*/* debian/tmp/
 
+install: PYTHONSITE=`/usr/bin/python${PYVERS} -c 'import setuptools; print setuptools.distutils.sysconfig.get_python_lib() '`
+
 install: $(PYVERS:%=install-%)
 	-mkdir -p debian/tmp/
-	-mkdir -p debian/tmp/usr/lib
+	-mkdir -p debian/tmp/usr/
+	-mkdir -p debian/tmp/usr/lib/
+	-mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 	-mkdir -p debian/tmp/usr/share
 
 clean:

-- 
polybori: Polynomials over Boolean Rings