[SCM] givaro: library for arithmetic and algebraic computations branch, master, updated. debian/3.2.13-1.1-16-gf326f0e

[Lifeng Sun]

The following commit has been merged in the master branch:
commit e75eab5733fcb0a803edec8b1a5071d798db2048
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Aug 9 14:01:43 2011 +0800

    Support multiarch.

diff --git a/debian/control b/debian/control
index 7485d21..670fa3f 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,8 @@ Description: arithmetic and algebraic computations - development files
 Package: libgivaro0
 Section: libs
 Architecture: any
+Multi-arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: arithmetic and algebraic computations
  Givaro is a C++ library for arithmetic and algebraic computations.
diff --git a/debian/libgivaro-dev.install b/debian/libgivaro-dev.install
index 1e00a69..389a3b0 100644
--- a/debian/libgivaro-dev.install
+++ b/debian/libgivaro-dev.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/include/*
-debian/tmp/usr/lib/libgivaro.a
-debian/tmp/usr/lib/libgivaro.so
+debian/tmp/usr/lib/*/libgivaro.a
+debian/tmp/usr/lib/*/libgivaro.so
 debian/tmp/usr/bin/givaro-config
diff --git a/debian/libgivaro0.install b/debian/libgivaro0.install
index 1da9814..75b6102 100644
--- a/debian/libgivaro0.install
+++ b/debian/libgivaro0.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libgivaro.so.*
+debian/tmp/usr/lib/*/libgivaro.so.*
diff --git a/debian/rules b/debian/rules
index fb7d158..c49b448 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,16 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+CFLAGS		:= $(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS	:= $(shell dpkg-buildflags --get CPPFLAGS)
+CXXFLAGS	:= $(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS		:= $(shell dpkg-buildflags --get LDFLAGS)
+DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 override_dh_auto_configure:
-	dh_auto_configure -- --with-gmp --enable-shared
+	dh_testdir
+	dh_auto_configure -- --with-gmp --enable-shared \
+		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_installexamples:
 	dh_installexamples -XMakefile -XMakefile.am -XMakefile.in

-- 
givaro: library for arithmetic and algebraic computations