[slepc] 01/02: Merge branch 'master' into experimental
Drew Parsons
dparsons at moszumanska.debian.org
Mon Jun 6 09:37:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to branch experimental
in repository slepc.
commit 78c5022d6884d5b651f054ae5cbeab4f64e6b040
Merge: 383d9e8 10b7bd2
Author: Drew Parsons <dparsons at debian.org>
Date: Mon Jun 6 17:35:33 2016 +0800
Merge branch 'master' into experimental
debian/README.Debian | 71 +++++++++++++++++++++-----------
debian/changelog | 8 ++++
debian/control | 6 ++-
debian/libslepc-complex-3.6-dev.postinst | 25 +++++++++++
debian/libslepc-complex-3.6-dev.prerm | 18 ++++++++
debian/libslepc-complex-3.7.0.postinst | 4 +-
debian/libslepc-complex-3.7.0.prerm | 3 +-
debian/libslepc3.6-dev.postinst | 25 +++++++++++
debian/libslepc3.6-dev.prerm | 18 ++++++++
debian/libslepc3.7.0.postinst | 4 +-
debian/libslepc3.7.0.prerm | 3 +-
debian/rules | 8 +++-
12 files changed, 157 insertions(+), 36 deletions(-)
diff --cc debian/README.Debian
index c10b3c5,ef242d1..843019f
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@@ -1,22 -1,8 +1,23 @@@
SLEPc for Debian
----------------
-With slepc-dev installed (or libslepc3.6-dev, or libslepc-real-3.6.3-dev
-or libslepc-complex-3.6.3-dev), you can build programs against it two ways:
+This source package includes the following binary packages:
+
+ libslepc3.7.0 - shared libraries
+ libslepc3.7-dev - static libraries, shared links, and header files
+ (latest v3.7)
+ libslepc3.7.0-dev - static libraries, shared links, and header files
+ (specific patch version 3.7.0)
+ slepc3.7.0-doc - documentation and examples
+
+The following binary packages include support for complex numbers:
+ libslepc-complex-3.7.0
+ libslepc-complex-3.7-dev
+ libslepc-complex-3.7.0-dev
+
+
- With libslepc3.7-dev installed, you can build programs against it two ways:
++With slepc-dev installed (or libslepc3.7-dev, or libslepc-3.7.0-dev
++or libslepc-complex-3.7.0-dev), you can build programs against it two ways:
1. Standard build convention: use -I/usr/include/slepc for headers and
link to optimized libraries in /usr/lib, so your resulting binaries
@@@ -30,31 -16,52 +31,55 @@@
PETSC_LIB_DIR=$PETSC_DIR/$PETSC_ARCH/lib SLEPC_DIR=/usr/lib/slepc \
SLEPC_LIB_DIR=$SLEPC_DIR/$PETSC_ARCH/lib make
- The slepc3.7-doc package comes with the full source code of the SLEPc
- examples. Just do:
-
- tar xzf /usr/share/doc/slepc3.7-doc/src.tar.gz
-
- then cd src/examples, and use the PETSc/SLEPc build convention make command
-The slepc3.6.3-doc package comes with the SLEPc examples in
-/usr/share/doc/slepc3.6.3-doc/examples/
++The slepc3.7.0-doc package comes with the SLEPc examples in
++/usr/share/doc/slepc3.7.0-doc/examples/
+ Copy as needed and use the PETSc/SLEPc build convention make command
above.
-
++See also README.Debian in the PETSc package for more related notes.
+
+Alternative SLEPc Versions
+--------------------------
+
- You may control the default version of SLEPc using update-alternatives:
-
- Control the default version (e.g. 3.6 vs 3.7), real or complex:
- slepc: controls the default SLEPc version (real or complex)
- libslepc_real.so: controls the default version with real numbers
- libslepc_complex.so: controls the default version with complex numbers
-
- Control the specific patch version of SLEPc 3.7
- (multiple patch versions can be co-installed e.g. 3.7.0 and 3.7.1)
- libslepc.so.3.7: controls the default 3.7 patch version (real or complex)
- libslepc_real.so.3.7: controls the 3.7 patch version with real numbers
- libslepc_complex.so.3.7: controls the 3.7 patch version with complex numbers
-
-
- See also README.Debian in the PETSc package for more related notes.
+ The preferred version of SLEPc (real or complex, the preferred minor
+ patch version) can be controlled using alternatives:
+ update-alternatives --config slepc
+ (other slepc alternatives are listed below)
+ Or PETSC_DIR and SLEPC_DIR can be set to the preferred version located under
+ /usr/lib/petscdir and /usr/lib/slepcdir.
+
-See also README.Debian in the PETSc package for more related notes.
-
+ The full set of SLEPc alternatives is:
+
+ slepc - set the default version (real or complex) of SLEPc (/usr/lib/slepc)
+
+ libslepc_real.so
+ - set the default SLEPc shared library with real number support
+
+ libslepc_complex.so
+ - set the default SLEPc shared library with complex number support
+
-slepc3.6
- - set the preferred minor patch version (real or complex) of SLEPc 3.6
- (/usr/lib/slepcdir/3.6)
++slepc3.7
++ - set the preferred minor patch version (real or complex) of SLEPc 3.7
++ (/usr/lib/slepcdir/3.7)
+
-slepc3.6-real
- - set the preferred minor patch version of SLEPc 3.6
- with real number support (/usr/lib/slepcdir/3.6-real)
++slepc3.7-real
++ - set the preferred minor patch version of SLEPc 3.7
++ with real number support (/usr/lib/slepcdir/3.7-real)
+
-slepc3.6-complex
- - set the preferred minor patch version of SLEPc 3.6
- with complex number support (/usr/lib/slepcdir/3.6-complex)
++slepc3.7-complex
++ - set the preferred minor patch version of SLEPc 3.7
++ with complex number support (/usr/lib/slepcdir/3.7-complex)
+
-libslepc.so.3.6
++libslepc.so.3.7
+ - set the preferred minor patch version (real or complex) for the
- shared library of SLEPc 3.6
++ shared library of SLEPc 3.7
+
-libslepc_real.so.3.6
++libslepc_real.so.3.7
+ - set the preferred minor patch version for the shared library
- of SLEPc 3.6 with real number support
++ of SLEPc 3.7 with real number support
+
-libslepc_complex.so.so.3.6
++libslepc_complex.so.3.7
+ - set the preferred minor patch version for the shared library
- of SLEPc 3.6 with complex number support
++ of SLEPc 3.7 with complex number support
+
-(likewise for other major versions in place of 3.6)
++(likewise for other major versions in place of 3.7)
diff --cc debian/changelog
index c8a48b1,c7310e8..d62a0df
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,11 +1,24 @@@
+slepc (3.7.0+dfsg1-1exp2) UNRELEASED; urgency=medium
+
+ *
+
+ -- Drew Parsons <dparsons at debian.org> Wed, 01 Jun 2016 20:33:51 +0800
+
+slepc (3.7.0+dfsg1-1~exp1) experimental; urgency=low
+
+ * New upstream version. New ABI 3.7.
+ Closes: #824759.
+
+ -- Drew Parsons <dparsons at debian.org> Tue, 24 May 2016 17:52:23 +0800
+
+ slepc (3.6.3.dfsg1-6) unstable; urgency=medium
+
+ * Use alternatives to set default versions for soname (3.6) in
+ /usr/lib/slepcdir, including real and complex versions.
+ * libslepc3.6.3-dev (and -complex) Depends: libparpack2-dev
+
+ -- Drew Parsons <dparsons at debian.org> Mon, 06 Jun 2016 08:41:38 +0800
+
slepc (3.6.3.dfsg1-5) unstable; urgency=medium
* Build doc package from files installed for the standard (real)
diff --cc debian/control
index 7588555,34a715f..86da50b
--- a/debian/control
+++ b/debian/control
@@@ -41,12 -41,13 +41,13 @@@ Description: Scalable Library for Eigen
which provides the static libraries, shared links, and header files
for SLEPC with real numbers.
-Package: libslepc3.6.3-dev
+Package: libslepc3.7.0-dev
Section: libdevel
Architecture: any
- Depends: libslepc3.7.0 (= ${binary:Version}), libpetsc3.7-dev, libarpack2-dev, libhdf5-mpi-dev,
-Depends: libslepc3.6.3 (= ${binary:Version}), libpetsc3.6-dev,
++Depends: libslepc3.7.0 (= ${binary:Version}), libpetsc3.7-dev,
+ libarpack2-dev, libparpack2-dev, libhdf5-mpi-dev,
${misc:Depends}, ${python:Depends}
-Suggests: slepc3.6.3-doc (= ${binary:Version})
+Suggests: slepc3.7.0-doc (= ${binary:Version})
Conflicts: libslepc2.3.2-dev
Description: Scalable Library for Eigenvalue Problem Computations
SLEPc is a software library for the solution of large scale sparse eigenvalue
@@@ -102,12 -103,13 +103,13 @@@ Description: Scalable Library for Eigen
which provides the static libraries, shared links, and header files
for SLEPC with complex numbers.
-Package: libslepc-complex-3.6.3-dev
+Package: libslepc-complex-3.7.0-dev
Section: libdevel
Architecture: any
- Depends: libslepc-complex-3.7.0 (= ${binary:Version}), libpetsc-complex-3.7-dev, libarpack2-dev, libhdf5-mpi-dev,
-Depends: libslepc-complex-3.6.3 (= ${binary:Version}), libpetsc-complex-3.6-dev,
++Depends: libslepc-complex-3.7.0 (= ${binary:Version}), libpetsc-complex-3.7-dev,
+ libarpack2-dev, libparpack2-dev, libhdf5-mpi-dev,
${misc:Depends}, ${python:Depends}
-Suggests: slepc3.6.3-doc (= ${binary:Version})
+Suggests: slepc3.7.0-doc (= ${binary:Version})
Conflicts: libslepc2.3.2-dev
Description: Scalable Library for Eigenvalue Problem Computations
SLEPc is a software library for the solution of large scale sparse eigenvalue
diff --cc debian/rules
index d56892e,658c042..a3904c2
--- a/debian/rules
+++ b/debian/rules
@@@ -77,11 -77,9 +77,17 @@@ PACKAGE_COMPLEX_INSTALL_BASEDIR=debian/
PACKAGE_COMPLEX_INSTALL_DIR=$(PACKAGE_COMPLEX_INSTALL_BASEDIR)/$(SLEPC_COMPLEX_DIR_PREFIX)
PETSC_SONAME_VERSION=$(SLEPC_SONAME_VERSION)
++<<<<<<< HEAD
+PETSC_DEV_PACKAGE=libpetsc$(PETSC_SONAME_VERSION)-dev
+PETSC_VERSION=$(shell dpkg -l $(PETSC_DEV_PACKAGE) | awk '/$(PETSC_DEV_PACKAGE)/ {print $$3}' | sed "s/.dfsg.*//" )
+PETSC_DIR=/usr/lib/petscdir/$(PETSC_VERSION)
+PETSC_DIR_REAL=$(PETSC_DIR)/$(DEB_HOST_MULTIARCH)-real
+PETSC_DIR_COMPLEX=$(PETSC_DIR)/$(DEB_HOST_MULTIARCH)-complex
++=======
+ PETSC_DIR=/usr/lib/petscdir/$(PETSC_SONAME_VERSION)
+ PETSC_DIR_REAL=$(PETSC_DIR)-real
+ PETSC_DIR_COMPLEX=$(PETSC_DIR)-complex
++>>>>>>> 10b7bd2e974c999a0cdcf49e0b03b7f96094140a
export SLEPC_DIR=$(CURDIR)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/slepc.git
More information about the debian-science-commits
mailing list