diff -Nru aster-11.5.0+dfsg2/debian/changelog aster-11.5.0+dfsg2/debian/changelog --- aster-11.5.0+dfsg2/debian/changelog 2014-08-04 10:18:27.000000000 +0000 +++ aster-11.5.0+dfsg2/debian/changelog 2015-12-12 17:38:56.000000000 +0000 @@ -1,3 +1,11 @@ +aster (11.5.0+dfsg2-3+rpi1) stretch-staging; urgency=medium + + * Force new include path for petsc fortran stuff. + * Change PETSC_DEFAULT_DOUBLE_PRECISION to PETSC_DEFAULT_REAL as hinted at by http://lists.mcs.anl.gov/pipermail/petsc-users/2014-February/020567.html + * Fix clean target. + + -- Peter Michael Green Fri, 11 Dec 2015 00:53:43 +0000 + aster (11.5.0+dfsg2-3) unstable; urgency=medium * Team upload. diff -Nru aster-11.5.0+dfsg2/debian/patches/0011-petsc-default.patch aster-11.5.0+dfsg2/debian/patches/0011-petsc-default.patch --- aster-11.5.0+dfsg2/debian/patches/0011-petsc-default.patch 1970-01-01 00:00:00.000000000 +0000 +++ aster-11.5.0+dfsg2/debian/patches/0011-petsc-default.patch 2015-12-11 03:35:46.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Change PETSC_DEFAULT_DOUBLE_PRECISION to PETSC_DEFAULT_REAL as hinted at by http://lists.mcs.anl.gov/pipermail/petsc-users/2014-February/020567.html +Author: Peter Michael Green + +--- aster-11.5.0+dfsg2.orig/bibfor/petsc/apksp.F90 ++++ aster-11.5.0+dfsg2/bibfor/petsc/apksp.F90 +@@ -103,8 +103,8 @@ subroutine apksp(kptsc) + endif + ! + rtol = resire +- atol = PETSC_DEFAULT_DOUBLE_PRECISION +- dtol = PETSC_DEFAULT_DOUBLE_PRECISION ++ atol = PETSC_DEFAULT_REAL ++ dtol = PETSC_DEFAULT_REAL + ! + call KSPSetTolerances(ksp, rtol, atol, dtol, maxits,& + ierr) diff -Nru aster-11.5.0+dfsg2/debian/patches/series aster-11.5.0+dfsg2/debian/patches/series --- aster-11.5.0+dfsg2/debian/patches/series 2014-08-04 10:07:55.000000000 +0000 +++ aster-11.5.0+dfsg2/debian/patches/series 2015-12-11 03:35:26.000000000 +0000 @@ -8,3 +8,4 @@ 0008-Disable-BLACS-checks.patch 0009-Fix-NumPy-version-comparison.patch 0010-Check-that-DEST_CPU-exists-before-reading-it.patch +0011-petsc-default.patch diff -Nru aster-11.5.0+dfsg2/debian/rules aster-11.5.0+dfsg2/debian/rules --- aster-11.5.0+dfsg2/debian/rules 2014-08-04 10:13:49.000000000 +0000 +++ aster-11.5.0+dfsg2/debian/rules 2015-12-12 17:44:21.000000000 +0000 @@ -11,6 +11,9 @@ ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)/libhdf5.so),) export DEB_CPPFLAGS_MAINT_APPEND := -I/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL) + export DEB_FCFLAGS_MAINT_APPEND := -I/usr/lib/petscdir/3.6.2/$(DEB_HOST_MULTIARCH)-real/include/petsc/ + export DEB_FFLAGS_MAINT_APPEND := -I/usr/lib/petscdir/3.6.2/$(DEB_HOST_MULTIARCH)-real/include/petsc/ + export DEB_CFLAGS_MAINT_APPEND := -I/usr/lib/petscdir/3.6.2/$(DEB_HOST_MULTIARCH)-real/include/petsc/ export DEB_LDFLAGS_MAINT_APPEND := -Wl,-L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL) endif @@ -23,6 +26,8 @@ find . -name "fort.\*" -delete find . -name "glob.\*" -delete find . -name "vola.\*" -delete + rm -rf build + rm -f .lock-waf* configure override_dh_auto_configure: ./waf configure --install-tests --prefix=/usr \