[SCM] Debian packaging for suitesparse branch, master, updated. upstream/4.2.0-18-gb3e5b87

Sébastien Villemot sebastien at debian.org
Tue Apr 23 20:42:55 UTC 2013


The following commit has been merged in the master branch:
commit 4ffee285a7f27f5d2a1f5f94918eb67398fd598a
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Apr 23 21:56:31 2013 +0200

    Multiarchify the package

diff --git a/debian/changelog b/debian/changelog
index de0bc3d..6d5a021 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ suitesparse (1:4.2.0-1) experimental; urgency=low
     - remove -m64 flag on amd64 CPUs (Closes: #701654)
   * Fix version in NEWS.Debian, to make lintian happy
   * parallel-build.diff: new patch, fixes parallel build
+  * Multiarchify the package
 
  -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Mon, 10 Sep 2012 16:40:47 +0200
 
diff --git a/debian/control.in b/debian/control.in
index 42abb6c..e3c7dc1 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>,
  Daniel Rus Morales <danirus at tol-project.org>,
  Sébastien Villemot <sebastien at debian.org>
-Build-Depends: cdbs (>= 0.4.52), debhelper (>= 9), gfortran,
+Build-Depends: cdbs (>= 0.4.52), debhelper (>= 9), dh-exec, gfortran,
  libblas-dev, liblapack-dev
 Standards-Version: 3.9.3
 Homepage: http://www.cise.ufl.edu/research/sparse/SuiteSparse/
@@ -15,6 +15,8 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/suitesparse.git
 Package: @AMD@
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: approximate minimum degree ordering library for sparse matrices
  Suitesparse is a collection of libraries for computations involving
@@ -25,6 +27,8 @@ Description: approximate minimum degree ordering library for sparse matrices
 Package: @BTF@
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: permutation to block triangular form library for sparse matrices
  Suitesparse is a collection of libraries for computations involving
@@ -35,6 +39,8 @@ Description: permutation to block triangular form library for sparse matrices
 Package: @CAMD@
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: symmetric approximate minimum degree library for sparse matrices
  Suitesparse is a collection of libraries for computations involving
@@ -45,6 +51,8 @@ Description: symmetric approximate minimum degree library for sparse matrices
 Package: @COLAMD@
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: column approximate minimum degree ordering library for sparse matrices
  Suitesparse is a collection of libraries for computations involving
@@ -55,6 +63,8 @@ Description: column approximate minimum degree ordering library for sparse matri
 Package: @CCOLAMD@
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: constrained column approximate library for sparse matrices
  Suitesparse is a collection of libraries for computations involving
@@ -65,6 +75,8 @@ Description: constrained column approximate library for sparse matrices
 Package: @CHOLMOD@
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: sparse Cholesky factorization library for sparse matrices
  Suitesparse is a collection of libraries for computations involving
@@ -75,6 +87,8 @@ Description: sparse Cholesky factorization library for sparse matrices
 Package: @CSparse@
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: concise sparse matrix library
  Suitesparse is a collection of libraries for computations involving
@@ -85,6 +99,8 @@ Description: concise sparse matrix library
 Package: @CXSparse@
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: concise sparse matrix library (complex, int and long int support)
  Suitesparse is a collection of libraries for computations involving
@@ -95,6 +111,8 @@ Description: concise sparse matrix library (complex, int and long int support)
 Package: @KLU@
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: circuit simulation sparse LU factorization library
  Suitesparse is a collection of libraries for computations involving
@@ -105,6 +123,8 @@ Description: circuit simulation sparse LU factorization library
 Package: @LDL@
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: simple LDL' factorization library for sparse matrices
  Suitesparse is a collection of libraries for computations involving
@@ -115,6 +135,8 @@ Description: simple LDL' factorization library for sparse matrices
 Package: @UMFPACK@
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: sparse LU factorization library
  Suitesparse is a collection of libraries for computations involving
@@ -125,6 +147,7 @@ Description: sparse LU factorization library
 Package: libsuitesparse-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Replaces: libufsparse-dev, libsuitesparse-metis-dev, libumfpack4-dev
 Conflicts: libufsparse-dev, libsuitesparse-metis-dev, libumfpack4-dev
 Provides: libufsparse-dev, libumfpack4-dev
diff --git a/debian/install/AMD b/debian/install/AMD
old mode 100644
new mode 100755
index 4df12e0..00f963c
--- a/debian/install/AMD
+++ b/debian/install/AMD
@@ -1 +1,3 @@
-AMD/Lib/*.so.* /usr/lib
+#!/usr/bin/dh-exec
+
+AMD/Lib/*.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/install/BTF b/debian/install/BTF
old mode 100644
new mode 100755
index 793cf61..633aa19
--- a/debian/install/BTF
+++ b/debian/install/BTF
@@ -1 +1,3 @@
-BTF/Lib/*.so.* /usr/lib
+#!/usr/bin/dh-exec
+
+BTF/Lib/*.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/install/CAMD b/debian/install/CAMD
old mode 100644
new mode 100755
index 59ab6ec..b711176
--- a/debian/install/CAMD
+++ b/debian/install/CAMD
@@ -1 +1,3 @@
-CAMD/Lib/*.so.* /usr/lib
+#!/usr/bin/dh-exec
+
+CAMD/Lib/*.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/install/CCOLAMD b/debian/install/CCOLAMD
old mode 100644
new mode 100755
index 80e4417..aac73b5
--- a/debian/install/CCOLAMD
+++ b/debian/install/CCOLAMD
@@ -1 +1,3 @@
-CCOLAMD/Lib/*.so.* /usr/lib
+#!/usr/bin/dh-exec
+
+CCOLAMD/Lib/*.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/install/CHOLMOD b/debian/install/CHOLMOD
old mode 100644
new mode 100755
index c219609..f933f53
--- a/debian/install/CHOLMOD
+++ b/debian/install/CHOLMOD
@@ -1 +1,3 @@
-CHOLMOD/Lib/*.so.* /usr/lib
+#!/usr/bin/dh-exec
+
+CHOLMOD/Lib/*.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/install/COLAMD b/debian/install/COLAMD
old mode 100644
new mode 100755
index 7a376ce..df79212
--- a/debian/install/COLAMD
+++ b/debian/install/COLAMD
@@ -1 +1,3 @@
-COLAMD/Lib/*.so.* /usr/lib
+#!/usr/bin/dh-exec
+
+COLAMD/Lib/*.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/install/CSparse b/debian/install/CSparse
old mode 100644
new mode 100755
index e100879..b7fbcc0
--- a/debian/install/CSparse
+++ b/debian/install/CSparse
@@ -1 +1,3 @@
-CSparse/Lib/*.so.* /usr/lib
+#!/usr/bin/dh-exec
+
+CSparse/Lib/*.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/install/CXSparse b/debian/install/CXSparse
old mode 100644
new mode 100755
index aff3e9d..11e2295
--- a/debian/install/CXSparse
+++ b/debian/install/CXSparse
@@ -1 +1,3 @@
-CXSparse/Lib/*.so.* /usr/lib
+#!/usr/bin/dh-exec
+
+CXSparse/Lib/*.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/install/KLU b/debian/install/KLU
old mode 100644
new mode 100755
index 59f39aa..01bc0e8
--- a/debian/install/KLU
+++ b/debian/install/KLU
@@ -1 +1,3 @@
-KLU/Lib/*.so.* /usr/lib
+#!/usr/bin/dh-exec
+
+KLU/Lib/*.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/install/LDL b/debian/install/LDL
old mode 100644
new mode 100755
index 8e9f04b..4c7edfe
--- a/debian/install/LDL
+++ b/debian/install/LDL
@@ -1 +1,3 @@
-LDL/Lib/*.so.* /usr/lib
+#!/usr/bin/dh-exec
+
+LDL/Lib/*.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/install/UMFPACK b/debian/install/UMFPACK
old mode 100644
new mode 100755
index 36b9df4..462f472
--- a/debian/install/UMFPACK
+++ b/debian/install/UMFPACK
@@ -1 +1,3 @@
-UMFPACK/Lib/*.so.* /usr/lib
+#!/usr/bin/dh-exec
+
+UMFPACK/Lib/*.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/libsuitesparse-dev.install b/debian/libsuitesparse-dev.install
old mode 100644
new mode 100755
index 8dbd387..8dcf4d9
--- a/debian/libsuitesparse-dev.install
+++ b/debian/libsuitesparse-dev.install
@@ -1,37 +1,39 @@
-AMD/Lib/*.a /usr/lib
-AMD/Lib/*.so /usr/lib
+#!/usr/bin/dh-exec
+
+AMD/Lib/*.a /usr/lib/${DEB_HOST_MULTIARCH}/
+AMD/Lib/*.so /usr/lib/${DEB_HOST_MULTIARCH}/
 AMD/Include/*.h /usr/include/suitesparse
-CAMD/Lib/*.a /usr/lib
-CAMD/Lib/*.so /usr/lib
+CAMD/Lib/*.a /usr/lib/${DEB_HOST_MULTIARCH}/
+CAMD/Lib/*.so /usr/lib/${DEB_HOST_MULTIARCH}/
 CAMD/Include/*.h /usr/include/suitesparse
-BTF/Lib/*.a /usr/lib
-BTF/Lib/*.so /usr/lib
+BTF/Lib/*.a /usr/lib/${DEB_HOST_MULTIARCH}/
+BTF/Lib/*.so /usr/lib/${DEB_HOST_MULTIARCH}/
 BTF/Include/*.h /usr/include/suitesparse
-CCOLAMD/Lib/*.a /usr/lib
-CCOLAMD/Lib/*.so /usr/lib
+CCOLAMD/Lib/*.a /usr/lib/${DEB_HOST_MULTIARCH}/
+CCOLAMD/Lib/*.so /usr/lib/${DEB_HOST_MULTIARCH}/
 CCOLAMD/Include/*.h /usr/include/suitesparse
-COLAMD/Lib/*.a /usr/lib
-COLAMD/Lib/*.so /usr/lib
+COLAMD/Lib/*.a /usr/lib/${DEB_HOST_MULTIARCH}/
+COLAMD/Lib/*.so /usr/lib/${DEB_HOST_MULTIARCH}/
 COLAMD/Include/*.h /usr/include/suitesparse
-KLU/Lib/*.a /usr/lib
-KLU/Lib/*.so /usr/lib
+KLU/Lib/*.a /usr/lib/${DEB_HOST_MULTIARCH}/
+KLU/Lib/*.so /usr/lib/${DEB_HOST_MULTIARCH}/
 KLU/Include/*.h /usr/include/suitesparse
-LDL/Lib/*.a /usr/lib
-LDL/Lib/*.so /usr/lib
+LDL/Lib/*.a /usr/lib/${DEB_HOST_MULTIARCH}/
+LDL/Lib/*.so /usr/lib/${DEB_HOST_MULTIARCH}/
 LDL/Include/*.h /usr/include/suitesparse
-CSparse/Lib/*.a /usr/lib
-CSparse/Lib/*.so /usr/lib
+CSparse/Lib/*.a /usr/lib/${DEB_HOST_MULTIARCH}/
+CSparse/Lib/*.so /usr/lib/${DEB_HOST_MULTIARCH}/
 CSparse/Include/*.h /usr/include/suitesparse
-CXSparse/Lib/*.a /usr/lib
-CXSparse/Lib/*.so /usr/lib
+CXSparse/Lib/*.a /usr/lib/${DEB_HOST_MULTIARCH}/
+CXSparse/Lib/*.so /usr/lib/${DEB_HOST_MULTIARCH}/
 CXSparse/Include/*.h /usr/include/suitesparse
-CHOLMOD/Lib/*.a /usr/lib
-CHOLMOD/Lib/*.so /usr/lib
+CHOLMOD/Lib/*.a /usr/lib/${DEB_HOST_MULTIARCH}/
+CHOLMOD/Lib/*.so /usr/lib/${DEB_HOST_MULTIARCH}/
 CHOLMOD/Include/*.h /usr/include/suitesparse
-UMFPACK/Lib/*.a /usr/lib
-UMFPACK/Lib/*.so /usr/lib
+UMFPACK/Lib/*.a /usr/lib/${DEB_HOST_MULTIARCH}/
+UMFPACK/Lib/*.so /usr/lib/${DEB_HOST_MULTIARCH}/
 UMFPACK/Include/*.h /usr/include/suitesparse
 SuiteSparse_config/*.h /usr/include/suitesparse
-SPQR/Lib/*.a /usr/lib
+SPQR/Lib/*.a /usr/lib/${DEB_HOST_MULTIARCH}/
 SPQR/Include/*.h /usr/include/suitesparse
 SPQR/Include/*.hpp /usr/include/suitesparse

-- 
Debian packaging for suitesparse



More information about the debian-science-commits mailing list