[petsc] 01/12: prepare for new upstream version 3.6.1
Drew Parsons
dparsons at moszumanska.debian.org
Sat Sep 26 03:46:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to branch master
in repository petsc.
commit d555ab1bb260ca59231fc685f811517df4b99e8b
Author: Drew Parsons <dparsons at debian.org>
Date: Thu Sep 24 14:46:59 2015 +0800
prepare for new upstream version 3.6.1
* Apply Files-Excluded to debian/copyright to exclude DSFG files from
upstream source tarball:
- PDF documentation in docs/ (source documentation is not available)
- win32 executables in bin/win32fe (source code is available
separately at https://bitbucket.org/petsc/win32fe but we don't
need it and therefore don't include it)
* Add Drew Parsons as Uploader.
---
debian/README.Debian | 25 +++--
debian/changelog | 13 +++
debian/control | 29 +++---
debian/copyright | 110 ++++++---------------
...2-dbg.overrides => libpetsc3.6.1-dbg.overrides} | 2 +-
...3.4.2-dev.docs.in => libpetsc3.6.1-dev.docs.in} | 0
...2-dev.overrides => libpetsc3.6.1-dev.overrides} | 2 +-
...v.postinst.in => libpetsc3.6.1-dev.postinst.in} | 0
...4.2-dev.prerm.in => libpetsc3.6.1-dev.prerm.in} | 0
...etsc3.4.2.overrides => libpetsc3.6.1.overrides} | 2 +-
...c3.4.2-doc.doc-base => petsc3.6.1-doc.doc-base} | 12 +--
.../{petsc3.4.2-doc.docs => petsc3.6.1-doc.docs} | 0
....4.2-doc.overrides => petsc3.6.1-doc.overrides} | 2 +-
debian/rules | 52 ++++------
debian/watch | 2 +-
15 files changed, 103 insertions(+), 148 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 6094a38..a3af787 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -7,25 +7,25 @@ please see: http://lyre.mit.edu/~powell/petsc.html . You can also look there
for old versions of the package, in case you need to build something against a
2.0.28 or 2.1.0 release (I keep the last package for each upstream version).
-This is upstream version 3.4.2. I'm no longer including the upstream patch
+This is upstream version 3.6.1. We no longer include the upstream patch
level in the Debian version number to minimize wasteful redistribution of
99.99% identical .orig.tar.gz files for each release.
INTRODUCTION
This source package is distributed in five binary packages: the shared
-libraries are in libpetsc3.4.2; header files, static libraries, the petscarch
+libraries are in libpetsc3.6.1; header files, static libraries, the petscarch
and mpirun_lam scripts and important files for building examples are in
-libpetsc3.4.2-dev, this also sets up various alternatives links; debugging
-static libraries are in libpetsc3.4.2-dbg; extensive documentation and source
-code from "tests" and "tutorials" directories are in petsc3.4.2-doc.
+libpetsc3.6.1-dev, this also sets up various alternatives links; debugging
+static libraries are in libpetsc3.6.1-dbg; extensive documentation and source
+code from "tests" and "tutorials" directories are in petsc3.6.1-doc.
-With libpetsc3.4.2-dev installed, you can build programs against it two ways:
+With libpetsc3.6.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
- will only depend on libpetsc3.4.2. To link against the static
- debugging libs in libpetsc3.4.2-dbg, just set LD_LIBRARY_PATH to
+ will only depend on libpetsc3.6.1. To link against the static
+ debugging libs in libpetsc3.6.1-dbg, just set LD_LIBRARY_PATH to
/usr/lib/petsc/lib/libg/`petscarch`.
2. PETSc build convention: adapt a makefile from one of their tests or
tutorial directories and build with make PETSC_DIR=/usr/lib/petsc
@@ -37,10 +37,10 @@ dependencies.
EXAMPLES
-For your testing convenience, petsc3.4.2-doc comes with the source code of
+For your testing convenience, petsc3.6.1-doc comes with the source code of
the full PETSc test and tutorial suite. Just do:
- tar xzf /usr/share/doc/petsc3.4.2-doc/src.tar.gz
+ tar xzf /usr/share/doc/petsc3.6.1-doc/src.tar.gz
then cd src, and use the PETSc build convention make command above with target
testexamples or testfortran (add _uni to the target name for single-processor
@@ -79,7 +79,7 @@ There are several ways to customize this package:
Compaq compilers on an Alpha), do:
apt-get source petsc
- cd petsc-3.4.2
+ cd petsc-3.6.1
fakeroot debian/rules PETSC_ARCH=linux_alpha_dec binary
Note that this will only build architecture-dependent packages, and with
@@ -119,6 +119,5 @@ hand-edit the symbolic links yourself.
Note that individual users can build against non-default installed versions of
PETSc simply by setting the PETSC_DIR environment variable to the target
directory instead of /usr/lib/petsc, for example to build against the lam
-version a user might set PETSC_DIR=/usr/lib/petscdir/3.4.2-lam .
+version a user might set PETSC_DIR=/usr/lib/petscdir/3.6.1-lam .
- -- "Adam C. Powell, IV" <hazelsct at debian.org>, Thu, 29 Dec 2011 10:06:45 -0500
diff --git a/debian/changelog b/debian/changelog
index fd3e21f..63e9ec4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+petsc (3.6.1.dfsg1-1) UNRELEASED; urgency=medium
+
+ * New upstream version.
+ * Add Drew Parsons as Uploader.
+ * Apply Files-Excluded to debian/copyright to exclude DSFG files from
+ upstream source tarball:
+ - PDF documentation in docs/ (source documentation is not available)
+ - win32 executables in bin/win32fe (source code is available
+ separately at https://bitbucket.org/petsc/win32fe but we don't
+ need it and therefore don't include it)
+
+ -- Drew Parsons <dparsons at debian.org> Thu, 24 Sep 2015 11:55:47 +0800
+
petsc (3.4.2.dfsg1-8) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 88e963e..de8a55f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: petsc
Section: devel
Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>
+Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>, Drew Parsons <dparsons at de
+bian.org>
Standards-Version: 3.9.5
Build-Depends: debhelper (>= 7.0.50), quilt, python (>= 2.2), gfortran, autotools-dev,
libx11-dev, mpi-default-dev (>= 1.0.2),
@@ -17,16 +18,16 @@ Vcs-Git: git://anonscm.debian.org/debian-science/packages/petsc.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/petsc.git
Homepage: http://www.mcs.anl.gov/petsc
-Package: libpetsc3.4.2-dev
+Package: libpetsc3.6.1-dev
Architecture: linux-any hurd-any
Section: libdevel
-Depends: libpetsc3.4.2 (= ${binary:Version}), ${mpi-dev}, ${linear-algebra-dev}, ${petsc-compilers},
+Depends: libpetsc3.6.1 (= ${binary:Version}), ${mpi-dev}, ${linear-algebra-dev}, ${petsc-compilers},
${petsc-extra-dev}, libx11-dev, libsuitesparse-dev, libsuperlu-dev, libspooles-dev,
libhypre-dev (>= 2.0.0.dfsg-7), libptscotch-dev, ${babel-dev}, ${misc:Depends},
${hdf5-dev}, libblacs-mpi-dev, libscalapack-mpi-dev, libmumps-dev,
libfftw3-dev, libfftw3-mpi-dev
-Suggests: petsc-dev (= ${binary:Version}), libpetsc3.4.2-dbg (= ${binary:Version}), petsc3.4.2-doc (= ${binary:Version}), libluminate-dev
-Provides: petsc3.4.2-dev
+Suggests: petsc-dev (= ${binary:Version}), libpetsc3.6.1-dbg (= ${binary:Version}), petsc3.6.1-doc (= ${binary:Version}), libluminate-dev
+Provides: petsc3.6.1-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
@@ -38,17 +39,17 @@ Description: Static libraries, shared links, header files for PETSc
Package: petsc-dev
Architecture: all
Section: libdevel
-Depends: libpetsc3.4.2-dev, ${misc:Depends}
-Suggests: libpetsc3.4.2-dbg
+Depends: libpetsc3.6.1-dev, ${misc:Depends}
+Suggests: libpetsc3.6.1-dbg
Description: Virtual package depending on latest PETSc development package
This metapackage will always depend on the most recent version of petscX-dev
(X=version), so if you install it then you will get upgrades automatically.
-Package: libpetsc3.4.2
+Package: libpetsc3.6.1
Architecture: linux-any hurd-any
Section: libs
Depends: ${shlibs:Depends}, ${mpi}, ${misc:Depends}
-Description: Shared libraries for version 3.4.2 of PETSc
+Description: Shared libraries for version 3.6.1 of 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
@@ -56,11 +57,11 @@ Description: Shared libraries for version 3.4.2 of PETSc
scientific applications, as well as various papers and talks, demonstrate the
features of the PETSc libraries.
-Package: libpetsc3.4.2-dbg
+Package: libpetsc3.6.1-dbg
Architecture: linux-any hurd-any
Section: debug
-Depends: libpetsc3.4.2-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Provides: petsc3.4.2-dbg
+Depends: libpetsc3.6.1-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Provides: petsc3.6.1-dbg
Description: Static 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
@@ -69,11 +70,11 @@ Description: Static debugging libraries for PETSc
scientific applications, as well as various papers and talks, demonstrate the
features of the PETSc libraries.
-Package: petsc3.4.2-doc
+Package: petsc3.6.1-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
-Suggests: libpetsc3.4.2-dev (= ${binary:Version}), illuminator-doc
+Suggests: libpetsc3.6.1-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
diff --git a/debian/copyright b/debian/copyright
index c901062..6b2f9c2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,80 +1,34 @@
-This package was debianized by Adam Powell <hazelsct at mit.edu> on April 16 2001
-based on the petsc source package of 2.0.28 begun August 14 2000
-
-It was downloaded from http://www.mcs.anl.gov/petsc/ as 3.4.3 tarball,
-.orig.tar.gz contains the 3.4.2 release minus non-free files mentioned in the
-changelog.
-
-Upstream authors: Satish Balay, William D. Gropp, Lois Curfman McInnes,
- Barry F. Smith
-
-Copyright: (from docs/copyright.html)
-
-Licensing Notification
-
-Permission to use, reproduce, prepare derivative works, and to redistribute to
-others this software, derivatives of this software, and future versions of this
-software as well as its documentation is hereby granted, provided that this
-notice is retained thereon and on all copies or modifications. This permission
-is perpetual, world-wide, and provided on a royalty-free basis. UChicago
-Argonne, LLC and all other contributors make no representations as to the
-suitability and operability of this software for any purpose. It is provided
-"as is" without express or implied warranty.
-
-Software authors
-
- o Mathematics and Computer Science Division
- o Argonne National Laboratory,
- o Argonne IL 60439 FAX: (630) 252-5986
- o Any questions or comments on the software may be directed to
- petsc-maint at mcs.anl.gov .
-
-Portions of this software are copyright by UChicago Argonne, LLC. Argonne
-National Laboratory with facilities in the state of Illinois, is owned by The
-United States Government, and operated by UChicago Argonne, LLC under provision
-of a contract with the Department of Energy.
-
- DISCLAIMER
-
-PORTIONS OF THIS SOFTWARE WERE PREPARED AS AN ACCOUNT OF WORK SPONSORED BY AN
-AGENCY OF THE UNITED STATES GOVERNMENT. NEITHER THE UNITED STATES GOVERNMENT
-NOR ANY AGENCY THEREOF, NOR THE UNIVERSITY OF CHICAGO, NOR ANY OF THEIR
-EMPLOYEES OR OFFICERS, MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY
-LEGAL LIABILITY OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR USEFULNESS
-OF ANY INFORMATION, APPARATUS, PRODUCT, OR PROCESS DISCLOSED, OR REPRESENTS
-THAT ITS USE WOULD NOT INFRINGE PRIVATELY OWNED RIGHTS. REFERENCE HEREIN TO ANY
-SPECIFIC COMMERCIAL PRODUCT, PROCESS, OR SERVICE BY TRADE NAME, TRADEMARK,
-MANUFACTURER, OR OTHERWISE, DOES NOT NECESSARILY CONSTITUTE OR IMPLY ITS
-ENDORSEMENT, RECOMMENDATION, OR FAVORING BY THE UNITED STATES GOVERNMENT OR ANY
-AGENCY THEREOF. THE VIEW AND OPINIONS OF AUTHORS EXPRESSED HEREIN DO NOT
-NECESSARILY STATE OR REFLECT THOSE OF THE UNITED STATES GOVERNMENT OR ANY
-AGENCY THEREOF.
-
-Files: bin/matlab/laplacianlicense.txt bin/matlab/laplacian.m.html
-Copyright: Bryan C. Smith and Andrew V. Knyazev 2011
-License: BSD-like
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: PETSc
+Source: http://www.mcs.anl.gov/petsc/
+Files-Excluded: bin/win32fe/*
+ docs/*.pdf
+
+Files: *
+Copyright: (c) 1991-2014, UChicago Argonne, LLC and the PETSc Development Team
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this
+ list of conditions and the following disclaimer in the documentation and/or
+ other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ .
.
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the distribution
- .
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+ This license DOES NOT apply to any software that may be obtained via the
+ --download-package option of the PETSc configuration. Each of those
+ packages are covered by their own licenses.
-Files: config/BuildSystem/patch.py
-Copyright: anatoly techtonik 2008-2011
-License: MIT
diff --git a/debian/libpetsc3.4.2-dbg.overrides b/debian/libpetsc3.6.1-dbg.overrides
similarity index 59%
rename from debian/libpetsc3.4.2-dbg.overrides
rename to debian/libpetsc3.6.1-dbg.overrides
index 4b7eb55..d472526 100644
--- a/debian/libpetsc3.4.2-dbg.overrides
+++ b/debian/libpetsc3.6.1-dbg.overrides
@@ -1,2 +1,2 @@
# False positive: the copyright notice is somewhat buried in the upstream text
-libpetsc3.4.2-dbg: copyright-without-copyright-notice
+libpetsc3.6.1-dbg: copyright-without-copyright-notice
diff --git a/debian/libpetsc3.4.2-dev.docs.in b/debian/libpetsc3.6.1-dev.docs.in
similarity index 100%
rename from debian/libpetsc3.4.2-dev.docs.in
rename to debian/libpetsc3.6.1-dev.docs.in
diff --git a/debian/libpetsc3.4.2-dev.overrides b/debian/libpetsc3.6.1-dev.overrides
similarity index 59%
rename from debian/libpetsc3.4.2-dev.overrides
rename to debian/libpetsc3.6.1-dev.overrides
index 0533eed..0f126de 100644
--- a/debian/libpetsc3.4.2-dev.overrides
+++ b/debian/libpetsc3.6.1-dev.overrides
@@ -1,2 +1,2 @@
# False positive: the copyright notice is somewhat buried in the upstream text
-libpetsc3.4.2-dev: copyright-without-copyright-notice
+libpetsc3.6.1-dev: copyright-without-copyright-notice
diff --git a/debian/libpetsc3.4.2-dev.postinst.in b/debian/libpetsc3.6.1-dev.postinst.in
similarity index 100%
rename from debian/libpetsc3.4.2-dev.postinst.in
rename to debian/libpetsc3.6.1-dev.postinst.in
diff --git a/debian/libpetsc3.4.2-dev.prerm.in b/debian/libpetsc3.6.1-dev.prerm.in
similarity index 100%
rename from debian/libpetsc3.4.2-dev.prerm.in
rename to debian/libpetsc3.6.1-dev.prerm.in
diff --git a/debian/libpetsc3.4.2.overrides b/debian/libpetsc3.6.1.overrides
similarity index 61%
rename from debian/libpetsc3.4.2.overrides
rename to debian/libpetsc3.6.1.overrides
index a9958c9..e35e4f8 100644
--- a/debian/libpetsc3.4.2.overrides
+++ b/debian/libpetsc3.6.1.overrides
@@ -1,2 +1,2 @@
# False positive: the copyright notice is somewhat buried in the upstream text
-libpetsc3.4.2: copyright-without-copyright-notice
+libpetsc3.6.1: copyright-without-copyright-notice
diff --git a/debian/petsc3.4.2-doc.doc-base b/debian/petsc3.6.1-doc.doc-base
similarity index 65%
rename from debian/petsc3.4.2-doc.doc-base
rename to debian/petsc3.6.1-doc.doc-base
index e60fd8a..a7dcb84 100644
--- a/debian/petsc3.4.2-doc.doc-base
+++ b/debian/petsc3.6.1-doc.doc-base
@@ -1,5 +1,5 @@
-Document: petsc3.4.2-doc
-Title: PETSc 3.4.2 Documentation
+Document: petsc3.6.1-doc
+Title: PETSc 3.6.1 Documentation
Author: Satish Balay, William D. Gropp, Lois Curfman McInnes, Barry F. Smith
Abstract: PETSc is a suite of data structures and routines for the scalable
(parallel) solution of scientific applications modeled by partial differential
@@ -9,7 +9,7 @@ Abstract: PETSc is a suite of data structures and routines for the scalable
Section: Programming
Format: HTML
-Index: /usr/share/doc/petsc3.4.2-doc/docs/index.html
-Files: /usr/share/doc/petsc3.4.2-doc/docs/*.html
- /usr/share/doc/petsc3.4.2-doc/docs/*/*.html
- /usr/share/doc/petsc3.4.2-doc/docs/*/*/*.html
+Index: /usr/share/doc/petsc3.6.1-doc/docs/index.html
+Files: /usr/share/doc/petsc3.6.1-doc/docs/*.html
+ /usr/share/doc/petsc3.6.1-doc/docs/*/*.html
+ /usr/share/doc/petsc3.6.1-doc/docs/*/*/*.html
diff --git a/debian/petsc3.4.2-doc.docs b/debian/petsc3.6.1-doc.docs
similarity index 100%
rename from debian/petsc3.4.2-doc.docs
rename to debian/petsc3.6.1-doc.docs
diff --git a/debian/petsc3.4.2-doc.overrides b/debian/petsc3.6.1-doc.overrides
similarity index 60%
rename from debian/petsc3.4.2-doc.overrides
rename to debian/petsc3.6.1-doc.overrides
index 035cb7c..d5cdfdf 100644
--- a/debian/petsc3.4.2-doc.overrides
+++ b/debian/petsc3.6.1-doc.overrides
@@ -1,2 +1,2 @@
# False positive: the copyright notice is somewhat buried in the upstream text
-petsc3.4.2-doc: copyright-without-copyright-notice
+petsc3.6.1-doc: copyright-without-copyright-notice
diff --git a/debian/rules b/debian/rules
index 839b0ea..4c69c30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@ PETSC_BABEL_FLAGS=$(shell if [ -e /usr/lib/libsidl.so ]; then echo "--with-babel
# PETSC_VERSION is used for the package names, library sonames, and
# /usr/lib/petscdir subdirectory names.
-PETSC_VERSION=3.4.2$(PETSC_EXT)
+PETSC_VERSION=3.6.1$(PETSC_EXT)
# PETSC_NAME is the install dir under /usr/lib and the base for package names
PETSC_NAME=petsc$(PETSC_VERSION)
@@ -220,12 +220,12 @@ install-arch: build-arch
debian/lib$(PETSC_NAME)-dev/usr/lib/petscdir/$(PETSC_VERSION)/include/finclude
install -d debian/lib$(PETSC_NAME)-dev/usr/lib/petscdir/$(PETSC_VERSION)/include/sieve
#
- # No more include/sieve/problem in petsc 3.4.2
+ # No more include/sieve/problem in petsc 3.6.1
cp -a include/sieve/*.hh \
debian/lib$(PETSC_NAME)-dev/usr/lib/petscdir/$(PETSC_VERSION)/include/sieve
install -d debian/lib$(PETSC_NAME)-dev/usr/lib/petscdir/$(PETSC_VERSION)/include/petsc-private
#
- # Rename include/private to include/petsc-private in petsc 3.4.2
+ # Rename include/private to include/petsc-private in petsc 3.6.1
cp -p include/petsc-private/*.h \
debian/lib$(PETSC_NAME)-dev/usr/lib/petscdir/$(PETSC_VERSION)/include/petsc-private
cd debian/lib$(PETSC_NAME)-dev/usr/lib/petscdir/$(PETSC_VERSION)/include && \
@@ -244,7 +244,7 @@ install-arch: build-arch
debian/lib$(PETSC_NAME)-dev/usr/lib/petscdir/$(PETSC_VERSION)/include/src/mat/impls/dense/seq/dense.h
install -d debian/lib$(PETSC_NAME)-dev/usr/lib/petscdir/$(PETSC_VERSION)/include/src/sys
#
- # No more src/sys/ctable.h in petsc 3.4.2
+ # No more src/sys/ctable.h in petsc 3.6.1
#cp -p src/sys/ctable.h \
# debian/lib$(PETSC_NAME)-dev/usr/lib/petscdir/$(PETSC_VERSION)/include/src/sys/
# Add m4 files, /usr/share/aclocal symlinks will be made by postinst
@@ -269,23 +269,23 @@ install-arch: build-arch
install -d debian/lib$(PETSC_NAME)-dbg/usr/lib/petscdir/$(PETSC_VERSION)/lib
ln -s ../$(PETSC_ARCH)-c-debug/lib debian/lib$(PETSC_NAME)-dbg/usr/lib/petscdir/$(PETSC_VERSION)/lib/libg
ln -s ../$(PETSC_ARCH)-c-debug/lib debian/lib$(PETSC_NAME)-dbg/usr/lib/petscdir/$(PETSC_VERSION)/lib/libg_c++
-# Legacy symlink so packages for 3.0 can build against 3.4.2
+# Legacy symlink so packages for 3.0 can build against 3.6.1
ln -s variables debian/lib$(PETSC_NAME)-dev/usr/lib/petscdir/$(PETSC_VERSION)/conf/base
# Lintian overrides
install -d debian/lib$(PETSC_NAME)/usr/share/lintian/overrides
install -d debian/lib$(PETSC_NAME)-dev/usr/share/lintian/overrides
install -d debian/lib$(PETSC_NAME)-dbg/usr/share/lintian/overrides
- sed "s/petsc3.4.2/$(PETSC_NAME)/" < debian/lib$(PETSC_NAME).overrides > \
+ sed "s/petsc3.6.1/$(PETSC_NAME)/" < debian/lib$(PETSC_NAME).overrides > \
debian/lib$(PETSC_NAME)/usr/share/lintian/overrides/lib$(PETSC_NAME)
- sed "s/petsc3.4.2/$(PETSC_NAME)/" < debian/lib$(PETSC_NAME)-dev.overrides > \
+ sed "s/petsc3.6.1/$(PETSC_NAME)/" < debian/lib$(PETSC_NAME)-dev.overrides > \
debian/lib$(PETSC_NAME)-dev/usr/share/lintian/overrides/lib$(PETSC_NAME)-dev
- sed "s/petsc3.4.2/$(PETSC_NAME)/" < debian/lib$(PETSC_NAME)-dbg.overrides > \
+ sed "s/petsc3.6.1/$(PETSC_NAME)/" < debian/lib$(PETSC_NAME)-dbg.overrides > \
debian/lib$(PETSC_NAME)-dbg/usr/share/lintian/overrides/lib$(PETSC_NAME)-dbg
touch install-arch
# Depends on install-arch because it creates PETSC_DIR
install-indep: build-indep install-arch
-ifeq ($(PETSC_VERSION),3.4.2)
+ifeq ($(PETSC_VERSION),3.6.1)
# Install header documentation in -doc/include
install -d debian/$(PETSC_NAME)-doc/usr/share/doc/$(PETSC_NAME)-doc/include/finclude
cp -p include/*.html \
@@ -316,9 +316,9 @@ ifeq ($(PETSC_VERSION),3.4.2)
done ; \
done
# I don't know of a way to do this "recursively"
- rmdir `find debian/petsc3.4.2-doc -empty -type d -print`
- rmdir `find debian/petsc3.4.2-doc -empty -type d -print`
- rmdir `find debian/petsc3.4.2-doc -empty -type d -print`
+ rmdir `find debian/petsc3.6.1-doc -empty -type d -print`
+ rmdir `find debian/petsc3.6.1-doc -empty -type d -print`
+ rmdir `find debian/petsc3.6.1-doc -empty -type d -print`
# Install examples & makefiles into temporary directory debian/extemp
for TESTDIR in `find src -name tests -print | sed "s/src\///"` \
`find src -name tutorials -print | sed "s/src\///"` benchmarks; \
@@ -360,7 +360,7 @@ ifeq ($(PETSC_VERSION),3.4.2)
usr/lib/petscdir/$(PETSC_VERSION)/src
# Lintian overrides
install -d debian/$(PETSC_NAME)-doc/usr/share/lintian/overrides
- sed "s/petsc3.4.2/$(PETSC_NAME)/" < debian/petsc3.4.2-doc.overrides > \
+ sed "s/petsc3.6.1/$(PETSC_NAME)/" < debian/petsc3.6.1-doc.overrides > \
debian/$(PETSC_NAME)-doc/usr/share/lintian/overrides/$(PETSC_NAME)-doc
install -d debian/petsc-dev/usr/share/lintian/overrides
install -m 644 debian/petsc-dev.overrides \
@@ -372,7 +372,7 @@ install: install-arch install-indep
touch install
binary-indep: install-indep
-ifeq ($(PETSC_VERSION),3.4.2)
+ifeq ($(PETSC_VERSION),3.6.1)
dh_testdir -i
dh_testroot -i
dh_installdirs -i
@@ -395,10 +395,10 @@ binary-arch: install-arch
dh_testroot -a
# Customize control etc. using package names (maybe with -lam or -dec)
mv -f debian/control debian/control.in
- sed "s/3.4.2/$(PETSC_VERSION)/" < debian/control.in | \
- sed "s/$(PETSC_VERSION)-doc/3.4.2-doc/" | \
- sed "s/Provides: $(PETSC_NAME)-dev/Provides: petsc3.4.2-dev/" | \
- sed "s/Provides: $(PETSC_NAME)-dbg/Provides: petsc3.4.2-dbg/" \
+ sed "s/3.6.1/$(PETSC_VERSION)/" < debian/control.in | \
+ sed "s/$(PETSC_VERSION)-doc/3.6.1-doc/" | \
+ sed "s/Provides: $(PETSC_NAME)-dev/Provides: petsc3.6.1-dev/" | \
+ sed "s/Provides: $(PETSC_NAME)-dbg/Provides: petsc3.6.1-dbg/" \
> debian/control
if [ "$(DEBIAN_DIST)" = "contrib" ]; then \
sed "s/Section: lib/Section: contrib\/lib/" < debian/control > \
@@ -408,7 +408,7 @@ binary-arch: install-arch
for ARCHGEN in $(ARCH_GENERATED_FILES); do \
rm -f $$ARCHGEN ; \
sed "s/petsc_arch/$(PETSC_ARCH)-c-opt/" < \
- `echo "$$ARCHGEN.in" | sed "s/$(PETSC_NAME)/petsc3.4.2/"` | \
+ `echo "$$ARCHGEN.in" | sed "s/$(PETSC_NAME)/petsc3.6.1/"` | \
sed "s/petsc_ver/$(PETSC_VERSION)/" > $$ARCHGEN; \
done
# Generate substvars for MPI, linear algebra implementations and dist
@@ -478,16 +478,4 @@ USCAN_DESTDIR := $(CURDIR)
get-orig-source:
- uscan --force-download --verbose --check-dirname-level 0 --destdir $(USCAN_DESTDIR) --download-version $(DEB_STRIPPED_UPSTREAM_VERSION) --upstream-version $(DEB_STRIPPED_UPSTREAM_VERSION) ; \
- set -ex ;
- test -d $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig && rm -rf $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig ; \
- TMPDIR=$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig; \
- mkdir $$TMPDIR; \
- cp $(USCAN_DESTDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_STRIPPED_UPSTREAM_VERSION).orig.tar.gz "$$TMPDIR" ; \
- tar -C "$$TMPDIR" --strip-components 1 -xzf "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)_$(DEB_STRIPPED_UPSTREAM_VERSION).orig.tar.gz ; \
- rm -f "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)*.tar.gz ; \
- find "$$TMPDIR"/docs -name \*.pdf | xargs rm ; \
- GZIP=-9 tar -czf \
- $(CURDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
- $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig ; \
- rm -rf "$$TMPDIR"
+ uscan --no-conf --download-current-version --repack --compression xz
diff --git a/debian/watch b/debian/watch
index 49ff24b..6136921 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
-opts=dversionmangle=s/\.dfsg\d// \
+opts=dversionmangle=s/\.dfsg\d//,repacksuffix=.dfsg1 \
http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-([\d\.]+).tar.gz
--
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