diff -Nru sparskit-2.0.0/debian/changelog sparskit-2.0.0/debian/changelog --- sparskit-2.0.0/debian/changelog 2020-03-23 06:26:05.000000000 +0000 +++ sparskit-2.0.0/debian/changelog 2021-02-03 15:37:21.000000000 +0000 @@ -1,14 +1,21 @@ -sparskit (2.0.0-3build2) focal; urgency=medium +sparskit (2.0.0-4) unstable; urgency=medium - * No-change rebuild for libgcc-s1 package name change. + * Team upload. + * Fix FTBFS with gcc-10. (Closes: #957828) + * Standards-Version: 4.5.1 (routine-update) + * debhelper-compat 13 (routine-update) + * Remove trailing whitespace in debian/rules (routine-update) + * Add salsa-ci file (routine-update) + * Rules-Requires-Root: no (routine-update) + * Use versioned copyright format URI. + * Use secure URI in Homepage field. + * Use canonical URL in Vcs-Browser. + * Restore a instead of 8 spaces in d/rules. + * Restore a missing endif in d/rules dh_auto_test target. + * Fix typo caught by lintian. + * Glue the License field in d/copyright. - -- Matthias Klose Mon, 23 Mar 2020 07:26:05 +0100 - -sparskit (2.0.0-3build1) cosmic; urgency=medium - - * No-change rebuild for libgfortran soname change. - - -- Matthias Klose Tue, 17 Jul 2018 12:21:37 +0000 + -- Étienne Mollier Wed, 03 Feb 2021 16:37:21 +0100 sparskit (2.0.0-3) unstable; urgency=medium diff -Nru sparskit-2.0.0/debian/compat sparskit-2.0.0/debian/compat --- sparskit-2.0.0/debian/compat 2018-01-29 13:01:02.000000000 +0000 +++ sparskit-2.0.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru sparskit-2.0.0/debian/control sparskit-2.0.0/debian/control --- sparskit-2.0.0/debian/control 2018-01-29 13:01:02.000000000 +0000 +++ sparskit-2.0.0/debian/control 2021-02-03 15:37:20.000000000 +0000 @@ -3,14 +3,15 @@ Uploaders: Dominique Belhachemi Section: libs Priority: optional -Build-Depends: debhelper (>= 11~), +Build-Depends: debhelper-compat (= 13), gfortran, cmake, liblapack-dev -Standards-Version: 4.1.3 -Vcs-Browser: https://salsa.debian.org/science-team/sparskit.git +Standards-Version: 4.5.1 +Vcs-Browser: https://salsa.debian.org/science-team/sparskit Vcs-Git: https://salsa.debian.org/science-team/sparskit.git -Homepage: http://www-users.cs.umn.edu/~saad/software/SPARSKIT/ +Homepage: https://www-users.cs.umn.edu/~saad/software/SPARSKIT/ +Rules-Requires-Root: no Package: libsparskit2.0 Architecture: any diff -Nru sparskit-2.0.0/debian/copyright sparskit-2.0.0/debian/copyright --- sparskit-2.0.0/debian/copyright 2018-01-29 13:01:02.000000000 +0000 +++ sparskit-2.0.0/debian/copyright 2021-02-03 15:37:20.000000000 +0000 @@ -1,4 +1,4 @@ -Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Debianized-By: Dominique Belhachemi Debianized-Date: Thu, 11 Sep 2008 23:22:53 +0200 Original-Source: http://www-users.cs.umn.edu/~saad/software/SPARSKIT/sparskit.html @@ -7,7 +7,6 @@ Copyright: Copyright (C) 2005, the University of Minnesota, Yousef Saad, saad AT cs dot umn dot edu - License: LGPL-2.1 see `/usr/share/common-licenses/LGPL-2.1' diff -Nru sparskit-2.0.0/debian/patches/gcc-10.patch sparskit-2.0.0/debian/patches/gcc-10.patch --- sparskit-2.0.0/debian/patches/gcc-10.patch 1970-01-01 00:00:00.000000000 +0000 +++ sparskit-2.0.0/debian/patches/gcc-10.patch 2021-02-02 21:39:09.000000000 +0000 @@ -0,0 +1,37 @@ +Description: fix ftbfs with gcc-10 + This fixes the argument type mismatch in the csrcsc + call by introducing the one dimension vector iziama of type + real(8), instead of an integer(4) scalar, while trying to + maintain compatibility with Fortran 77. +Author: Étienne Mollier +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957828 +Forwarded: saad *at* cs *dot* umn *dot* edu +Last-Update: 2021-02-02 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- sparskit.orig/ORDERINGS/ccn.f ++++ sparskit/ORDERINGS/ccn.f +@@ -90,7 +90,7 @@ + c July 1992 - Update: March 1994 + C----------------------------------------------------------------------- + integer izs(nw), lpw(n), nsbloc(0:nblcmx), ia(n+1), ja(*) +- real*8 amat(*) ++ real*8 amat(*), iziama(1) + logical impr + character*6 chsubr + C----------------------------------------------------------------------- +@@ -147,10 +147,12 @@ + * ja, ia, izs(ilpw), izs(ilpw), job) + ipos = 1 + c..........We sort columns inside JA. +- call csrcsc(n, job, ipos, amat, ja, ia, izs(iamat), ++ iziama(1) = izs(iamat) ++ call csrcsc(n, job, ipos, amat, ja, ia, iziama, + * izs(ijat), izs(iiat)) +- call csrcsc(n, job, ipos, izs(iamat), izs(ijat), izs(iiat), ++ call csrcsc(n, job, ipos, iziama, izs(ijat), izs(iiat), + * amat, ja, ia) ++ izs(iamat) = iziama(1) + endif + c.....We modify the ordering of unknowns in LPW + call compos(n, lpw, izs(ilpw)) diff -Nru sparskit-2.0.0/debian/patches/series sparskit-2.0.0/debian/patches/series --- sparskit-2.0.0/debian/patches/series 2018-01-29 13:01:02.000000000 +0000 +++ sparskit-2.0.0/debian/patches/series 2021-02-02 22:04:42.000000000 +0000 @@ -1 +1,3 @@ 50_all_changes.diff +gcc-10.patch +spelling.patch diff -Nru sparskit-2.0.0/debian/patches/spelling.patch sparskit-2.0.0/debian/patches/spelling.patch --- sparskit-2.0.0/debian/patches/spelling.patch 1970-01-01 00:00:00.000000000 +0000 +++ sparskit-2.0.0/debian/patches/spelling.patch 2021-02-02 22:04:19.000000000 +0000 @@ -0,0 +1,17 @@ +Description: fix spelling caught by lintian +Author: Étienne Mollier +Forwarded: no +Last-Update: 2021-02-02 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- sparskit.orig/INOUT/inout.f ++++ sparskit/INOUT/inout.f +@@ -1386,7 +1386,7 @@ + c if can't write the data to the I/O unit specified, should be able to + c write everything to standard output (unit 6) + c +- 1000 write(0, *) 'Error, Can''t write data to sepcified unit',iounit ++ 1000 write(0, *) 'Error, Can''t write data to specified unit',iounit + write(0, *) 'Write the matrix into standard output instead!' + ierr = 1 + write(6,*) n diff -Nru sparskit-2.0.0/debian/rules sparskit-2.0.0/debian/rules --- sparskit-2.0.0/debian/rules 2018-01-29 13:01:02.000000000 +0000 +++ sparskit-2.0.0/debian/rules 2021-02-03 15:37:20.000000000 +0000 @@ -36,21 +36,23 @@ && cmake $(CURDIR) $(CMAKE_FLAGS) -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_TESTING:BOOL=OFF override_dh_auto_build: - # build static libs + # build static libs $(MAKE) $(JOBS) -C $(STATIC_BUILD_PATH) # build shared libs and binaries $(MAKE) $(JOBS) -C $(SHARED_BUILD_PATH) override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) # run a test ./DEB_build_static/ITSOL/riters.ex +endif override_dh_clean: rm -rf $(STATIC_BUILD_PATH) rm -rf $(SHARED_BUILD_PATH) # - rm libskit.a - dh_clean + dh_clean override_dh_auto_install: $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install -C $(STATIC_BUILD_PATH) diff -Nru sparskit-2.0.0/debian/salsa-ci.yml sparskit-2.0.0/debian/salsa-ci.yml --- sparskit-2.0.0/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ sparskit-2.0.0/debian/salsa-ci.yml 2021-02-02 21:52:59.000000000 +0000 @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml