[petsc] 01/07: make minor (real) version X.Y packages only, drop patch X.Y.Z packages

Drew Parsons dparsons at moszumanska.debian.org
Wed Nov 1 18:34:30 UTC 2017


This is an automated email from the git hooks/post-receive script.

dparsons pushed a commit to branch experimental
in repository petsc.

commit 129a28f8b99d6cb85604749c0156859dea7b3854
Author: Drew Parsons <dparsons at debian.org>
Date:   Wed Nov 1 22:29:21 2017 +0800

    make minor (real) version X.Y packages only, drop patch X.Y.Z packages
    
    petsc versions should be binary compatible within a given minor
    version (Y in X.Y). So we should not need to provide separate patch
    release packages X.Y.Z.
    
    i.e. provide libpetsc-real3.8, not libpetsc-real3.8.0
    
    Explicitly add "-real" to the package name, so it matches the soname.
---
 debian/control                                     | 101 +++++----------
 ....8.0-dbg.dirs => libpetsc-complex-3.8-dbg.dirs} |   0
 ....postinst => libpetsc-complex-3.8-dbg.postinst} |   0
 ....0-dbg.prerm => libpetsc-complex-3.8-dbg.prerm} |   0
 ....8.0-dev.dirs => libpetsc-complex-3.8-dev.dirs} |   0
 ....8.0-dev.docs => libpetsc-complex-3.8-dev.docs} |   0
 ....postinst => libpetsc-complex-3.8-dev.postinst} |   0
 ....0-dev.prerm => libpetsc-complex-3.8-dev.prerm} |   0
 ...ides => libpetsc-complex-3.8.lintian-overrides} |   0
 ....8.0.postinst => libpetsc-complex-3.8.postinst} |   0
 ...plex-3.8.0.prerm => libpetsc-complex-3.8.prerm} |   0
 ...ex-3.8.0.shlibs => libpetsc-complex-3.8.shlibs} |   0
 ...libpetsc3.8.0-dbg.dirs => libpetsc3.8-dbg.dirs} |   0
 ...3.8.0-dbg.postinst => libpetsc3.8-dbg.postinst} |   0
 ...bpetsc3.8.0-dbg.prerm => libpetsc3.8-dbg.prerm} |   0
 ...libpetsc3.8.0-dev.dirs => libpetsc3.8-dev.dirs} |   0
 ...libpetsc3.8.0-dev.docs => libpetsc3.8-dev.docs} |   0
 ...8.0-dev.overrides => libpetsc3.8-dev.overrides} |   0
 ...3.8.0-dev.postinst => libpetsc3.8-dev.postinst} |   0
 ...bpetsc3.8.0-dev.prerm => libpetsc3.8-dev.prerm} |   0
 ...ian-overrides => libpetsc3.8.lintian-overrides} |   0
 ...libpetsc3.8.0.postinst => libpetsc3.8.postinst} |   0
 debian/{libpetsc3.8.0.prerm => libpetsc3.8.prerm}  |   0
 .../{libpetsc3.8.0.shlibs => libpetsc3.8.shlibs}   |   0
 ...tsc3.8.0-doc.doc-base => petsc3.8-doc.doc-base} |   0
 debian/{petsc3.8.0-doc.docs => petsc3.8-doc.docs}  |   0
 ...c3.8.0-doc.overrides => petsc3.8-doc.overrides} |   0
 debian/rules                                       | 140 ++++++++++-----------
 28 files changed, 97 insertions(+), 144 deletions(-)

diff --git a/debian/control b/debian/control
index 430c512..ac1dfd2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>, Drew Parsons <dparsons at debian.org>
 Standards-Version: 4.1.1
-Build-Depends: debhelper (>= 10), quilt, python (>= 2.2), gfortran, 
+Build-Depends: debhelper (>= 10), quilt, python (>= 2.2), gfortran,
  pkg-config, dh-python,
  mpi-default-dev (>= 1.0.2),
  libblas-dev, liblapack-dev,
@@ -18,31 +18,11 @@ Vcs-Git: git://anonscm.debian.org/debian-science/packages/petsc.git
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/petsc.git/
 Homepage: http://www.mcs.anl.gov/petsc
 
-Package: libpetsc3.8-dev
+Package: libpetsc-real3.8-dev
 Multi-Arch: same
 Architecture: any
 Section: libdevel
-Depends: libpetsc3.8.0-dev, ${misc:Depends}, ${python:Depends}
-Provides: petsc3.8-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
- scientific applications modeled by partial differential equations.  It employs
- the MPI standard for all message-passing communication.  Several sample
- scientific applications, as well as various papers and talks, demonstrate the
- features of the PETSc libraries.
- .
- This is a dummy package which depends on the latest version of PETSc 3.8 to 
- provide the development files needed for building applications.
- .
- The library soname is 3.8 (without specifying the patch version), so if you 
- want to build against PETSc 3.8 then you probably want to use this package.
-
-Package: libpetsc3.8.0-dev
-Multi-Arch: same
-Architecture: any
-Section: libdevel
-Depends: libpetsc3.8.0 (= ${binary:Version}), ${MPI:Depends}, libsuitesparse-dev, libspooles-dev,
+Depends: libpetsc-real3.8 (= ${binary:Version}), ${MPI:Depends}, libsuitesparse-dev, libspooles-dev,
  libhypre-dev (>= 2.0.0.dfsg-7), libptscotch-dev, libscalapack-mpi-dev,
  libmumps-dev, libfftw3-dev, libfftw3-mpi-dev, libssl-dev, gfortran,
  libhdf5-mpi-dev (>= 1.8.8), libsuperlu-dev (>= 5.2),
@@ -50,7 +30,7 @@ Depends: libpetsc3.8.0 (= ${binary:Version}), ${MPI:Depends}, libsuitesparse-dev
 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: tcsh | csh | c-shell, ksh | mksh | pdksh | zsh
-Suggests: petsc-dev, libpetsc3.8.0-dbg (= ${binary:Version}), petsc3.8.0-doc, libluminate-dev
+Suggests: petsc-dev, libpetsc-real3.8-dbg (= ${binary:Version}), petsc3.8-doc, 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
@@ -59,14 +39,13 @@ Description: Static libraries, shared links, header files for PETSc
  scientific applications, as well as various papers and talks, demonstrate the
  features of the PETSc libraries.
  .
- This package provides the development files for building applications 
- using PETSc 3.8.0.
+ This package provides the development files for building applications
+ using PETSc 3.8 with real numbers.
 
 Package: petsc-dev
 Architecture: all
 Section: libdevel
-Depends: libpetsc3.8-dev, ${misc:Depends}
-Suggests: libpetsc3.8.0-dbg
+Depends: libpetsc-real3.8-dev, ${misc:Depends}
 Description: Virtual package depending on latest PETSc development package
  PETSc is the "Portable Extensible Toolkit for Scientific Computation", a suite
  of data structures and routines for the scalable (parallel) solution of
@@ -75,10 +54,10 @@ Description: Virtual package depending on latest PETSc development package
  scientific applications, as well as various papers and talks, demonstrate the
  features of the PETSc libraries.
  .
- This metapackage will always depend on the most recent version of petscX-dev
+ This metapackage will always depend on the most recent version of libpetscX-dev
  (X=version), so if you install it then you will get upgrades automatically.
 
-Package: libpetsc3.8.0
+Package: libpetsc-real3.8
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -95,16 +74,16 @@ Description: Shared libraries for version 3.8 of PETSc
  scientific applications, as well as various papers and talks, demonstrate the
  features of the PETSc libraries.
  .
- This package contains version 3.8.0 of the PETSc 3.8 shared library.
+ This package contains the PETSc 3.8 shared library for real numbers.
  .
  It provides soname libpetsc-real3.8
 
-Package: libpetsc3.8.0-dbg
+Package: libpetsc-real3.8-dbg
 Architecture: any
 Multi-Arch: same
 Section: debug
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libpetsc3.8.0-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
+Depends: libpetsc3.8-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
  ${python:Depends}
 Recommends: tcsh | csh | c-shell, ksh | mksh | pdksh | zsh
 Provides: petsc3.8-dbg
@@ -117,17 +96,17 @@ Description: Debugging libraries for PETSc
  features of the PETSc libraries.
  .
  This package provides the development files and debugging libraries for
- debugging applications using PETSc 3.8.0.
+ debugging applications using PETSc 3.8 with real numbers.
  .
- Libraries include unstripped symbols, but this package is also built with 
+ Libraries include unstripped symbols, but this package is also built with
  internal PETSc debugging activated.
 
-Package: petsc3.8.0-doc
+Package: petsc3.8-doc
 Architecture: all
 Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends}
-Suggests: libpetsc3.8.0-dev (= ${binary:Version}), illuminator-doc
+Suggests: libpetsc3.8-dev (= ${binary:Version}), illuminator-doc
 Description: Documentation and examples for PETSc
  PETSc is the "Portable Extensible Toolkit for Scientific Computation", a suite
  of data structures and routines for the scalable (parallel) solution of
@@ -136,35 +115,13 @@ Description: Documentation and examples for PETSc
  scientific applications, as well as various papers and talks, demonstrate the
  features of the PETSc libraries.
  .
- This package contains documentation for developing with PETSc 3.8.0.
-
-Package: libpetsc-complex-3.8-dev
-Multi-Arch: same
-Architecture: any
-Section: libdevel
-Depends: libpetsc-complex-3.8.0-dev, ${misc:Depends}, ${python:Depends}
-Provides: petsc-complex-3.8-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
- scientific applications modeled by partial differential equations.  It employs
- the MPI standard for all message-passing communication.  Several sample
- scientific applications, as well as various papers and talks, demonstrate the
- features of the PETSc libraries.
- .
- This is a dummy package which depends on the latest version of PETSc 3.8 
- to provide the development files needed for building applications with support 
- for complex numbers.
- .
- The library soname is 3.8 (without specifying the patch version), so if you 
- want to build against PETSc 3.8 with support for complex numbers then you 
- probably want to use this package.
+ This package contains documentation for developing with PETSc 3.8.
 
-Package: libpetsc-complex-3.8.0-dev
+Package: libpetsc-complex3.8-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libpetsc-complex-3.8.0 (= ${binary:Version}), ${MPI:Depends}, libsuitesparse-dev, libspooles-dev,
+Depends: libpetsc-complex3.8 (= ${binary:Version}), ${MPI:Depends}, libsuitesparse-dev, libspooles-dev,
  libhypre-dev (>= 2.0.0.dfsg-7), libptscotch-dev, libscalapack-mpi-dev,
  libmumps-dev, libfftw3-dev, libfftw3-mpi-dev, libssl-dev, gfortran,
  libhdf5-mpi-dev (>= 1.8.8), libsuperlu-dev (>= 5.2),
@@ -172,7 +129,7 @@ Depends: libpetsc-complex-3.8.0 (= ${binary:Version}), ${MPI:Depends}, libsuites
 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: tcsh | csh | c-shell, ksh | mksh | pdksh | zsh
-Suggests: petsc-dev, libpetsc-complex-3.8.0-dbg (= ${binary:Version}), petsc3.8.0-doc, libluminate-dev
+Suggests: petsc-dev, libpetsc-complex3.8-dbg (= ${binary:Version}), petsc3.8-doc, 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
@@ -182,15 +139,14 @@ Description: Static libraries, shared links, header files for PETSc
  features of the PETSc libraries.
  .
  This package provides the development files for building applications
- using PETSc 3.8.0 with support for complex numbers.
+ using PETSc 3.8 with support for complex numbers.
  .
  This deactivates support for HYPRE.
 
-Package: libpetsc-complex-3.8.0
+Package: libpetsc-complex3.8
 Architecture: any
 Multi-Arch: same
 Section: libs
-Provides: libpetsc-complex-3.8
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libpetsc-complex-3.6 (<< 3.6.2.dfsg1-4)
@@ -203,20 +159,19 @@ Description: Shared libraries for version 3.8 of PETSc with Complex Numbers
  scientific applications, as well as various papers and talks, demonstrate the
  features of the PETSc libraries.
  .
- This package contains version 3.8.0 of the PETSc 3.8 shared library,
- supporting complex numbers.
+ This package contains the PETSc 3.8 shared library, supporting complex numbers.
  .
  It provides soname libpetsc-complex3.8
 
-Package: libpetsc-complex-3.8.0-dbg
+Package: libpetsc-complex3.8-dbg
 Architecture: any
 Multi-Arch: same
 Section: debug
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libpetsc-complex-3.8.0-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
+Depends: libpetsc-complex3.8-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
  ${python:Depends}
 Recommends: tcsh | csh | c-shell, ksh | mksh | pdksh | zsh
-Provides: petsc-complex-3.8-dbg
+Provides: petsc-complex3.8-dbg
 Description: Debugging libraries for PETSc
  PETSc is the "Portable Extensible Toolkit for Scientific Computation", a suite
  of data structures and routines for the scalable (parallel) solution of
@@ -226,8 +181,8 @@ Description: Debugging libraries for PETSc
  features of the PETSc libraries.
  .
  This package provides the development files and debugging libraries for
- debugging applications using PETSc 3.8.0 with complex number support.
+ debugging applications using PETSc 3.8 with complex number support.
  .
- Libraries include unstripped symbols, but this package is also built with 
+ Libraries include unstripped symbols, but this package is also built with
  internal PETSc debugging activated.
 
diff --git a/debian/libpetsc-complex-3.8.0-dbg.dirs b/debian/libpetsc-complex-3.8-dbg.dirs
similarity index 100%
rename from debian/libpetsc-complex-3.8.0-dbg.dirs
rename to debian/libpetsc-complex-3.8-dbg.dirs
diff --git a/debian/libpetsc-complex-3.8.0-dbg.postinst b/debian/libpetsc-complex-3.8-dbg.postinst
similarity index 100%
rename from debian/libpetsc-complex-3.8.0-dbg.postinst
rename to debian/libpetsc-complex-3.8-dbg.postinst
diff --git a/debian/libpetsc-complex-3.8.0-dbg.prerm b/debian/libpetsc-complex-3.8-dbg.prerm
similarity index 100%
rename from debian/libpetsc-complex-3.8.0-dbg.prerm
rename to debian/libpetsc-complex-3.8-dbg.prerm
diff --git a/debian/libpetsc-complex-3.8.0-dev.dirs b/debian/libpetsc-complex-3.8-dev.dirs
similarity index 100%
rename from debian/libpetsc-complex-3.8.0-dev.dirs
rename to debian/libpetsc-complex-3.8-dev.dirs
diff --git a/debian/libpetsc-complex-3.8.0-dev.docs b/debian/libpetsc-complex-3.8-dev.docs
similarity index 100%
rename from debian/libpetsc-complex-3.8.0-dev.docs
rename to debian/libpetsc-complex-3.8-dev.docs
diff --git a/debian/libpetsc-complex-3.8.0-dev.postinst b/debian/libpetsc-complex-3.8-dev.postinst
similarity index 100%
rename from debian/libpetsc-complex-3.8.0-dev.postinst
rename to debian/libpetsc-complex-3.8-dev.postinst
diff --git a/debian/libpetsc-complex-3.8.0-dev.prerm b/debian/libpetsc-complex-3.8-dev.prerm
similarity index 100%
rename from debian/libpetsc-complex-3.8.0-dev.prerm
rename to debian/libpetsc-complex-3.8-dev.prerm
diff --git a/debian/libpetsc-complex-3.8.0.lintian-overrides b/debian/libpetsc-complex-3.8.lintian-overrides
similarity index 100%
rename from debian/libpetsc-complex-3.8.0.lintian-overrides
rename to debian/libpetsc-complex-3.8.lintian-overrides
diff --git a/debian/libpetsc-complex-3.8.0.postinst b/debian/libpetsc-complex-3.8.postinst
similarity index 100%
rename from debian/libpetsc-complex-3.8.0.postinst
rename to debian/libpetsc-complex-3.8.postinst
diff --git a/debian/libpetsc-complex-3.8.0.prerm b/debian/libpetsc-complex-3.8.prerm
similarity index 100%
rename from debian/libpetsc-complex-3.8.0.prerm
rename to debian/libpetsc-complex-3.8.prerm
diff --git a/debian/libpetsc-complex-3.8.0.shlibs b/debian/libpetsc-complex-3.8.shlibs
similarity index 100%
rename from debian/libpetsc-complex-3.8.0.shlibs
rename to debian/libpetsc-complex-3.8.shlibs
diff --git a/debian/libpetsc3.8.0-dbg.dirs b/debian/libpetsc3.8-dbg.dirs
similarity index 100%
rename from debian/libpetsc3.8.0-dbg.dirs
rename to debian/libpetsc3.8-dbg.dirs
diff --git a/debian/libpetsc3.8.0-dbg.postinst b/debian/libpetsc3.8-dbg.postinst
similarity index 100%
rename from debian/libpetsc3.8.0-dbg.postinst
rename to debian/libpetsc3.8-dbg.postinst
diff --git a/debian/libpetsc3.8.0-dbg.prerm b/debian/libpetsc3.8-dbg.prerm
similarity index 100%
rename from debian/libpetsc3.8.0-dbg.prerm
rename to debian/libpetsc3.8-dbg.prerm
diff --git a/debian/libpetsc3.8.0-dev.dirs b/debian/libpetsc3.8-dev.dirs
similarity index 100%
rename from debian/libpetsc3.8.0-dev.dirs
rename to debian/libpetsc3.8-dev.dirs
diff --git a/debian/libpetsc3.8.0-dev.docs b/debian/libpetsc3.8-dev.docs
similarity index 100%
rename from debian/libpetsc3.8.0-dev.docs
rename to debian/libpetsc3.8-dev.docs
diff --git a/debian/libpetsc3.8.0-dev.overrides b/debian/libpetsc3.8-dev.overrides
similarity index 100%
rename from debian/libpetsc3.8.0-dev.overrides
rename to debian/libpetsc3.8-dev.overrides
diff --git a/debian/libpetsc3.8.0-dev.postinst b/debian/libpetsc3.8-dev.postinst
similarity index 100%
rename from debian/libpetsc3.8.0-dev.postinst
rename to debian/libpetsc3.8-dev.postinst
diff --git a/debian/libpetsc3.8.0-dev.prerm b/debian/libpetsc3.8-dev.prerm
similarity index 100%
rename from debian/libpetsc3.8.0-dev.prerm
rename to debian/libpetsc3.8-dev.prerm
diff --git a/debian/libpetsc3.8.0.lintian-overrides b/debian/libpetsc3.8.lintian-overrides
similarity index 100%
rename from debian/libpetsc3.8.0.lintian-overrides
rename to debian/libpetsc3.8.lintian-overrides
diff --git a/debian/libpetsc3.8.0.postinst b/debian/libpetsc3.8.postinst
similarity index 100%
rename from debian/libpetsc3.8.0.postinst
rename to debian/libpetsc3.8.postinst
diff --git a/debian/libpetsc3.8.0.prerm b/debian/libpetsc3.8.prerm
similarity index 100%
rename from debian/libpetsc3.8.0.prerm
rename to debian/libpetsc3.8.prerm
diff --git a/debian/libpetsc3.8.0.shlibs b/debian/libpetsc3.8.shlibs
similarity index 100%
rename from debian/libpetsc3.8.0.shlibs
rename to debian/libpetsc3.8.shlibs
diff --git a/debian/petsc3.8.0-doc.doc-base b/debian/petsc3.8-doc.doc-base
similarity index 100%
rename from debian/petsc3.8.0-doc.doc-base
rename to debian/petsc3.8-doc.doc-base
diff --git a/debian/petsc3.8.0-doc.docs b/debian/petsc3.8-doc.docs
similarity index 100%
rename from debian/petsc3.8.0-doc.docs
rename to debian/petsc3.8-doc.docs
diff --git a/debian/petsc3.8.0-doc.overrides b/debian/petsc3.8-doc.overrides
similarity index 100%
rename from debian/petsc3.8.0-doc.overrides
rename to debian/petsc3.8-doc.overrides
diff --git a/debian/rules b/debian/rules
index d713629..b1e6770 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,8 +53,8 @@ HDF5_SERIAL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
 HDF5_MPI_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
 PETSC_HDF5_FLAGS=$(shell if [ -e $(HDF5_MPI_DIR)/libhdf5.so ]; then echo "--with-hdf5=1 --with-hdf5-dir=$(HDF5_MPI_DIR)"; else if [ -e $(HDF5_SERIAL_DIR)/libhdf5.so ]; then echo "--with-hdf5=1 --with-hdf5-dir=$(HDF5_SERIAL_DIR)"; fi; fi)
 
-PETSC_BUILD_DIR=$(PETSC_ARCH)-real
-PETSC_DEBUG_BUILD_DIR=$(PETSC_ARCH)-real-debug
+PETSC_REAL_BUILD_DIR=$(PETSC_ARCH)-real
+PETSC_REAL_DEBUG_BUILD_DIR=$(PETSC_ARCH)-real-debug
 PETSC_COMPLEX_BUILD_DIR=$(PETSC_ARCH)-complex
 PETSC_COMPLEX_DEBUG_BUILD_DIR=$(PETSC_ARCH)-complex-debug
 
@@ -65,32 +65,30 @@ PETSC_VERSION=3.8.0$(PETSC_EXT)
 PETSC_SONAME_VERSION=$(shell echo $(PETSC_VERSION) | awk 'BEGIN { FS="."}; {print $$1"."$$2 }')
 
 # PETSC_NAME is the install dir under /usr/lib and the base for package names
-PETSC_SONAME=petsc$(PETSC_SONAME_VERSION)
-PETSC_NAME=petsc$(PETSC_VERSION)
-PETSC_COMPLEX_SONAME=petsc-complex-$(PETSC_SONAME_VERSION)
-PETSC_COMPLEX_NAME=petsc-complex-$(PETSC_VERSION)
+PETSC_NAME=petsc$(PETSC_SONAME_VERSION)
+PETSC_REAL_SONAME=petsc-real$(PETSC_SONAME_VERSION)
+PETSC_COMPLEX_SONAME=petsc-complex$(PETSC_SONAME_VERSION)
 
 # debian binary package names
-PETSC_DEV_PACKAGE=$(PETSC_NAME)-dev
-PETSC_VERSIONED_DEV_PACKAGE=lib$(PETSC_NAME)-dev
-PETSC_VERSIONED_PACKAGE=lib$(PETSC_NAME)
-PETSC_DEBUG_PACKAGE=lib$(PETSC_NAME)-dbg
-PETSC_DOC_PACKAGE=$(PETSC_NAME)-doc
-PETSC_COMPLEX_VERSIONED_DEV_PACKAGE=lib$(PETSC_COMPLEX_NAME)-dev
-PETSC_COMPLEX_VERSIONED_PACKAGE=lib$(PETSC_COMPLEX_NAME)
-PETSC_COMPLEX_DEBUG_PACKAGE=lib$(PETSC_COMPLEX_NAME)-dbg
+PETSC_REAL_DEV_PACKAGE=lib$(PETSC_REAL_SONAME)-dev
+PETSC_REAL_PACKAGE=lib$(PETSC_REAL_SONAME)
+PETSC_REAL_DEBUG_PACKAGE=lib$(PETSC_REAL_SONAME)-dbg
+PETSC_DOC_PACKAGE=petsc$(PETSC_SONAME_VERSION)-doc
+PETSC_COMPLEX_DEV_PACKAGE=lib$(PETSC_COMPLEX_SONAME)-dev
+PETSC_COMPLEX_PACKAGE=lib$(PETSC_COMPLEX_SONAME)
+PETSC_COMPLEX_DEBUG_PACKAGE=lib$(PETSC_COMPLEX_SONAME)-dbg
 
 # install into /usr/lib/petscdir rather than /usr/lib/petsc
 # to allow /usr/lib/petsc to be configured by alternatives
-PETSC_DIR_PREFIX=/usr/lib/petscdir/$(PETSC_VERSION)/$(PETSC_ARCH)-real
-PETSC_DIR_DEBUG_PREFIX=/usr/lib/petscdir/$(PETSC_VERSION)/$(PETSC_ARCH)-real-debug
-PETSC_COMPLEX_DIR_PREFIX=/usr/lib/petscdir/$(PETSC_VERSION)/$(PETSC_ARCH)-complex
-PETSC_COMPLEX_DEBUG_DIR_PREFIX=/usr/lib/petscdir/$(PETSC_VERSION)/$(PETSC_ARCH)-complex-debug
-
-PACKAGE_INSTALL_BASEDIR=debian/tmp/$(PETSC_NAME)-real
-PACKAGE_INSTALL_DIR=$(PACKAGE_INSTALL_BASEDIR)/$(PETSC_DIR_PREFIX)
-PACKAGE_DEBUG_INSTALL_BASEDIR=debian/tmp/$(PETSC_NAME)-real-debug
-PACKAGE_DEBUG_INSTALL_DIR=$(PACKAGE_DEBUG_INSTALL_BASEDIR)/$(PETSC_DIR_DEBUG_PREFIX)
+PETSC_REAL_DIR_PREFIX=/usr/lib/petscdir/$(PETSC_SONAME_VERSION)/$(PETSC_ARCH)-real
+PETSC_REAL_DIR_DEBUG_PREFIX=/usr/lib/petscdir/$(PETSC_SONAME_VERSION)/$(PETSC_ARCH)-real-debug
+PETSC_COMPLEX_DIR_PREFIX=/usr/lib/petscdir/$(PETSC_SONAME_VERSION)/$(PETSC_ARCH)-complex
+PETSC_COMPLEX_DEBUG_DIR_PREFIX=/usr/lib/petscdir/$(PETSC_SONAME_VERSION)/$(PETSC_ARCH)-complex-debug
+
+PACKAGE_REAL_INSTALL_BASEDIR=debian/tmp/$(PETSC_NAME)-real
+PACKAGE_REAL_INSTALL_DIR=$(PACKAGE_REAL_INSTALL_BASEDIR)/$(PETSC_REAL_DIR_PREFIX)
+PACKAGE_REAL_DEBUG_INSTALL_BASEDIR=debian/tmp/$(PETSC_NAME)-real-debug
+PACKAGE_REAL_DEBUG_INSTALL_DIR=$(PACKAGE_REAL_DEBUG_INSTALL_BASEDIR)/$(PETSC_REAL_DIR_DEBUG_PREFIX)
 PACKAGE_COMPLEX_INSTALL_BASEDIR=debian/tmp/$(PETSC_NAME)-complex
 PACKAGE_COMPLEX_INSTALL_DIR=$(PACKAGE_COMPLEX_INSTALL_BASEDIR)/$(PETSC_COMPLEX_DIR_PREFIX)
 PACKAGE_COMPLEX_DEBUG_INSTALL_BASEDIR=debian/tmp/$(PETSC_NAME)-complex-debug
@@ -119,16 +117,16 @@ HYPRE_CONFIG=--with-hypre=1 --with-hypre-include=/usr/include/hypre \
 	dh $@ --with python2
 
 override_dh_auto_clean:
-	if [ -d $(PETSC_DEBUG_BUILD_DIR) ]; then \
-	  dh_auto_clean -p$(PETSC_DEBUG_PACKAGE) -p$(PETSC_DOC_PACKAGE) -- \
-	    PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_DEBUG_BUILD_DIR); \
+	if [ -d $(PETSC_REAL_DEBUG_BUILD_DIR) ]; then \
+	  dh_auto_clean -p$(PETSC_REAL_DEBUG_PACKAGE) -p$(PETSC_DOC_PACKAGE) -- \
+	    PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_REAL_DEBUG_BUILD_DIR); \
 	fi
-	if [ -d $(PETSC_BUILD_DIR) ]; then \
-	dh_auto_clean -p$(PETSC_VERSIONED_DEV_PACKAGE) -- \
-	  PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_BUILD_DIR); \
+	if [ -d $(PETSC_REAL_BUILD_DIR) ]; then \
+	dh_auto_clean -p$(PETSC_REAL_DEV_PACKAGE) -- \
+	  PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_REAL_BUILD_DIR); \
 	fi
 	if [ -d $(PETSC_COMPLEX_BUILD_DIR) ]; then \
-	dh_auto_clean -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE) -- \
+	dh_auto_clean -p$(PETSC_COMPLEX_DEV_PACKAGE) -- \
 	  PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_COMPLEX_BUILD_DIR); \
 	fi
 	if [ -d $(PETSC_COMPLEX_DEBUG_BUILD_DIR) ]; then \
@@ -138,15 +136,15 @@ override_dh_auto_clean:
 
 
 override_dh_auto_configure:
-	@echo ===================== $(PETSC_DEBUG_PACKAGE) =====================
-	if dh_auto_configure -p$(PETSC_DEBUG_PACKAGE) -p$(PETSC_DOC_PACKAGE) --  \
+	@echo ===================== $(PETSC_REAL_DEBUG_PACKAGE) =====================
+	if dh_auto_configure -p$(PETSC_REAL_DEBUG_PACKAGE) -p$(PETSC_DOC_PACKAGE) --  \
           --with-debugging=1  \
           --shared-library-extension=_real \
           --with-clanguage=C++ \
           $(CONFIGURATION_OPTIONS)  \
           $(HYPRE_CONFIG)  \
-          --prefix=$(PETSC_DIR_DEBUG_PREFIX)  \
-          PETSC_DIR=$(CURDIR) --PETSC_ARCH=$(PETSC_DEBUG_BUILD_DIR) \
+          --prefix=$(PETSC_REAL_DIR_DEBUG_PREFIX)  \
+          PETSC_DIR=$(CURDIR) --PETSC_ARCH=$(PETSC_REAL_DEBUG_BUILD_DIR) \
             CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
             FCFLAGS="$(FCFLAGS)"  FFLAGS="$(FFLAGS)"  \
             CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" MAKEFLAGS="$(MAKEFLAGS)"; then \
@@ -155,15 +153,15 @@ override_dh_auto_configure:
 	  cat configure.log; \
 	  false; \
 	fi
-	@echo ===================== $(PETSC_VERSIONED_DEV_PACKAGE) =====================
-	if dh_auto_configure -p$(PETSC_VERSIONED_DEV_PACKAGE) --  \
+	@echo ===================== $(PETSC_REAL_DEV_PACKAGE) =====================
+	if dh_auto_configure -p$(PETSC_REAL_DEV_PACKAGE) --  \
           --with-debugging=0  \
           --shared-library-extension=_real \
           --with-clanguage=C++ \
           $(CONFIGURATION_OPTIONS)  \
           $(HYPRE_CONFIG)  \
-          --prefix=$(PETSC_DIR_PREFIX)  \
-          PETSC_DIR=$(CURDIR) --PETSC_ARCH=$(PETSC_BUILD_DIR) \
+          --prefix=$(PETSC_REAL_DIR_PREFIX)  \
+          PETSC_DIR=$(CURDIR) --PETSC_ARCH=$(PETSC_REAL_BUILD_DIR) \
             CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
             FCFLAGS="$(FCFLAGS)"  FFLAGS="$(FFLAGS)"  \
             CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" MAKEFLAGS="$(MAKEFLAGS)"; then \
@@ -172,8 +170,8 @@ override_dh_auto_configure:
 	  cat configure.log; \
 	  false; \
 	fi
-	@echo ===================== $(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE) =====================
-	if dh_auto_configure -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE) --  \
+	@echo ===================== $(PETSC_COMPLEX_DEV_PACKAGE) =====================
+	if dh_auto_configure -p$(PETSC_COMPLEX_DEV_PACKAGE) --  \
           --with-debugging=0  \
           --with-scalar-type=complex --shared-library-extension=_complex \
           $(CONFIGURATION_OPTIONS)  \
@@ -205,24 +203,24 @@ override_dh_auto_configure:
 
 
 override_dh_auto_build:
-	dh_auto_build -p$(PETSC_DEBUG_PACKAGE) -p$(PETSC_DOC_PACKAGE) --  \
-          -j 1 PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_DEBUG_BUILD_DIR)
-	dh_auto_build -p$(PETSC_VERSIONED_DEV_PACKAGE)  --  \
-          -j 1 PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_BUILD_DIR)
-	dh_auto_build -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE)  --  \
+	dh_auto_build -p$(PETSC_REAL_DEBUG_PACKAGE) -p$(PETSC_DOC_PACKAGE) --  \
+          -j 1 PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_REAL_DEBUG_BUILD_DIR)
+	dh_auto_build -p$(PETSC_REAL_DEV_PACKAGE)  --  \
+          -j 1 PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_REAL_BUILD_DIR)
+	dh_auto_build -p$(PETSC_COMPLEX_DEV_PACKAGE)  --  \
           -j 1 PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_COMPLEX_BUILD_DIR)
 	dh_auto_build -p$(PETSC_COMPLEX_DEBUG_PACKAGE)  --  \
           -j 1 PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_COMPLEX_DEBUG_BUILD_DIR)
 
 
 override_dh_auto_test:
-	dh_auto_test -p$(PETSC_DEBUG_PACKAGE) -- \
-	  PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_DEBUG_BUILD_DIR) \
-	  LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(CURDIR)/$(PETSC_DEBUG_BUILD_DIR)/lib
-	dh_auto_test -p$(PETSC_VERSIONED_DEV_PACKAGE) -- \
-	  PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_BUILD_DIR) \
-	  LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(CURDIR)/$(PETSC_BUILD_DIR)/lib
-	dh_auto_test -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE) -- \
+	dh_auto_test -p$(PETSC_REAL_DEBUG_PACKAGE) -- \
+	  PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_REAL_DEBUG_BUILD_DIR) \
+	  LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(CURDIR)/$(PETSC_REAL_DEBUG_BUILD_DIR)/lib
+	dh_auto_test -p$(PETSC_REAL_DEV_PACKAGE) -- \
+	  PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_REAL_BUILD_DIR) \
+	  LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(CURDIR)/$(PETSC_REAL_BUILD_DIR)/lib
+	dh_auto_test -p$(PETSC_COMPLEX_DEV_PACKAGE) -- \
 	  PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_COMPLEX_BUILD_DIR) \
 	  LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(CURDIR)/$(PETSC_COMPLEX_BUILD_DIR)/lib
 	dh_auto_test -p$(PETSC_COMPLEX_DEBUG_PACKAGE) -- \
@@ -231,13 +229,13 @@ override_dh_auto_test:
 
 
 override_dh_auto_install:
-	dh_auto_install -p$(PETSC_DEBUG_PACKAGE) -p$(PETSC_DOC_PACKAGE) --destdir=$(PACKAGE_DEBUG_INSTALL_DIR) --  \
-          DESTDIR=$(PACKAGE_DEBUG_INSTALL_DIR)  \
-          PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_DEBUG_BUILD_DIR)
-	dh_auto_install -p$(PETSC_VERSIONED_DEV_PACKAGE) --destdir=$(PACKAGE_INSTALL_DIR) --  \
-          DESTDIR=$(PACKAGE_INSTALL_DIR) \
-          PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_BUILD_DIR)
-	dh_auto_install -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE) --destdir=$(PACKAGE_COMPLEX_INSTALL_DIR) --  \
+	dh_auto_install -p$(PETSC_REAL_DEBUG_PACKAGE) -p$(PETSC_DOC_PACKAGE) --destdir=$(PACKAGE_REAL_DEBUG_INSTALL_DIR) --  \
+          DESTDIR=$(PACKAGE_REAL_DEBUG_INSTALL_DIR)  \
+          PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_REAL_DEBUG_BUILD_DIR)
+	dh_auto_install -p$(PETSC_REAL_DEV_PACKAGE) --destdir=$(PACKAGE_REAL_INSTALL_DIR) --  \
+          DESTDIR=$(PACKAGE_REAL_INSTALL_DIR) \
+          PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_REAL_BUILD_DIR)
+	dh_auto_install -p$(PETSC_COMPLEX_DEV_PACKAGE) --destdir=$(PACKAGE_COMPLEX_INSTALL_DIR) --  \
           DESTDIR=$(PACKAGE_COMPLEX_INSTALL_DIR) \
           PETSC_DIR=$(CURDIR) PETSC_ARCH=$(PETSC_COMPLEX_BUILD_DIR)
 	dh_auto_install -p$(PETSC_COMPLEX_DEBUG_PACKAGE) --destdir=$(PACKAGE_COMPLEX_DEBUG_INSTALL_DIR) --  \
@@ -246,15 +244,15 @@ override_dh_auto_install:
 
 
 override_dh_install:
-	dh_install -p$(PETSC_VERSIONED_PACKAGE) --sourcedir $(PACKAGE_INSTALL_BASEDIR) --exclude=*html  $(PETSC_DIR_PREFIX)/lib/libpetsc_real.so.$(PETSC_VERSION)  usr/lib/$(DEB_HOST_MULTIARCH)
-	dh_install -p$(PETSC_VERSIONED_DEV_PACKAGE) --sourcedir $(PACKAGE_INSTALL_BASEDIR) --autodest --exclude=*html --exclude=libpetsc_real.so.$(PETSC_VERSION)  usr
-	dh_link -p$(PETSC_VERSIONED_DEV_PACKAGE)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc_real.so.$(PETSC_VERSION)  $(PETSC_DIR_PREFIX)/lib/libpetsc_real.so.$(PETSC_VERSION)
+	dh_install -p$(PETSC_REAL_PACKAGE) --sourcedir $(PACKAGE_REAL_INSTALL_BASEDIR) --exclude=*html  $(PETSC_REAL_DIR_PREFIX)/lib/libpetsc_real.so.$(PETSC_VERSION)  usr/lib/$(DEB_HOST_MULTIARCH)
+	dh_install -p$(PETSC_REAL_DEV_PACKAGE) --sourcedir $(PACKAGE_REAL_INSTALL_BASEDIR) --autodest --exclude=*html --exclude=libpetsc_real.so.$(PETSC_VERSION)  usr
+	dh_link -p$(PETSC_REAL_DEV_PACKAGE)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc_real.so.$(PETSC_VERSION)  $(PETSC_REAL_DIR_PREFIX)/lib/libpetsc_real.so.$(PETSC_VERSION)
 	
-	dh_install -p$(PETSC_DEBUG_PACKAGE) --sourcedir $(PACKAGE_DEBUG_INSTALL_BASEDIR) --autodest --exclude=*html  usr
+	dh_install -p$(PETSC_REAL_DEBUG_PACKAGE) --sourcedir $(PACKAGE_REAL_DEBUG_INSTALL_BASEDIR) --autodest --exclude=*html  usr
 	
-	dh_install -p$(PETSC_COMPLEX_VERSIONED_PACKAGE) --sourcedir $(PACKAGE_COMPLEX_INSTALL_BASEDIR) --exclude=*html  $(PETSC_COMPLEX_DIR_PREFIX)/lib/libpetsc_complex.so.$(PETSC_VERSION)  usr/lib/$(DEB_HOST_MULTIARCH)
-	dh_install -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE) --sourcedir $(PACKAGE_COMPLEX_INSTALL_BASEDIR) --autodest --exclude=*html --exclude=libpetsc_complex.so.$(PETSC_VERSION)  usr
-	dh_link -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc_complex.so.$(PETSC_VERSION)  $(PETSC_COMPLEX_DIR_PREFIX)/lib/libpetsc_complex.so.$(PETSC_VERSION)
+	dh_install -p$(PETSC_COMPLEX_PACKAGE) --sourcedir $(PACKAGE_COMPLEX_INSTALL_BASEDIR) --exclude=*html  $(PETSC_COMPLEX_DIR_PREFIX)/lib/libpetsc_complex.so.$(PETSC_VERSION)  usr/lib/$(DEB_HOST_MULTIARCH)
+	dh_install -p$(PETSC_COMPLEX_DEV_PACKAGE) --sourcedir $(PACKAGE_COMPLEX_INSTALL_BASEDIR) --autodest --exclude=*html --exclude=libpetsc_complex.so.$(PETSC_VERSION)  usr
+	dh_link -p$(PETSC_COMPLEX_DEV_PACKAGE)  usr/lib/$(DEB_HOST_MULTIARCH)/libpetsc_complex.so.$(PETSC_VERSION)  $(PETSC_COMPLEX_DIR_PREFIX)/lib/libpetsc_complex.so.$(PETSC_VERSION)
 	
 	dh_install -p$(PETSC_COMPLEX_DEBUG_PACKAGE) --sourcedir $(PACKAGE_COMPLEX_DEBUG_INSTALL_BASEDIR) --autodest --exclude=*html  usr
 
@@ -263,7 +261,7 @@ override_dh_installdocs:
 	dh_installdocs
 	# dh_install can't install .html while preserving directory structure
 	# so first install all include files to docs...
-	dh_install -p$(PETSC_DOC_PACKAGE) --sourcedir $(PACKAGE_DEBUG_INSTALL_BASEDIR)  $(PETSC_DIR_DEBUG_PREFIX)/include usr/share/doc/$(PETSC_DOC_PACKAGE)
+	dh_install -p$(PETSC_DOC_PACKAGE) --sourcedir $(PACKAGE_REAL_DEBUG_INSTALL_BASEDIR)  $(PETSC_REAL_DIR_DEBUG_PREFIX)/include usr/share/doc/$(PETSC_DOC_PACKAGE)
 	# test if header docs were installed (in a binary-only build they won't be)
 	if [ -d ./debian/$(PETSC_DOC_PACKAGE)/usr/share/doc/$(PETSC_DOC_PACKAGE)/include ]; then  \
 	# then remove non-html files  \
@@ -282,9 +280,9 @@ override_dh_installchangelogs:
 
 override_dh_python2:
 	dh_python2
-	dh_python2 -p$(PETSC_VERSIONED_DEV_PACKAGE) $(PETSC_DIR_PREFIX)/bin
-	dh_python2 -p$(PETSC_DEBUG_PACKAGE) $(PETSC_DIR_DEBUG_PREFIX)/bin
-	dh_python2 -p$(PETSC_COMPLEX_VERSIONED_DEV_PACKAGE) $(PETSC_COMPLEX_DIR_PREFIX)/bin
+	dh_python2 -p$(PETSC_REAL_DEV_PACKAGE) $(PETSC_REAL_DIR_PREFIX)/bin
+	dh_python2 -p$(PETSC_REAL_DEBUG_PACKAGE) $(PETSC_REAL_DIR_DEBUG_PREFIX)/bin
+	dh_python2 -p$(PETSC_COMPLEX_DEV_PACKAGE) $(PETSC_COMPLEX_DIR_PREFIX)/bin
 	dh_python2 -p$(PETSC_COMPLEX_DEBUG_PACKAGE) $(PETSC_COMPLEX_DEBUG_DIR_PREFIX)/bin
 
 override_dh_installdeb:
@@ -297,7 +295,7 @@ override_dh_gencontrol:
 	dh_gencontrol -- -VMPI:Depends="$(MPI_DEPENDS)"
 
 override_dh_strip:
-	dh_strip --dbg-package=$(PETSC_DEBUG_PACKAGE)
+	dh_strip --dbg-package=$(PETSC_REAL_DEBUG_PACKAGE)
 	dh_strip --dbg-package=$(PETSC_COMPLEX_DEBUG_PACKAGE)
 
 

-- 
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