[python-escript] 02/02: Debianisation fixes for 4.1.
Joel Fenwick
jfenwick-guest at moszumanska.debian.org
Tue Dec 1 04:06:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
jfenwick-guest pushed a commit to branch debian
in repository python-escript.
commit 5acc69bec11292626b75a82c5814e1b9106f07e0
Author: Joel Fenwick <joelfenwick at uq.edu.au>
Date: Tue Dec 1 13:55:49 2015 +1000
Debianisation fixes for 4.1.
This is mostly changes to address lintian warnings.
---
debian/changelog | 4 +-
debian/control | 129 +++++++----
debian/copyright | 320 +++++++++++++--------------
debian/patches/dateless-gz | 23 ++
debian/patches/doxygenfix | 19 ++
debian/patches/grammar-errors | 36 +++
debian/patches/mpi-gaol | 33 +++
debian/patches/release-sanity | 69 ++++++
debian/patches/relocating-debian-dir | 24 ++
debian/patches/series | 6 +
debian/python-escript-doc.dirs | 1 -
debian/python-escript-doc.doc-base.1 | 8 +
debian/python-escript-doc.doc-base.2 | 12 +
debian/python-escript-doc.doc-base.3 | 10 +
debian/python-escript-doc.doc-base.4 | 10 +
debian/python-escript-doc.doc-base.5 | 10 +
debian/python-escript-doc.doc-base.6 | 9 +
debian/python-escript-doc.install | 3 +-
debian/python-escript-mpi.dirs | 4 -
debian/python-escript-mpi.lintian-overrides | 4 +
debian/python-escript.dirs | 4 -
debian/python-escript.lintian-overrides | 5 +
debian/python3-escript-mpi.dirs | 4 -
debian/python3-escript-mpi.lintian-overrides | 4 +
debian/python3-escript.dirs | 4 -
debian/python3-escript.lintian-overrides | 3 +
debian/rules | 1 +
debian/utils/cppy.py | 27 ++-
debian/utils/getsubst | 1 +
debian/utils/subst/vivid.subst | 6 +
debian/watch | 2 +
31 files changed, 572 insertions(+), 223 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 866b560..fcaa11d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-python-escript (4.1~1-1) experimental; urgency=low
- * Begin preparations for proper debianisation and next upstream.
+python-escript (4.1-1) experimental; urgency=low
+ * First debian release of escript. Upstream version 4.1.
* closes: 783157
-- Joel Fenwick <j.oelpublic at gmail.com> Thu, 23 Apr 2015 17:28:21 +1000
diff --git a/debian/control b/debian/control
index 504d3c3..1ce6a61 100644
--- a/debian/control
+++ b/debian/control
@@ -11,86 +11,137 @@ Build-Depends: python-all-dev (>= 2.6.6-3~), python3-all-dev, python-numpy, pyth
libboost-python-dev, libboost-random-dev, libnetcdf-dev, scons,
zip, python-sphinx, doxygen, python-docutils, texlive, ghostscript,
texlive-latex-extra, latex-xcolor, lsb-release,
- libopenmpi-dev, debhelper (>=9), dh-python
+ libopenmpi-dev, openmpi-bin, debhelper (>=9), dh-python
Standards-Version: 3.9.6
Package: python-escript
-Description: Escript/Finley finite elements python system.
- Solve partial differential equations using finite element methods.
+Description: Escript/Finley finite elements Python2 system (with OpenMP)
+ Escript is a programming tool for implementing mathematical models in Python
+ using the finite element method (FEM). Because users do not access the data
+ structures it is very easy to use and scripts can run on desktop computers
+ as well as highly parallel supercomputer without changes. Application areas
+ for escript include earth mantle convection, geophysical inversion,
+ earthquakes, porous media flow, reactive transport, plate subduction, erosion,
+ and tsunamis.
+ .
+ Scripts can be executed in parallel (on varying numbers of threads or nodes)
+ without any special modifications.
+ .
+ Escript now includes the esys.downunder module for 3D inversion of geophysical
+ data sets. The current version supports gravity, magnetic and joint inversion.
+ .
+ This package contains the commands and libraries for Python2 with
+ OpenMP threading.
Architecture: any
-Section: science
-Priority: extra
Pre-Depends: dpkg (>= 1.15.6~)
Depends:
${python:Depends},
python-numpy,
- libgomp1,
${shlibs:Depends},
${misc:Depends}
Recommends: python-sympy, python-matplotlib, python-scipy
Suggests: python-pyproj, python-gdal, python-escript-doc
-Conflicts: escript-noalias, escript
-Replaces: escript-noalias, escript
-Homepage: https://launchpad.net/escript-finley
Package: python-escript-mpi
-Description: Escript/Finley finite elements python system.
- Solve partial differential equations using finite element methods.
+Description: Escript/Finley finite elements Python2 system (OpenMP + MPI)
+ Escript is a programming tool for implementing mathematical models in Python
+ using the finite element method (FEM). Because users do not access the data
+ structures it is very easy to use and scripts can run on desktop computers as
+ well as highly parallel supercomputer without changes. Application areas for
+ escript include earth mantle convection, geophysical inversion, earthquakes,
+ porous media flow, reactive transport, plate subduction, erosion, and tsunamis.
+ .
+ Scripts can be executed in parallel (on varying numbers of threads or nodes)
+ without any special modifications.
+ .
+ Escript now includes the esys.downunder module for 3D inversion of geophysical
+ data sets. The current version supports gravity, magnetic and joint inversion.
+ .
+ This package contains the commands and libraries for Python2 with
+ both OpenMP threading and MPI multiprocess support.
Architecture: any
-Section: science
-Priority: extra
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${python:Depends}, libgomp1, openmpi-bin,
+Depends: ${python:Depends}, openmpi-bin,
${shlibs:Depends},
${misc:Depends}
Recommends: python-sympy, python-matplotlib, python-scipy
Suggests: python-pyproj, python-gdal, python-escript-doc
-Conflicts: escript-noalias, escript
-Replaces: escript-noalias, escript
-Homepage: https://launchpad.net/escript-finley
Package: python3-escript
-Description: Escript/Finley finite elements python system.
- Solve partial differential equations using finite element methods.
+Description: Escript/Finley finite elements Python3 system (with OpenMP)
+ Escript is a programming tool for implementing mathematical models in Python
+ using the finite element method (FEM). Because users do not access the data
+ structures it is very easy to use and scripts can run on desktop computers as
+ well as highly parallel supercomputer without changes. Application areas for
+ escript include earth mantle convection, geophysical inversion, earthquakes,
+ porous media flow, reactive transport, plate subduction, erosion, and
+ tsunamis.
+ .
+ Scripts can be executed in parallel (on varying numbers of threads or nodes)
+ without any special modifications.
+ .
+ Escript now includes the esys.downunder module for 3D inversion of geophysical
+ data sets. The current version supports gravity, magnetic and joint inversion.
+ .
+ This package contains the commands and libraries for Python3 with
+ OpenMP threading and MPI multiprocess support.
Architecture: any
-Section: science
-Priority: extra
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${python:Depends}, python3-numpy, libgomp1,
+Depends: ${python:Depends}, python3-numpy,
${shlibs:Depends},
${misc:Depends}
Recommends: python3-sympy, python3-matplotlib, python3-scipy
Suggests: python3-pyproj, python3-gdal, python-escript-doc
-Conflicts: escript-noalias, escript, python-escript(<=4.0)
-Replaces: escript-noalias, escript
-Homepage: https://launchpad.net/escript-finley
Package: python3-escript-mpi
-Description: Escript/Finley finite elements python system.
- Solve partial differential equations using finite element methods.
+Description: Escript/Finley finite elements Python3 system (OpenMP + MPI)
+ Escript is a programming tool for implementing mathematical models in Python
+ using the finite element method (FEM). Because users do not access the data
+ structures it is very easy to use and scripts can run on desktop computers as
+ well as highly parallel supercomputer without changes. Application areas for
+ escript include earth mantle convection, geophysical inversion, earthquakes,
+ porous media flow, reactive transport, plate subduction, erosion, and
+ tsunamis.
+ .
+ Scripts can be executed in parallel (on varying numbers of threads or nodes)
+ without any special modifications.
+ .
+ Escript now includes the esys.downunder module for 3D inversion of geophysical
+ data sets. The current version supports gravity, magnetic and joint inversion.
+ .
+ This package contains the commands and libraries for Python3 with
+ both OpenMP threading and MPI multiprocess support.
Architecture: any
-Section: science
-Priority: extra
Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${python:Depends}, python3-numpy, libgomp1, openmpi-bin,
+Depends: ${python:Depends}, python3-numpy, openmpi-bin,
${shlibs:Depends},
${misc:Depends}
Recommends: python3-sympy, python3-matplotlib, python3-scipy
Suggests: python3-pyproj, python3-gdal, python-escript-doc
-Conflicts: escript-noalias, escript, python-escript(<=4.0)
-Replaces: escript-noalias, escript
-Homepage: https://launchpad.net/escript-finley
Package: python-escript-doc
-Description: Documentation for Escript/Finley.
- Solve partial differential equations using finite element methods.
+Description: Documentation for Escript/Finley
+ Escript is a programming tool for implementing mathematical models in Python
+ using the finite element method (FEM). Because users do not access the data
+ structures it is very easy to use and scripts can run on desktop computers as
+ well as highly parallel supercomputer without changes. Application areas for
+ escript include earth mantle convection, geophysical inversion, earthquakes,
+ porous media flow, reactive transport, plate subduction, erosion, and
+ tsunamis.
+ .
+ Scripts can be executed in parallel (on varying numbers of threads or nodes)
+ without any special modifications.
+ .
+ Escript now includes the esys.downunder module for 3D inversion of geophysical
+ data sets. The current version supports gravity, magnetic and joint inversion.
+ .
+ This package contains the documentation for escript,
+ including example scripts the user guide, the cookbook (an introduction from
+ a geoscientists point of view) and a guide to the esys.downunder inversion
+ toolkit.
Architecture: all
-Section: science
-Priority: extra
Pre-Depends: dpkg (>= 1.15.6~)
Depends: doc-base(>=0.8.4), libjs-sphinxdoc,
${misc:Depends}
Recommends: python-escript
-Conflicts: escript
-Homepage: https://launchpad.net/escript-finley
diff --git a/debian/copyright b/debian/copyright
index d0d7970..c8b086a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,129 +3,129 @@ Upstream-Name: esys-escript
Source: https://launchpad.net/escript-finley
License: OSL-3
- Open Software License v. 3.0 (OSL-3.0)
- .
- This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
- .
- Licensed under the Open Software License version 3.0
- .
- 1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
- .
- a) to reproduce the Original Work in copies, either alone or as part of a collective work;
- .
- b) to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
- .
- c) to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
- .
- d) to perform the Original Work publicly; and
- .
- e) to display the Original Work publicly.
- .
- 2) Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
- .
- 3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an inform [...]
- .
- 4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is gr [...]
- .
- 5) External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the [...]
- .
- 6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
- .
- 7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, [...]
- .
- 8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. [...]
- .
- 9) Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in S [...]
- .
- 10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
- .
- 11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or a [...]
- .
- 12) Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
- .
- 13) Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
- .
- 14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contr [...]
- .
- 15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
- .
- 16) Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the f [...]
+ Open Software License v. 3.0 (OSL-3.0)
+ .
+ This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+ .
+ Licensed under the Open Software License version 3.0
+ .
+ 1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+ .
+ a) to reproduce the Original Work in copies, either alone or as part of a collective work;
+ .
+ b) to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+ .
+ c) to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+ .
+ d) to perform the Original Work publicly; and
+ .
+ e) to display the Original Work publicly.
+ .
+ 2) Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+ .
+ 3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an informa [...]
+ .
+ 4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is gra [...]
+ .
+ 5) External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the [...]
+ .
+ 6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+ .
+ 7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, e [...]
+ .
+ 8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. T [...]
+ .
+ 9) Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Se [...]
+ .
+ 10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+ .
+ 11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or af [...]
+ .
+ 12) Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+ .
+ 13) Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+ .
+ 14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contra [...]
+ .
+ 15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+ .
+ 16) Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the fo [...]
License: ASL-2.0
- Version 2.0, January 2004
- .
- http://www.apache.org/licenses/
- .
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
- .
- 1. Definitions.
- .
- "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
- .
- "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
- .
- "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
- .
- "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
- .
- "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
- .
- "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
- .
- "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
- .
- "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
- .
- "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or [...]
- .
- "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
- .
- 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
- .
- 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by comb [...]
- .
- 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
- .
- You must give any other recipients of the Work or Derivative Works a copy of this License; and
- You must cause any modified files to carry prominent notices stating that You changed the files; and
- You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
- If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; o [...]
- .
- You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
- .
- 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
- .
- 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
- .
- 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing t [...]
- .
- 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not lim [...]
- .
- 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor [...]
- .
- END OF TERMS AND CONDITIONS
+ Version 2.0, January 2004
+ .
+ http://www.apache.org/licenses/
+ .
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ .
+ 1. Definitions.
+ .
+ "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+ .
+ "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+ .
+ "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+ .
+ "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+ .
+ "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+ .
+ "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+ .
+ "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+ .
+ "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+ .
+ "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or i [...]
+ .
+ "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+ .
+ 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+ .
+ 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combi [...]
+ .
+ 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+ .
+ You must give any other recipients of the Work or Derivative Works a copy of this License; and
+ You must cause any modified files to carry prominent notices stating that You changed the files; and
+ You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+ If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or [...]
+ .
+ You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+ .
+ 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+ .
+ 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+ .
+ 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing th [...]
+ .
+ 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limi [...]
+ .
+ 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor [...]
+ .
+ END OF TERMS AND CONDITIONS
License: Expat
- Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
- .
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+ .
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Files: *
Copyright: 2003-2015 The University of Queensland
@@ -155,43 +155,43 @@ License: ASL-2.0
#0 3
Files: cusplibrary/cusp/array2d.h
- cusplibrary/cusp/detail/multiply.inl
- cusplibrary/cusp/detail/copy.inl
- cusplibrary/cusp/detail/host/multiply.h
- cusplibrary/cusp/detail/host/conversion.h
- cusplibrary/cusp/detail/host/convert.h
- cusplibrary/cusp/detail/dispatch/multiply.h
- cusplibrary/cusp/detail/device/multiply.h
- cusplibrary/cusp/detail/device/conversion.h
- cusplibrary/cusp/detail/device/convert.h
- cusplibrary/cusp/detail/format_utils.inl
- cusplibrary/cusp/format.h
- cusplibrary/cusp/multiply.h
- cusplibrary/cusp/gallery/random.h
- cusplibrary/cusp/graph/detail/host/hilbert_curve.h
- cusplibrary/cusp/graph/detail/dispatch/hilbert_curve.h
- cusplibrary/cusp/dia_matrix.h
- cusplibrary/cusp/monitor.h
+ cusplibrary/cusp/detail/multiply.inl
+ cusplibrary/cusp/detail/copy.inl
+ cusplibrary/cusp/detail/host/multiply.h
+ cusplibrary/cusp/detail/host/conversion.h
+ cusplibrary/cusp/detail/host/convert.h
+ cusplibrary/cusp/detail/dispatch/multiply.h
+ cusplibrary/cusp/detail/device/multiply.h
+ cusplibrary/cusp/detail/device/conversion.h
+ cusplibrary/cusp/detail/device/convert.h
+ cusplibrary/cusp/detail/format_utils.inl
+ cusplibrary/cusp/format.h
+ cusplibrary/cusp/multiply.h
+ cusplibrary/cusp/gallery/random.h
+ cusplibrary/cusp/graph/detail/host/hilbert_curve.h
+ cusplibrary/cusp/graph/detail/dispatch/hilbert_curve.h
+ cusplibrary/cusp/dia_matrix.h
+ cusplibrary/cusp/monitor.h
Copyright: NVIDIA Corporation, The University of Queensland
License: ASL-2.0
#1
Files: cusplibrary/cusp/opengl/spy/spy.h
- cusplibrary/cusp/opengl/spy/detail/gl_util.inl
- cusplibrary/cusp/opengl/spy/detail/glut_2d_canvas.inl
- cusplibrary/cusp/opengl/spy/matrix_canvas.h
- cusplibrary/cusp/opengl/spy/gl_util.h
- cusplibrary/cusp/opengl/spy/colormaps.h
+ cusplibrary/cusp/opengl/spy/detail/gl_util.inl
+ cusplibrary/cusp/opengl/spy/detail/glut_2d_canvas.inl
+ cusplibrary/cusp/opengl/spy/matrix_canvas.h
+ cusplibrary/cusp/opengl/spy/gl_util.h
+ cusplibrary/cusp/opengl/spy/colormaps.h
Copyright: Steven Dalton
License: ASL-2.0
#1 4
Files: cusplibrary/cusp/opengl/spy/detail/matrix_canvas_svg_output.inl
- cusplibrary/cusp/opengl/spy/detail/matrix_data_cursor.inl
- cusplibrary/cusp/opengl/spy/detail/matrix_data_panel.inl
- cusplibrary/cusp/opengl/spy/detail/matrix_canvas.inl
- cusplibrary/cusp/opengl/spy/matrix_data_panel.h
- cusplibrary/cusp/opengl/spy/matrix_data_cursor.h
+ cusplibrary/cusp/opengl/spy/detail/matrix_data_cursor.inl
+ cusplibrary/cusp/opengl/spy/detail/matrix_data_panel.inl
+ cusplibrary/cusp/opengl/spy/detail/matrix_canvas.inl
+ cusplibrary/cusp/opengl/spy/matrix_data_panel.h
+ cusplibrary/cusp/opengl/spy/matrix_data_cursor.h
Copyright: Steven Dalton, Stanford University
License: ASL-2.0
@@ -202,30 +202,30 @@ License: ASL-2.0
#2
Files: cusplibrary/cusp/krylov/detail/gmres.inl
- cusplibrary/cusp/krylov/gmres.h
+ cusplibrary/cusp/krylov/gmres.h
Copyright: The Regents of the University of California
License: ASL-2.0
#2 3
Files: cusplibrary/cusp/krylov/detail/lsqr.inl
- cusplibrary/cusp/krylov/lsqr.h
+ cusplibrary/cusp/krylov/lsqr.h
Copyright: The Regents of the University of California, The University of Queensland
License: ASL-2.0
#3
Files: cusplibrary/examples/Algorithms/transposed_spmv.cu
- cusplibrary/cusp/krylov/detail/cgls.inl
- cusplibrary/cusp/krylov/cgls.h
- cusplibrary/cusp/detail/cds_matrix.inl
- cusplibrary/cusp/detail/host/spmv.h
- cusplibrary/cusp/detail/host/transposed_multiply.h
- cusplibrary/cusp/detail/host/transposed_spmv.h
- cusplibrary/cusp/detail/device/spmv/cds.h
- cusplibrary/cusp/detail/device/spmv/cds_symmetric.h
- cusplibrary/cusp/detail/device/transposed_multiply.h
- cusplibrary/cusp/detail/device/transposed_spmv/cds.h
- cusplibrary/cusp/detail/device/transposed_spmv/dia.h
- cusplibrary/cusp/cds_matrix.h
+ cusplibrary/cusp/krylov/detail/cgls.inl
+ cusplibrary/cusp/krylov/cgls.h
+ cusplibrary/cusp/detail/cds_matrix.inl
+ cusplibrary/cusp/detail/host/spmv.h
+ cusplibrary/cusp/detail/host/transposed_multiply.h
+ cusplibrary/cusp/detail/host/transposed_spmv.h
+ cusplibrary/cusp/detail/device/spmv/cds.h
+ cusplibrary/cusp/detail/device/spmv/cds_symmetric.h
+ cusplibrary/cusp/detail/device/transposed_multiply.h
+ cusplibrary/cusp/detail/device/transposed_spmv/cds.h
+ cusplibrary/cusp/detail/device/transposed_spmv/dia.h
+ cusplibrary/cusp/cds_matrix.h
Copyright: The University of Queensland
License: ASL-2.0
diff --git a/debian/patches/dateless-gz b/debian/patches/dateless-gz
new file mode 100644
index 0000000..1fd9fc4
--- /dev/null
+++ b/debian/patches/dateless-gz
@@ -0,0 +1,23 @@
+Description: Prevent gzip of examples from including timestamps.
+ Addresses lintian warning.
+Author: Joel Fenwick <joelfenwick at uq.edu.au>
+Forwarded: yes
+Applied-Upstream: yes
+
+--- a/doc/SConscript
++++ b/doc/SConscript
+@@ -199,9 +199,11 @@ zip_path=os.path.join(release_dir, 'escr
+ zip = local_env.Command(zip_path, None, dir_cmd+"zip "+zip_path+" "+" ".join(ex2))
+ env.Alias('examples_zipfile', zip)
+
+-tar_path=os.path.join(release_dir, 'escript_examples.tar.gz')
+-tar = local_env.Command(tar_path, None, dir_cmd+"tar -czf "+tar_path+" "+" ".join(ex2))
+-env.Alias('examples_tarfile', tar)
++tar_path=os.path.join(release_dir, 'escript_examples.tar')
++targz_path=os.path.join(release_dir, 'escript_examples.tar.gz')
++tar = local_env.Command(tar_path, None, dir_cmd+"tar -cf "+tar_path+" "+" ".join(ex2))
++targz = local_env.Command(targz_path, tar, "gzip -n -9 "+tar_path)
++env.Alias('examples_tarfile', targz)
+
+ #env=Environment(TARFLAGS = "-c -z",chdir=src_dir)
+ #if 'Tar' in dir(env):
diff --git a/debian/patches/doxygenfix b/debian/patches/doxygenfix
new file mode 100644
index 0000000..000ce5b
--- /dev/null
+++ b/debian/patches/doxygenfix
@@ -0,0 +1,19 @@
+Description: Don't specify a font in doxygen.
+ The doxyfile specified a font which is no longer shipped.
+ Since we don't really care which font is used this has been
+ removed.
+Author: Joel Fenwick <joelfenwick at uq.edu.au>
+Forwarded: yes
+Applied-Upstream: yes
+
+--- a/doc/doxygen/doxygen_esys
++++ b/doc/doxygen/doxygen_esys
+@@ -2120,7 +2120,7 @@ DOT_NUM_THREADS = 0
+ # The default value is: Helvetica.
+ # This tag requires that the tag HAVE_DOT is set to YES.
+
+-DOT_FONTNAME = FreeSans
++#DOT_FONTNAME = FreeSans
+
+ # The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+ # dot graphs.
diff --git a/debian/patches/grammar-errors b/debian/patches/grammar-errors
new file mode 100644
index 0000000..a951803
--- /dev/null
+++ b/debian/patches/grammar-errors
@@ -0,0 +1,36 @@
+Description: Fixed some grammar errors.
+Author: Joel Fenwick <joelfenwick at uq.edu.au>
+Forwarded: yes
+Applied-Upstream: yes
+
+--- a/escriptcore/py_src/rheologies.py
++++ b/escriptcore/py_src/rheologies.py
+@@ -60,7 +60,7 @@ class PowerLaw(object):
+
+ :param numMaterials: number of materials
+ :type numMaterials: ``int``
+- :param verbose: if ``True`` some informations are printed.
++ :param verbose: if ``True`` some information is printed.
+ :type verbose: ``bool``
+ """
+ if numMaterials<1:
+@@ -623,7 +623,7 @@ class IncompressibleIsotropicFlowCartesi
+ :type t: ``float``
+ :param numMaterials: number of materials
+ :type numMaterials: ``int``
+- :param verbose: if ``True`` some informations are printed.
++ :param verbose: if ``True`` some information is printed.
+ :type verbose: ``bool``
+ """
+ PowerLaw. __init__(self, numMaterials,verbose=verbose)
+--- a/escriptcore/src/escriptcpp.cpp
++++ b/escriptcore/src/escriptcpp.cpp
+@@ -1017,7 +1017,7 @@ args("source", "q", "r","factor"),
+ "'residual_norm', 'converged'.\n"
+ ":param value: new value of the diagnostic information\n"
+ ":note: this function is used by a solver to report diagnostics\n"
+- "informations.")
++ "information.")
+ .def("getDiagnostics", &escript::SolverBuddy::getDiagnostics, args("name"),"Returns the diagnostic information ``name``. Possible values are:\n\n"
+ "- 'num_iter': the number of iteration steps\n"
+ "- 'cum_num_iter': the cumulative number of iteration steps\n"
diff --git a/debian/patches/mpi-gaol b/debian/patches/mpi-gaol
new file mode 100644
index 0000000..49b426c
--- /dev/null
+++ b/debian/patches/mpi-gaol
@@ -0,0 +1,33 @@
+Description: Enable escript launcher to run in a gaol.
+Author: Joel Fenwick <joelfenwick at uq.edu.au>
+Forwarded: yes
+Applied-Upstream: yes
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -370,7 +370,7 @@ if env['launcher'] == 'default':
+ if env['mpi'] == 'INTELMPI':
+ env['launcher'] = "mpirun -hostfile %f -n %N -ppn %p %b"
+ elif env['mpi'] == 'OPENMPI':
+- env['launcher'] = "mpirun --gmca mpi_warn_on_fork 0 ${EE} --host %h -bynode -bind-to-core --cpus-per-rank %t -np %N %b"
++ env['launcher'] = "mpirun ${AGENTOVERRIDE} --gmca mpi_warn_on_fork 0 ${EE} --host %h -bynode -bind-to-core --cpus-per-rank %t -np %N %b"
+ elif env['mpi'] == 'MPT':
+ env['launcher'] = "mpirun %h -np %p %b"
+ elif env['mpi'] == 'MPICH':
+--- a/run-escript.in
++++ b/run-escript.in
+@@ -467,6 +467,14 @@ then
+ EXPORT_ENV="$EXPORT_ENV,OMP_NUM_THREADS"
+ fi
+
++if [ "$MPI_FLAVOUR" = "OPENMPI" ]
++then
++ if [ -z `which rsh``which ssh` ]
++ then
++ AGENTOVERRIDE="--gmca orte_rsh_agent /bin/false"
++ fi
++fi
++
+ vlog "Pre-launch command: \"@@PRELAUNCH\""
+ @@PRELAUNCH
+ vlog "Launch command: \"@@LAUNCH\""
diff --git a/debian/patches/release-sanity b/debian/patches/release-sanity
new file mode 100644
index 0000000..336c17c
--- /dev/null
+++ b/debian/patches/release-sanity
@@ -0,0 +1,69 @@
+Description: Added a basic sanity check to the scons file.
+Author: Joel Fenwick <joelfenwick at uq.edu.au>
+Forwarded: yes
+Applied-Upstream: yes
+--- a/SConstruct
++++ b/SConstruct
+@@ -683,10 +683,30 @@ install_all_list += ['install_modellib_p
+ install_all_list += ['install_pycad_py']
+ if env['usempi']:
+ install_all_list += ['install_pythonMPI', 'install_overlord']
+-env.Alias('install_all', install_all_list)
++install_all_list += ['install_weipa_py']
++install_all_list += [env.Install(os.path.join(env['build_dir'],'scripts'), os.path.join('scripts', 'release_sanity.py'))]
++install_all=env.Alias('install_all', install_all_list)
+
+ # Default target is install
+-env.Default('install_all')
++#env.Default('install_all')
++
++
++sanity=env.Alias('sanity', env.Command('dummy','',os.path.join(env['prefix'], 'bin', 'run-escript')+' '+os.path.join(env['build_dir'],'scripts', 'release_sanity.py')))
++env.Depends('dummy', install_all)
++if env['usempi']:
++ #env.Requires('dummy', ['build_pythonMPI', 'install_pythonMPI'])
++ #env.Requires('dummy', env['prefix']+"/lib/pythonMPI")
++ env.Depends('dummy', ['build_pythonMPI', 'install_pythonMPI'])
++ env.Depends('dummy', env['prefix']+"/lib/pythonMPI")
++
++if 'install_dudley' in install_all_list and \
++ 'install_finley' in install_all_list and \
++ 'install_ripley' in install_all_list and \
++ 'install_speckley' in install_all_list:
++ env.AlwaysBuild('sanity')
++ env.Default('sanity')
++else:
++ env.Default('install_all')
+
+ ################## Targets to build and run the test suite ###################
+
+--- /dev/null
++++ b/scripts/release_sanity.py
+@@ -0,0 +1,27 @@
++
++# Very basic sanity checks following a build
++# It is important that this script does not create any files unless
++# it is _certain_ they are removed when finished or failed.
++# We do not want the source directory polluted by actions here
++
++
++from esys.escript import *
++from esys.escript.linearPDEs import Poisson
++import esys.ripley as ripley
++import esys.finley as finley
++import esys.speckley as speckley
++from esys.weipa import saveVTK
++
++mydomain = finley.Rectangle(l0=1.,l1=1.,n0=40, n1=20)
++# define characteristic function of Gamma^D
++x = mydomain.getX()
++gammaD = whereZero(x[0])+whereZero(x[1])
++# define PDE and get its solution u
++mypde = Poisson(domain=mydomain)
++mypde.setValue(f=1,q=gammaD)
++u = mypde.getSolution()
++# write u to an external file
++#saveVTK("u.vtu",sol=u)
++
++
++
diff --git a/debian/patches/relocating-debian-dir b/debian/patches/relocating-debian-dir
new file mode 100644
index 0000000..d1e19e1
--- /dev/null
+++ b/debian/patches/relocating-debian-dir
@@ -0,0 +1,24 @@
+Description: Changes to some maint scripts to account for debian/ moving.
+ This does not directly affect debian builds because that directory
+ is removed anyway. But it allows the source to be kept in synch.
+Author: Joel Fenwick <joelfenwick at uq.edu.au>
+Forwarded: yes
+Applied-Upstream: yes
+
+--- a/scripts/extracttests.sh
++++ b/scripts/extracttests.sh
+@@ -55,4 +55,4 @@ find . -name 'src' | xargs rm -r
+ rm -r scons
+ rm -r doc/user doc/cookbook
+ find doc -name '*.tex' | xargs rm
+-rm -rf debian
++rm -rf localdebian
+--- a/scripts/makesrc.sh
++++ b/scripts/makesrc.sh
+@@ -13,5 +13,5 @@ then
+ fi
+ svnversion > svn_version
+
+-tar -czf ../python-escript_$SRCVERSION.orig.tar.gz --exclude-vcs --exclude=debian --exclude=scons/*options.py *
++tar -czf ../python-escript_$SRCVERSION.orig.tar.gz --exclude-vcs --exclude=debian --exclude=localdebian --exclude=scons/*options.py *
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..52fb93d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+release-sanity
+mpi-gaol
+grammar-errors
+relocating-debian-dir
+doxygenfix
+dateless-gz
diff --git a/debian/python-escript-doc.dirs b/debian/python-escript-doc.dirs
deleted file mode 100644
index dc6ae1b..0000000
--- a/debian/python-escript-doc.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/python-escript-doc
diff --git a/debian/python-escript-doc.doc-base.1 b/debian/python-escript-doc.doc-base.1
new file mode 100644
index 0000000..a9b13c2
--- /dev/null
+++ b/debian/python-escript-doc.doc-base.1
@@ -0,0 +1,8 @@
+Document: escript-install-guide
+Title: Escript install guide
+Author: Escript development team
+Abstract: Guide to configuring Escript from source
+Section: Science/Geoscience
+
+Format: PDF
+Files: /usr/share/doc/python-escript-doc/install.pdf.gz
diff --git a/debian/python-escript-doc.doc-base.2 b/debian/python-escript-doc.doc-base.2
new file mode 100644
index 0000000..ea567c2
--- /dev/null
+++ b/debian/python-escript-doc.doc-base.2
@@ -0,0 +1,12 @@
+Document: escript-cookbook
+Title: The escript cookbook
+Author: Antony Hallam, Lutz Gross, et al.
+Abstract: escript is a Python based environment that has been developed to solve complex mathematical models, particularly
+ coupled, non-linear and time-dependent partial differential equations. The intention of this cookbook is to introduce
+ new users to escript and provide a set of examples which demonstrate the major concepts and can be adapted
+ to new problems. Although most of the examples in this cookbook are focused on the disciplines of geophysics
+ and geology, they provide a solid introduction to escript and its capabilities.
+Section: Science/Geoscience
+
+Format: PDF
+Files: /usr/share/doc/python-escript-doc/cookbook.pdf.gz
diff --git a/debian/python-escript-doc.doc-base.3 b/debian/python-escript-doc.doc-base.3
new file mode 100644
index 0000000..5108166
--- /dev/null
+++ b/debian/python-escript-doc.doc-base.3
@@ -0,0 +1,10 @@
+Document: escript-user-guide
+Title: esys-Escript User’s Guide:
+ Solving Partial Differential Equations
+ with Escript and Finley
+Author: Escript development team
+Abstract: User guide the escript PDE solving libraries.
+Section: Science/Geoscience
+
+Format: PDF
+Files: /usr/share/doc/python-escript-doc/user.pdf.gz
\ No newline at end of file
diff --git a/debian/python-escript-doc.doc-base.4 b/debian/python-escript-doc.doc-base.4
new file mode 100644
index 0000000..1635a33
--- /dev/null
+++ b/debian/python-escript-doc.doc-base.4
@@ -0,0 +1,10 @@
+Document: escript-inversion-guide
+Title: esys.downunder: Inversion with
+ escript
+Author: Cihan Altinay, Vince Boros, Lutz Gross, Jaco du Plessis,
+ Azadeh Salehi
+Abstract: Guide to the inversion toolkit in escript
+Section: Science/Geoscience
+
+Format: PDF
+Files: /usr/share/doc/python-escript-doc/inversion.pdf.gz
\ No newline at end of file
diff --git a/debian/python-escript-doc.doc-base.5 b/debian/python-escript-doc.doc-base.5
new file mode 100644
index 0000000..35a0200
--- /dev/null
+++ b/debian/python-escript-doc.doc-base.5
@@ -0,0 +1,10 @@
+Document: escript-c++-side
+Title: API for escript's C++ side
+Author: Escript development team
+Abstract: Documentation for the C++ API for escript and related libraries.
+Section: Science/Geoscience
+
+Format: HTML
+Index: /usr/share/doc/python-escript-doc/c++_html/index.html
+Files: /usr/share/doc/python-escript-doc/c++_html/*.html
+ /usr/share/doc/python-escript-doc/c++_html/*.png
\ No newline at end of file
diff --git a/debian/python-escript-doc.doc-base.6 b/debian/python-escript-doc.doc-base.6
new file mode 100644
index 0000000..3b4121a
--- /dev/null
+++ b/debian/python-escript-doc.doc-base.6
@@ -0,0 +1,9 @@
+Document: escript-python-api
+Title: API for escript's Python side
+Author: Escript development team
+Abstract: Documentation for the Python API for escript and related libraries.
+Section: Science/Geoscience
+
+Format: HTML
+Index: /usr/share/doc/python-escript-doc/python_html/index.html
+Files: /usr/share/doc/python-escript-doc/python_html/*
\ No newline at end of file
diff --git a/debian/python-escript-doc.install b/debian/python-escript-doc.install
index 07446e0..6f42c70 100644
--- a/debian/python-escript-doc.install
+++ b/debian/python-escript-doc.install
@@ -1,8 +1,9 @@
+#Using this instead of python-escript-doc.docs because I want to rename the c++ doco from "doxygen"
debian/stage2/release/doc/install/install.pdf usr/share/doc/python-escript-doc
debian/stage2/release/doc/user/user.pdf usr/share/doc/python-escript-doc
debian/stage2/release/doc/cookbook/cookbook.pdf usr/share/doc/python-escript-doc
debian/stage2/release/doc/inversion/inversion.pdf usr/share/doc/python-escript-doc/
debian/stage2/release/doc/sphinx_api/* usr/share/doc/python-escript-doc/python_html
debian/stage2/release/doc/sphinx_api/_static/basic.css usr/share/doc/python-escript-doc/python_html/_static
-debian/stage2/release/doc/doxygen usr/share/doc/python-escript-doc/doxygen
+debian/stage2/release/doc/doxygen/html/* usr/share/doc/python-escript-doc/c++_html
debian/copyright usr/share/doc/python-escript-doc
diff --git a/debian/python-escript-mpi.dirs b/debian/python-escript-mpi.dirs
deleted file mode 100644
index 8e5a8d6..0000000
--- a/debian/python-escript-mpi.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/doc/python-escript-mpi/
-usr/share/man/man1
-usr/lib/python-escript-mpi
-usr/bin
diff --git a/debian/python-escript-mpi.lintian-overrides b/debian/python-escript-mpi.lintian-overrides
index 648b7ca..392f236 100644
--- a/debian/python-escript-mpi.lintian-overrides
+++ b/debian/python-escript-mpi.lintian-overrides
@@ -4,3 +4,7 @@
python-escript-mpi: hardening-no-fortify-functions
python-escript-mpi: wrong-section-according-to-package-name
+python-escript-mpi: hyphen-used-as-minus-sign
+
+#tEH in the binary is a coincidence
+python-escript-mpi: spelling-error-in-binary
diff --git a/debian/python-escript.dirs b/debian/python-escript.dirs
deleted file mode 100644
index b575398..0000000
--- a/debian/python-escript.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/doc/python-escript/
-usr/share/man/man1
-usr/lib/python-escript
-usr/bin
diff --git a/debian/python-escript.lintian-overrides b/debian/python-escript.lintian-overrides
index aeb68d0..c9a1a83 100644
--- a/debian/python-escript.lintian-overrides
+++ b/debian/python-escript.lintian-overrides
@@ -5,3 +5,8 @@ python-escript: wrong-section-according-to-package-name
# All libraries are build with the same flags, only some are reported
# as being un-hardened.
python-escript: hardening-no-fortify-functions
+
+python-escript: hyphen-used-as-minus-sign
+
+#tEH in the binary is a coincidence
+python-escript: spelling-error-in-binary
diff --git a/debian/python3-escript-mpi.dirs b/debian/python3-escript-mpi.dirs
deleted file mode 100644
index 0dba876..0000000
--- a/debian/python3-escript-mpi.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/doc/python3-escript-mpi/
-usr/share/man/man1
-usr/lib/python3-escript-mpi
-usr/bin
diff --git a/debian/python3-escript-mpi.lintian-overrides b/debian/python3-escript-mpi.lintian-overrides
index 9ff3821..9741799 100644
--- a/debian/python3-escript-mpi.lintian-overrides
+++ b/debian/python3-escript-mpi.lintian-overrides
@@ -3,3 +3,7 @@
# as being un-hardened.
python3-escript-mpi: hardening-no-fortify-functions
+python3-escript-mpi: hyphen-used-as-minus-sign
+
+# tEH in the binary is a coincidence
+python3-escript-mpi: spelling-error-in-binary
diff --git a/debian/python3-escript.dirs b/debian/python3-escript.dirs
deleted file mode 100644
index f2b3b8b..0000000
--- a/debian/python3-escript.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/doc/python3-escript/
-usr/share/man/man1
-usr/lib/python3-escript
-usr/bin
diff --git a/debian/python3-escript.lintian-overrides b/debian/python3-escript.lintian-overrides
index d17f3e7..fdf3727 100644
--- a/debian/python3-escript.lintian-overrides
+++ b/debian/python3-escript.lintian-overrides
@@ -2,4 +2,7 @@
# All libraries are build with the same flags, only some are reported
# as being un-hardened.
python3-escript: hardening-no-fortify-functions
+python3-escript: hyphen-used-as-minus-sign
+# tEH in the binary is a coincidence
+python3-escript: spelling-error-in-binary
diff --git a/debian/rules b/debian/rules
index 28ec5f7..d206c14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -220,6 +220,7 @@ binary-indep:
dh_installdirs -ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
dh_install -ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
dh_installchangelogs -ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST) debian/changelog.trivial
+ dh_installdocs -ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
dh_installexamples -ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
dh_link -ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
dh_lintian -ppython-escript-doc -Npython3-escript-mpi -Npython3-escript -Npython-escript -Npython-escript-mpi -P$(DDEST)
diff --git a/debian/utils/cppy.py b/debian/utils/cppy.py
index 04a4dd9..864c3e2 100755
--- a/debian/utils/cppy.py
+++ b/debian/utils/cppy.py
@@ -1,7 +1,24 @@
#!/usr/bin/python
+##############################################################################
+#
+# Copyright (c) 2003-2015 by The University of Queensland
+# http://www.uq.edu.au
+#
+# Primary Business: Queensland, Australia
+# Licensed under the Open Software License version 3.0
+# http://www.opensource.org/licenses/osl-3.0.php
+#
+# Development until 2012 by Earth Systems Science Computational Center (ESSCC)
+# Development 2012-2013 by School of Earth Sciences
+# Development from 2014 by Centre for Geoscience Computing (GeoComp)
+#
+##############################################################################
+
# locates the source of .pyc in the esys directory and copies to the specified dest directory
-from __future__ import print_function
+
+from __future__ import print_function, division
+
import os, shutil, sys
if len(sys.argv)!=2:
@@ -11,6 +28,8 @@ if len(sys.argv)!=2:
print("TESTING")
for dirn, subdir, files in os.walk("esys"):
+ if dirn.find('__pycache__')!=-1:
+ continue
first=True
for n in files:
if n.endswith(".pyc"):
@@ -18,10 +37,10 @@ for dirn, subdir, files in os.walk("esys"):
if first:
first=False
print("os.makedirs("+dirn+")")
- try:
+ try:
os.makedirs(dirn)
- except OSError:
- pass
+ except OSError:
+ pass
lst=dirn.split("/")
if len(lst)==1:
continue
diff --git a/debian/utils/getsubst b/debian/utils/getsubst
index 3d1f0d3..e443e6b 100755
--- a/debian/utils/getsubst
+++ b/debian/utils/getsubst
@@ -15,6 +15,7 @@ case "$distr" in
"jessie" ) opf="jessie" ;;
"trusty") opf="trusty";;
"utopic") opf="utopic";;
+ "vivid") opf="vivid";;
*) echo "No file found" >&2; exit 1;;
esac
rm -f debian/substvars
diff --git a/debian/utils/subst/vivid.subst b/debian/utils/subst/vivid.subst
new file mode 100644
index 0000000..6e22d17
--- /dev/null
+++ b/debian/utils/subst/vivid.subst
@@ -0,0 +1,6 @@
+es:python=python2.7, libpython2.7
+es:boostpy=libboost-python1.55.0
+es:boostrandom=libboost-random1.55.0
+es:netcdf=libnetcdfc7, libnetcdfc++4
+es:doc=python-sphinx
+
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..a6652e1
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://launchpad.net/escript-finley/+download https://launchpad.net/escript-finley/3.0\+/.+/\+download/python-escript_(.+).tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-escript.git
More information about the debian-science-commits
mailing list