[suitesparse] 05/07: Bump to debhelper compat level 11:

Sébastien Villemot sebastien at debian.org
Mon Dec 25 21:27:37 UTC 2017 

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

sebastien pushed a commit to branch master
in repository suitesparse.

commit 6f482b4739928ad25b50bb8f75911362585a8278
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Dec 25 21:49:01 2017 +0100

    Bump to debhelper compat level 11:
    
    - documentation now installed under /u/s/doc/libsuitesparse-dev
    - directly call make instead of dh_auto_build (the latter messes up with the
      INSTALL parameter)
    
    Gbp-Dch: Full
---
 debian/compat                                 |  2 +-
 debian/control                                |  2 +-
 debian/libsuitesparse-doc.doc-base.amd        |  2 +-
 debian/libsuitesparse-doc.doc-base.camd       |  2 +-
 debian/libsuitesparse-doc.doc-base.cholmod    |  2 +-
 debian/libsuitesparse-doc.doc-base.graphblas  |  2 +-
 debian/libsuitesparse-doc.doc-base.klu        |  2 +-
 debian/libsuitesparse-doc.doc-base.ldl        |  2 +-
 debian/libsuitesparse-doc.doc-base.spqr       |  2 +-
 debian/libsuitesparse-doc.doc-base.umfpack-qg |  2 +-
 debian/libsuitesparse-doc.doc-base.umfpack-ug |  2 +-
 debian/rules                                  | 11 +++++++++--
 12 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index fee0bcf..40237a2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.
 Uploaders: Sébastien Villemot <sebastien at debian.org>
 Section: math
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11),
                gfortran,
                libblas-dev,
                liblapack-dev,
diff --git a/debian/libsuitesparse-doc.doc-base.amd b/debian/libsuitesparse-doc.doc-base.amd
index 81b0766..31543b9 100644
--- a/debian/libsuitesparse-doc.doc-base.amd
+++ b/debian/libsuitesparse-doc.doc-base.amd
@@ -6,4 +6,4 @@ Abstract: AMD is a set of routines for permuting sparse matrices prior to
 Section: Programming
 
 Format: PDF
-Files: /usr/share/doc/libsuitesparse-doc/AMD_UserGuide.pdf
+Files: /usr/share/doc/libsuitesparse-dev/AMD_UserGuide.pdf
diff --git a/debian/libsuitesparse-doc.doc-base.camd b/debian/libsuitesparse-doc.doc-base.camd
index 65abe4f..1b58dbc 100644
--- a/debian/libsuitesparse-doc.doc-base.camd
+++ b/debian/libsuitesparse-doc.doc-base.camd
@@ -8,4 +8,4 @@ Abstract: CAMD is a set of ANSI C routines that implements the approximate
 Section: Programming
 
 Format: PDF
-Files: /usr/share/doc/libsuitesparse-doc/CAMD_UserGuide.pdf
+Files: /usr/share/doc/libsuitesparse-dev/CAMD_UserGuide.pdf
diff --git a/debian/libsuitesparse-doc.doc-base.cholmod b/debian/libsuitesparse-doc.doc-base.cholmod
index 2760eb6..945ee53 100644
--- a/debian/libsuitesparse-doc.doc-base.cholmod
+++ b/debian/libsuitesparse-doc.doc-base.cholmod
@@ -5,4 +5,4 @@ Abstract: Cholmod is a set of routines for sparse Cholesky factorization. It is
 Section: Programming
 
 Format: PDF
-Files: /usr/share/doc/libsuitesparse-doc/CHOLMOD_UserGuide.pdf
+Files: /usr/share/doc/libsuitesparse-dev/CHOLMOD_UserGuide.pdf
diff --git a/debian/libsuitesparse-doc.doc-base.graphblas b/debian/libsuitesparse-doc.doc-base.graphblas
index 69c3477..1662cea 100644
--- a/debian/libsuitesparse-doc.doc-base.graphblas
+++ b/debian/libsuitesparse-doc.doc-base.graphblas
@@ -11,4 +11,4 @@ Abstract: SuiteSparse:GraphBLAS is an full implementation of the GraphBLAS stand
 Section: Programming
 
 Format: PDF
-Files: /usr/share/doc/libsuitesparse-doc/GraphBLAS_UserGuide.pdf
+Files: /usr/share/doc/libsuitesparse-dev/GraphBLAS_UserGuide.pdf
diff --git a/debian/libsuitesparse-doc.doc-base.klu b/debian/libsuitesparse-doc.doc-base.klu
index f79c26a..dab2457 100644
--- a/debian/libsuitesparse-doc.doc-base.klu
+++ b/debian/libsuitesparse-doc.doc-base.klu
@@ -11,4 +11,4 @@ Abstract: KLU is a set of routines for solving sparse linear systems of
 Section: Programming
 
 Format: PDF
-Files: /usr/share/doc/libsuitesparse-doc/KLU_UserGuide.pdf
+Files: /usr/share/doc/libsuitesparse-dev/KLU_UserGuide.pdf
diff --git a/debian/libsuitesparse-doc.doc-base.ldl b/debian/libsuitesparse-doc.doc-base.ldl
index dffdbe0..0804b5f 100644
--- a/debian/libsuitesparse-doc.doc-base.ldl
+++ b/debian/libsuitesparse-doc.doc-base.ldl
@@ -13,4 +13,4 @@ Abstract: The LDL software package is a set of short, concise routines for
 Section: Programming
 
 Format: PDF
-Files: /usr/share/doc/libsuitesparse-doc/ldl_userguide.pdf
+Files: /usr/share/doc/libsuitesparse-dev/ldl_userguide.pdf
diff --git a/debian/libsuitesparse-doc.doc-base.spqr b/debian/libsuitesparse-doc.doc-base.spqr
index 9fb4e98..d2617e9 100644
--- a/debian/libsuitesparse-doc.doc-base.spqr
+++ b/debian/libsuitesparse-doc.doc-base.spqr
@@ -11,4 +11,4 @@ Abstract: SuiteSparseQR is an implementation of the multifrontal sparse QR
 Section: Programming
 
 Format: PDF
-Files: /usr/share/doc/libsuitesparse-doc/spqr_user_guide.pdf
+Files: /usr/share/doc/libsuitesparse-dev/spqr_user_guide.pdf
diff --git a/debian/libsuitesparse-doc.doc-base.umfpack-qg b/debian/libsuitesparse-doc.doc-base.umfpack-qg
index dec310a..1143c90 100644
--- a/debian/libsuitesparse-doc.doc-base.umfpack-qg
+++ b/debian/libsuitesparse-doc.doc-base.umfpack-qg
@@ -5,4 +5,4 @@ Abstract: UMFPACK is a set of routines for solving unsymmetric sparse linear sys
 Section: Programming
 
 Format: PDF
-Files: /usr/share/doc/libsuitesparse-doc/UMFPACK_QuickStart.pdf
+Files: /usr/share/doc/libsuitesparse-dev/UMFPACK_QuickStart.pdf
diff --git a/debian/libsuitesparse-doc.doc-base.umfpack-ug b/debian/libsuitesparse-doc.doc-base.umfpack-ug
index 58ed1cd..fd02819 100644
--- a/debian/libsuitesparse-doc.doc-base.umfpack-ug
+++ b/debian/libsuitesparse-doc.doc-base.umfpack-ug
@@ -5,4 +5,4 @@ Abstract: UMFPACK is a set of routines for solving unsymmetric sparse linear sys
 Section: Programming
 
 Format: PDF
-Files: /usr/share/doc/libsuitesparse-doc/UMFPACK_UserGuide.pdf
+Files: /usr/share/doc/libsuitesparse-dev/UMFPACK_UserGuide.pdf
diff --git a/debian/rules b/debian/rules
index bdb5d13..7e3ae5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,13 @@ STATIC_LIBS := CAMD/Lib/libcamd.a BTF/Lib/libbtf.a CHOLMOD/Lib/libcholmod.a AMD/
 
 PDF_DOCS := AMD/Doc/AMD_UserGuide.pdf CAMD/Doc/CAMD_UserGuide.pdf CHOLMOD/Doc/CHOLMOD_UserGuide.pdf GraphBLAS/Doc/GraphBLAS_UserGuide.pdf KLU/Doc/KLU_UserGuide.pdf UMFPACK/Doc/UMFPACK_QuickStart.pdf UMFPACK/Doc/UMFPACK_UserGuide.pdf LDL/Doc/ldl_userguide.pdf SPQR/Doc/spqr_user_guide.pdf
 
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NUMJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+NUMJOBS := 1
+endif
+
+
 %:
 	dh $@
 
@@ -25,12 +32,12 @@ override_dh_auto_build:
 	make docs
 
 	# Build static libraries (except GraphBLAS, see graphblas-build.patch)
-	dh_auto_build -- static $(NOPIC_FLAGS)
+	make -j$(NUMJOBS) static $(NOPIC_FLAGS)
 	mkdir static_lib && cp $(STATIC_LIBS) static_lib/
 	make purge
 
 	# Build dynamic libraries (and GraphBLAS static)
-	LD_LIBRARY_PATH=$$(pwd)/lib dh_auto_build -- $(PIC_FLAGS)
+	LD_LIBRARY_PATH=$$(pwd)/lib make -j$(NUMJOBS) $(PIC_FLAGS)
 
 override_dh_auto_install:
 	# DESTDIR is used by cmake (for GraphBLAS), the INSTALL* vars are used by other libs

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

More information about the debian-science-commits mailing list