[SCM] linbox: library for exact linear algebra branch, master, updated. upstream/1.2.0-27-g5703172

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 8e3f8daa38d07c1972172344ddf5ab43b9dccbfe
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Mon Jun 11 22:12:43 2012 +0800

    Support multiarch.

diff --git a/debian/control b/debian/control
index 317d158..a97fb99 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,8 @@ Standards-Version: 3.8.0
 Package: liblinbox-dev
 Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, liblinbox0 (= ${binary:Version}), libgivaro-dev, liblapack-dev
-Description: Library for exact linear algebra, development files
+Depends: ${misc:Depends}, liblinbox0 (= ${binary:Version}), libgivaro-dev, liblapack-dev
+Description: Library for exact linear algebra - development files
  LinBox is a C++ template library for exact, high-performance
  linear algebra computation with dense, sparse, and structured
  matrices over the integers and over finite fields.
@@ -21,8 +21,10 @@ Description: Library for exact linear algebra, development files
 Package: liblinbox0
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Library for exact linear algebra, shared library
+Description: Library for exact linear algebra - shared library
  LinBox is a C++ template library for exact, high-performance
  linear algebra computation with dense, sparse, and structured
  matrices over the integers and over finite fields.
diff --git a/debian/liblinbox-dev.install b/debian/liblinbox-dev.install
index 5a3ced6..27f8963 100644
--- a/debian/liblinbox-dev.install
+++ b/debian/liblinbox-dev.install
@@ -1,5 +1,4 @@
-debian/tmp/usr/lib/*.a usr/lib
-debian/tmp/usr/lib/*.so usr/lib
-debian/tmp/usr/include usr/
-debian/tmp/usr/bin usr/
-doc/linbox-config.1 usr/share/man/man1/
+debian/tmp/usr/lib/*/*.a
+debian/tmp/usr/lib/*/*.so
+debian/tmp/usr/include
+debian/tmp/usr/bin
diff --git a/debian/liblinbox-dev.manpages b/debian/liblinbox-dev.manpages
new file mode 100644
index 0000000..9f1ed5c
--- /dev/null
+++ b/debian/liblinbox-dev.manpages
@@ -0,0 +1 @@
+doc/linbox-config.1
diff --git a/debian/liblinbox0.install b/debian/liblinbox0.install
index 5bfe822..7568878 100644
--- a/debian/liblinbox0.install
+++ b/debian/liblinbox0.install
@@ -1 +1 @@
-debian/tmp/usr/lib/*.so.* /usr/lib
+debian/tmp/usr/lib/*/liblinbox.so.*
diff --git a/debian/rules b/debian/rules
index e6c3e24..cdc21a2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,7 @@ get-orig-source: ../$(PKGNAME)_$(UPVER).orig.tar.gz
 configure-stamp:
 	dh_auto_configure -- \
 		--prefix=/usr \
+		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--with-gmp \
 		--with-givaro \
 		--with-blas \

-- 
linbox: library for exact linear algebra