[petsc] 01/02: Merge branch 'master' into experimental
Drew Parsons
dparsons at moszumanska.debian.org
Sun Jun 5 17:39:11 UTC 2016
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to branch experimental
in repository petsc.
commit 81706b6a67ffba344a1abf1abbfef97d9e9783a7
Merge: 2b21134 efa96f0
Author: Drew Parsons <dparsons at debian.org>
Date: Mon Jun 6 01:31:44 2016 +0800
Merge branch 'master' into experimental
debian/README.Debian | 52 +++++++++++++++++++++++++++++++-
debian/changelog | 14 +++++++++
debian/control | 6 ++--
debian/libpetsc-complex-3.6-dev.postinst | 25 +++++++++++++++
debian/libpetsc-complex-3.6-dev.prerm | 18 +++++++++++
debian/libpetsc-complex-3.7.1.postinst | 4 +--
debian/libpetsc-complex-3.7.1.prerm | 3 +-
debian/libpetsc3.6-dev.postinst | 25 +++++++++++++++
debian/libpetsc3.6-dev.prerm | 18 +++++++++++
debian/libpetsc3.7.1.postinst | 4 +--
debian/libpetsc3.7.1.prerm | 3 +-
debian/rules | 6 ++--
12 files changed, 161 insertions(+), 17 deletions(-)
diff --cc debian/README.Debian
index ca1ad6d,8c8ed86..63cd886
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@@ -17,15 -17,21 +17,21 @@@ configuration may be set using alternat
The preferred PETSc installation is located at /usr/lib/petsc. This is a symlink
to the actual installation, managed by Debian alternatives (see below). The
- standard installation is located at
+ standard installation is located at
/usr/lib/petscdir/<PETSC_VERSION>/<arch>
e.g.
- /usr/lib/petscdir/3.6.4/x86_64-linux-gnu
+ /usr/lib/petscdir/3.7.1/x86_64-linux-gnu
-Preferred minor patch versions of each major version (e.g. 3.6)
++Preferred minor patch versions of each major version (e.g. 3.7)
+ are linked via
- /usr/lib/petscdir/3.6
-(also, preferred versions of 3.6-real and 3.6-complex). These links are
++ /usr/lib/petscdir/3.7
++(also, preferred versions of 3.7-real and 3.7-complex). These links are
+ controlled by alternatives.
+
-libpetsc.so is also controlled by alternatives (libpetsc.so.3.6)
+libpetsc.so is also controlled by alternatives (libpetsc.so.3.7)
-With libpetsc3.6.4-dev installed, you can build programs against it two ways:
+With libpetsc3.7.1-dev installed, you can build programs against it two ways:
1. Standard build convention: use -I/usr/include/petsc for headers and
link to optimized libraries in /usr/lib, so your resulting binaries
@@@ -137,12 -143,19 +143,19 @@@ links if you have multiple versions of
there is more than one.
When setting your preference for /usr/lib/petsc via "update-alternatives --config petsc",
-it is important for consistency to also update your preference for the
-main shared library files provided by libpetsc3.6 or libpetsc-complex-3.6.
-These alternative links are controlled by libpetsc.so.3.6:
+it is important for consistency to also update your preference for the
+main shared library files provided by libpetsc3.7 or libpetsc-complex-3.7.
+These alternative links are controlled by libpetsc.so.3.7:
- update-alternatives --config libpetsc.so.3.6
+ update-alternatives --config libpetsc.so.3.7
+ The preferred alternative for the major petsc version (e.g. 3.6) is linked in
+ /usr/lib/petscdir/3.6 and set by
+
+ update-alternatives --config petsc3.6
+
+ Alternatives are similarly available for petsc3.6-real and petsc3.6-complex
+
To maintain the consistency of the master and slave symlinks, it is very
important that you use the Debian update-alternatives command, and do NOT
hand-edit the symbolic links yourself.
diff --cc debian/changelog
index 36cb0e3,ee4dd05..4b83d21
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,11 +1,25 @@@
++petsc (3.7.1.dfsg1-2) UNRELEASED; urgency=medium
++
++ *
++
++ -- Drew Parsons <dparsons at debian.org> Mon, 06 Jun 2016 01:24:49 +0800
++
+petsc (3.7.1.dfsg1-1) experimental; urgency=medium
+
+ * New upstream version. New ABI 3.7
+ * Temporarily disable SuperLU support:
+ PETSc 3.7 requires SuperLU 5.2.
+
+ -- Drew Parsons <dparsons at debian.org> Fri, 20 May 2016 01:18:11 +0800
+
+ petsc (3.6.4.dfsg1-2) unstable; urgency=medium
+
+ * Use alternatives to set default versions for soname (3.6) in
+ /usr/lib/petscdir/, including real and complex versions.
+ * PETSc 3.6 requires a SuperLU version less than 5.2.
+
+ -- Drew Parsons <dparsons at debian.org> Sun, 05 Jun 2016 22:37:20 +0800
+
petsc (3.6.4.dfsg1-1) unstable; urgency=low
* New upstream version.
diff --cc debian/control
index 7d5e387,12dbbe1..b05fba1
--- a/debian/control
+++ b/debian/control
@@@ -48,9 -48,9 +48,9 @@@ Depends: libpetsc3.7.1 (= ${binary:Vers
${misc:Depends}, ${python:Depends}
Conflicts: libpetsc3.6.3-dev (<< 3.6.3.dfsg2-2), libpetsc-complex-3.6.3-dev (<< 3.6.3.dfsg2-2),
libpetsc3.6.2-dev (<= 3.6.2.dfsg1-3), libpetsc-complex-3.6.2-dev (<= 3.6.2.dfsg1-3)
- Recommends: libhdf5-mpi-dev (>= 1.8.8),
+ Recommends: libhdf5-mpi-dev (>= 1.8.8), libsuperlu-dev (<< 5.2),
tcsh | csh | c-shell, ksh | mksh | pdksh | zsh
-Suggests: petsc-dev (= ${binary:Version}), libpetsc3.6.4-dbg (= ${binary:Version}), petsc3.6.4-doc (= ${binary:Version}), libluminate-dev
+Suggests: petsc-dev (= ${binary:Version}), libpetsc3.7.1-dbg (= ${binary:Version}), petsc3.7.1-doc (= ${binary:Version}), libluminate-dev
Description: Static libraries, shared links, header files for PETSc
PETSc is the "Portable Extensible Toolkit for Scientific Computation", a suite
of data structures and routines for the scalable (parallel) solution of
@@@ -168,9 -168,9 +168,9 @@@ Depends: libpetsc-complex-3.7.1 (= ${bi
${misc:Depends}, ${python:Depends}
Conflicts: libpetsc-complex-3.6.3-dev (<< 3.6.3.dfsg2-2), libpetsc3.6.3-dev (<< 3.6.3.dfsg2-2),
libpetsc3.6.2-dev (<= 3.6.2.dfsg1-3), libpetsc-complex-3.6.2-dev (<= 3.6.2.dfsg1-3)
- Recommends: libhdf5-mpi-dev (>= 1.8.8),
+ Recommends: libhdf5-mpi-dev (>= 1.8.8), libsuperlu-dev (<< 5.2),
tcsh | csh | c-shell, ksh | mksh | pdksh | zsh
-Suggests: petsc-dev (= ${binary:Version}), libpetsc-complex-3.6.4-dbg (= ${binary:Version}), petsc3.6.4-doc (= ${binary:Version}), libluminate-dev
+Suggests: petsc-dev (= ${binary:Version}), libpetsc-complex-3.7.1-dbg (= ${binary:Version}), petsc3.7.1-doc (= ${binary:Version}), libluminate-dev
Description: Static libraries, shared links, header files for PETSc
PETSc is the "Portable Extensible Toolkit for Scientific Computation", a suite
of data structures and routines for the scalable (parallel) solution of
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/petsc.git
More information about the debian-science-commits
mailing list