[superlu] 10/11: Imported Debian patch 4.3+dfsg-2

[Nico Schlömer]

This is an automated email from the git hooks/post-receive script.

nschloe-guest pushed a commit to branch master
in repository superlu.

commit 3d20423d60c10afa949fa558f3cf33d1777db59e
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sun Dec 22 21:46:26 2013 +0100

    Imported Debian patch 4.3+dfsg-2
---
 debian/changelog              | 8 ++++++++
 debian/control                | 7 ++++++-
 debian/libsuperlu-dev.install | 6 ++++--
 debian/libsuperlu4.install    | 4 +++-
 debian/rules                  | 3 +++
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 34dbd53..540b709 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+superlu (4.3+dfsg-2) experimental; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS in parallel mode.
+  * Multi-archify the package.
+
+ -- Sébastien Villemot <sebastien at debian.org>  Sun, 22 Dec 2013 21:46:26 +0100
+
 superlu (4.3+dfsg-1) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 4216102..79fed6b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Priority: optional
 Section: devel
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: debhelper (>= 9), gcc (>= 3.0), csh, libblas-dev | libblas.so
+Build-Depends: debhelper (>= 9), gcc (>= 3.0), csh, libblas-dev | libblas.so,
+               dh-exec
 Standards-Version: 3.9.5
 Homepage: http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/superlu/trunk
@@ -12,6 +13,8 @@ Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk
 Package: libsuperlu4
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Direct solution of large, sparse systems of linear equations
  SuperLU is a general purpose library for the direct solution of
@@ -33,6 +36,7 @@ Description: Direct solution of large, sparse systems of linear equations
 Package: libsuperlu-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libsuperlu4 (= ${binary:Version}), libblas-dev, ${misc:Depends}
 Suggests: libsuperlu-doc
 Conflicts: libsuperlu3-dev
@@ -59,6 +63,7 @@ Package: libsuperlu4-dbg
 Priority: extra
 Section: debug
 Architecture: any
+Multi-Arch: same
 Depends: libsuperlu4 (= ${binary:Version}), ${misc:Depends}
 Description: Direct solution of large, sparse systems of linear equations
  Debug files for SuperLU.
diff --git a/debian/libsuperlu-dev.install b/debian/libsuperlu-dev.install
old mode 100644
new mode 100755
index ebc9149..8b3c7d9
--- a/debian/libsuperlu-dev.install
+++ b/debian/libsuperlu-dev.install
@@ -1,3 +1,5 @@
-libsuperlu.so /usr/lib
-libsuperlu.a /usr/lib
+#!/usr/bin/dh-exec
+
+libsuperlu.so /usr/lib/${DEB_HOST_MULTIARCH}/
+libsuperlu.a /usr/lib/${DEB_HOST_MULTIARCH}/
 SRC/*.h /usr/include/superlu
diff --git a/debian/libsuperlu4.install b/debian/libsuperlu4.install
old mode 100644
new mode 100755
index 4d78db6..45a1ba6
--- a/debian/libsuperlu4.install
+++ b/debian/libsuperlu4.install
@@ -1,2 +1,4 @@
-libsuperlu.so.* /usr/lib
+#!/usr/bin/dh-exec
+
+libsuperlu.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
 README /usr/share/doc/libsuperlu4
diff --git a/debian/rules b/debian/rules
index 8593c63..5723b65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,9 @@ override_dh_auto_build:
 	rm -f libsuperlu.a
 	cd SRC && $(MAKE) CFLAGS="$(CFLAGS) -pipe" DEBUGFLAGS="-DNDEBUG" LDFLAGS="$(LDFLAGS) -s"
 
+# Do not run "make install": we don't need it and it is not parallel safe
+override_dh_auto_install:
+
 override_dh_auto_clean:
 	[ ! -f Makefile ] || $(MAKE) clean
 	rm -f libsuperlu.a libsuperlu.so*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/superlu.git