diff -Nru petsc-3.6.2.dfsg1/debian/changelog petsc-3.6.2.dfsg1/debian/changelog --- petsc-3.6.2.dfsg1/debian/changelog 2015-10-24 17:06:43.000000000 +0000 +++ petsc-3.6.2.dfsg1/debian/changelog 2016-02-09 20:54:46.000000000 +0000 @@ -1,3 +1,10 @@ +petsc (3.6.2.dfsg1-3ubuntu1~ppa1) xenial; urgency=medium + + * Replace deprecated MCA variable orte_rsh_agent with plm_rsh_agent. + * Skip 2 MPI process test to avoid FTBFS on buildds with limited RAM. + + -- Graham Inggs Tue, 09 Feb 2016 22:54:04 +0200 + petsc (3.6.2.dfsg1-3) unstable; urgency=medium * Add Depends: libssl-dev, libgfortran-5-dev to petsc dev packages. diff -Nru petsc-3.6.2.dfsg1/debian/patches/series petsc-3.6.2.dfsg1/debian/patches/series --- petsc-3.6.2.dfsg1/debian/patches/series 2015-10-24 17:06:43.000000000 +0000 +++ petsc-3.6.2.dfsg1/debian/patches/series 2016-02-09 20:51:52.000000000 +0000 @@ -13,3 +13,4 @@ g++-4.8.patch python_header soname_extension +skip-2-mpi-process-test.patch diff -Nru petsc-3.6.2.dfsg1/debian/patches/skip-2-mpi-process-test.patch petsc-3.6.2.dfsg1/debian/patches/skip-2-mpi-process-test.patch --- petsc-3.6.2.dfsg1/debian/patches/skip-2-mpi-process-test.patch 1970-01-01 00:00:00.000000000 +0000 +++ petsc-3.6.2.dfsg1/debian/patches/skip-2-mpi-process-test.patch 2016-02-09 20:24:10.000000000 +0000 @@ -0,0 +1,11 @@ +--- a/src/snes/examples/tutorials/makefile ++++ b/src/snes/examples/tutorials/makefile +@@ -916,7 +916,7 @@ + else echo "Possible error running C/C++ src/snes/examples/tutorials/ex19 with 1 MPI process"; \ + echo "See http://www.mcs.anl.gov/petsc/documentation/faq.html";\ + cat ex19_1.tmp; fi; \ +- if [ "${MPIEXEC}" != "${PETSC_DIR}/bin/petsc-mpiexec.uni" ]; then \ ++ if false; then \ + ${MPIEXEC} -n 2 ./ex19 -da_refine 3 -pc_type mg -ksp_type fgmres > ex19_1.tmp 2>&1; \ + if (${DIFF} output/ex19_1.testout ex19_1.tmp > /dev/null 2>&1) then \ + echo "C/C++ example src/snes/examples/tutorials/ex19 run successfully with 2 MPI processes"; \ diff -Nru petsc-3.6.2.dfsg1/debian/rules petsc-3.6.2.dfsg1/debian/rules --- petsc-3.6.2.dfsg1/debian/rules 2015-10-24 17:06:43.000000000 +0000 +++ petsc-3.6.2.dfsg1/debian/rules 2016-02-09 06:33:18.000000000 +0000 @@ -38,7 +38,7 @@ PETSC_MPI_DIR=/usr/lib/$(PETSC_MPI) # facilitate build-time testing (invoking OpenMPI) when building in a chroot (pbuilder or sbuild) -export OMPI_MCA_orte_rsh_agent=/bin/false +export OMPI_MCA_plm_rsh_agent=/bin/false PETSC_HDF5_FLAGS=$(shell if [ -e /usr/lib/libhdf5.so ]; then echo "--with-hdf5=1 --with-hdf5-dir=/usr"; fi)