r46429 - in /packages/superlu/trunk/debian: changelog control libsuperlu-dev.install libsuperlu4.install rules

[sebastien at users.alioth.debian.org]

Author: sebastien
Date: Sun Dec 22 20:52:33 2013
New Revision: 46429

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46429
Log:
* Fix FTBFS in parallel mode.
* Multi-archify the package.


Modified:
    packages/superlu/trunk/debian/changelog
    packages/superlu/trunk/debian/control
    packages/superlu/trunk/debian/libsuperlu-dev.install   (contents, props changed)
    packages/superlu/trunk/debian/libsuperlu4.install   (contents, props changed)
    packages/superlu/trunk/debian/rules

Modified: packages/superlu/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/changelog?rev=46429&op=diff
==============================================================================
--- packages/superlu/trunk/debian/changelog	(original)
+++ packages/superlu/trunk/debian/changelog	Sun Dec 22 20:52:33 2013
@@ -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.

Modified: packages/superlu/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/control?rev=46429&op=diff
==============================================================================
--- packages/superlu/trunk/debian/control	(original)
+++ packages/superlu/trunk/debian/control	Sun Dec 22 20:52:33 2013
@@ -3,7 +3,8 @@
 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 @@
 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 @@
 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 @@
 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.

Modified: packages/superlu/trunk/debian/libsuperlu-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/libsuperlu-dev.install?rev=46429&op=diff
==============================================================================
--- packages/superlu/trunk/debian/libsuperlu-dev.install	(original)
+++ packages/superlu/trunk/debian/libsuperlu-dev.install	Sun Dec 22 20:52:33 2013
@@ -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

Propchange: packages/superlu/trunk/debian/libsuperlu-dev.install
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/superlu/trunk/debian/libsuperlu4.install
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/libsuperlu4.install?rev=46429&op=diff
==============================================================================
--- packages/superlu/trunk/debian/libsuperlu4.install	(original)
+++ packages/superlu/trunk/debian/libsuperlu4.install	Sun Dec 22 20:52:33 2013
@@ -1,2 +1,4 @@
-libsuperlu.so.* /usr/lib
+#!/usr/bin/dh-exec
+
+libsuperlu.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
 README /usr/share/doc/libsuperlu4

Propchange: packages/superlu/trunk/debian/libsuperlu4.install
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/superlu/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/superlu/trunk/debian/rules?rev=46429&op=diff
==============================================================================
--- packages/superlu/trunk/debian/rules	(original)
+++ packages/superlu/trunk/debian/rules	Sun Dec 22 20:52:33 2013
@@ -31,6 +31,9 @@
 	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*