diff -Nru petsc-3.4.2.dfsg1/debian/changelog petsc-3.4.2.dfsg1/debian/changelog --- petsc-3.4.2.dfsg1/debian/changelog 2013-11-02 21:12:50.000000000 +0000 +++ petsc-3.4.2.dfsg1/debian/changelog 2013-12-11 09:30:22.000000000 +0000 @@ -1,3 +1,14 @@ +petsc (3.4.2.dfsg1-6) unstable; urgency=medium + + * Team upload. + * Fix mangling of dfsg suffix in debian/watch (Closes: #730151) + * Transition to suitesparse 4.2.1 (Closes: #708398) + + umfpack.patch: remove patch, no longer needed + + bump build-dependency version + * Bump Standards-Version to 3.9.5, no changes needed. + + -- Sébastien Villemot Wed, 11 Dec 2013 10:30:05 +0100 + petsc (3.4.2.dfsg1-5) unstable; urgency=low * Team upload. diff -Nru petsc-3.4.2.dfsg1/debian/control petsc-3.4.2.dfsg1/debian/control --- petsc-3.4.2.dfsg1/debian/control 2013-11-02 21:03:47.000000000 +0000 +++ petsc-3.4.2.dfsg1/debian/control 2013-12-11 09:27:51.000000000 +0000 @@ -3,11 +3,11 @@ Priority: extra Maintainer: Debian Science Maintainers Uploaders: "Adam C. Powell, IV" -Standards-Version: 3.9.2 +Standards-Version: 3.9.5 Build-Depends: debhelper (>= 7.0.50), quilt, python (>= 2.2), gfortran, autotools-dev, libx11-dev, mpi-default-dev (>= 1.0.2), libblas-dev, liblapack-dev, - libsuitesparse-dev (>= 3.1.0-2), + libsuitesparse-dev (>= 1:4.2.1), libspooles-dev (>= 2.2-6), libhypre-dev (>= 2.4.0), libptscotch-dev, libhdf5-mpi-dev (>= 1.8.8), libblacs-mpi-dev, libscalapack-mpi-dev, libmumps-dev, diff -Nru petsc-3.4.2.dfsg1/debian/patches/series petsc-3.4.2.dfsg1/debian/patches/series --- petsc-3.4.2.dfsg1/debian/patches/series 2013-11-02 21:00:39.000000000 +0000 +++ petsc-3.4.2.dfsg1/debian/patches/series 2013-12-11 09:26:13.000000000 +0000 @@ -10,5 +10,4 @@ #mumps.patch hypre.patch nocleanup.patch -umfpack.patch g++-4.8.patch diff -Nru petsc-3.4.2.dfsg1/debian/patches/umfpack.patch petsc-3.4.2.dfsg1/debian/patches/umfpack.patch --- petsc-3.4.2.dfsg1/debian/patches/umfpack.patch 2013-09-10 20:47:25.000000000 +0000 +++ petsc-3.4.2.dfsg1/debian/patches/umfpack.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -A kludge to get PETSc to compile with SuiteSparse 3.4.0: -replace Control[UMFPACK_ORDERING] with Info[UMFPACK_ORDERING_USED] - -It compiles, but runtime behavior is unpredictable at best. - -Index: petsc-3.4.2/src/mat/impls/aij/seq/umfpack/umfpack.c -=================================================================== ---- petsc-3.4.2.orig/src/mat/impls/aij/seq/umfpack/umfpack.c 2013-08-20 15:35:46.000000000 +0200 -+++ petsc-3.4.2/src/mat/impls/aij/seq/umfpack/umfpack.c 2013-08-20 15:35:46.000000000 +0200 -@@ -308,7 +308,7 @@ - - /* mat ordering */ - if (!lu->PetscMatOrdering) { -- ierr = PetscViewerASCIIPrintf(viewer," Control[UMFPACK_ORDERING]: %s (not using the PETSc ordering)\n",UmfpackOrderingTypes[(int)lu->Control[UMFPACK_ORDERING]]);CHKERRQ(ierr); -+ ierr = PetscViewerASCIIPrintf(viewer," Info[UMFPACK_ORDERING_USED]: %s (not using the PETSc ordering)\n",UmfpackOrderingTypes[(int)lu->Info[UMFPACK_ORDERING_USED]]);CHKERRQ(ierr); - } - PetscFunctionReturn(0); - } -@@ -427,8 +427,8 @@ - case 2: lu->Control[UMFPACK_STRATEGY] = UMFPACK_STRATEGY_SYMMETRIC; break; - } - } -- ierr = PetscOptionsEList("-mat_umfpack_ordering","Internal ordering method","None",UmfpackOrderingTypes,sizeof(UmfpackOrderingTypes)/sizeof(UmfpackOrderingTypes[0]),UmfpackOrderingTypes[(int)lu->Control[UMFPACK_ORDERING]],&idx,&flg);CHKERRQ(ierr); -- if (flg) lu->Control[UMFPACK_ORDERING] = (int)idx; -+ ierr = PetscOptionsEList("-mat_umfpack_ordering","Internal ordering method","None",UmfpackOrderingTypes,sizeof UmfpackOrderingTypes/sizeof UmfpackOrderingTypes[0],UmfpackOrderingTypes[(int)lu->Info[UMFPACK_ORDERING_USED]],&idx,&flg);CHKERRQ(ierr); -+ if (flg) lu->Info[UMFPACK_ORDERING_USED] = (int)idx; - ierr = PetscOptionsReal("-mat_umfpack_dense_col","Control[UMFPACK_DENSE_COL]","None",lu->Control[UMFPACK_DENSE_COL],&lu->Control[UMFPACK_DENSE_COL],NULL);CHKERRQ(ierr); - ierr = PetscOptionsReal("-mat_umfpack_dense_row","Control[UMFPACK_DENSE_ROW]","None",lu->Control[UMFPACK_DENSE_ROW],&lu->Control[UMFPACK_DENSE_ROW],NULL);CHKERRQ(ierr); - ierr = PetscOptionsReal("-mat_umfpack_amd_dense","Control[UMFPACK_AMD_DENSE]","None",lu->Control[UMFPACK_AMD_DENSE],&lu->Control[UMFPACK_AMD_DENSE],NULL);CHKERRQ(ierr); diff -Nru petsc-3.4.2.dfsg1/debian/watch petsc-3.4.2.dfsg1/debian/watch --- petsc-3.4.2.dfsg1/debian/watch 2013-09-10 20:47:25.000000000 +0000 +++ petsc-3.4.2.dfsg1/debian/watch 2013-12-10 19:26:06.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -opts=dversionmangle=s/\.dfsg// \ +opts=dversionmangle=s/\.dfsg\d// \ http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-([\d\.]+).tar.gz