[dolfin] 01/02: Merge branch 'master' into experimental

[Johannes Ring]

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

johannr-guest pushed a commit to branch experimental
in repository dolfin.

commit a9d4790ef7d931dd143ea7fcb58dcc793f8c2d49
Merge: 8acce33 380b78e
Author: Johannes Ring <johannr at simula.no>
Date:   Tue May 30 14:15:58 2017 +0200

    Merge branch 'master' into experimental

 debian/changelog                     | 26 ++++++-----
 debian/control                       | 78 +++++++++++++++++++++++++++++---
 debian/patches/python3-decode.patch  | 30 ++++++++++++
 debian/patches/python3-support.patch | 88 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  2 +
 debian/python-dolfin.install         |  2 +-
 debian/python3-dolfin.install        |  1 +
 debian/rules                         | 47 ++++++++++---------
 8 files changed, 232 insertions(+), 42 deletions(-)

diff --cc debian/changelog
index cc728d6,eb4e08c..43b45ee
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,15 +1,27 @@@
 +dolfin (2017.1.0-1) UNRELEASED; urgency=medium
 +
-   [ Drew Parsons ]
-   * Enable petsc/slepc dependencies on kfreebsd. Note that PETSc
-     support in dolfin on kfreebsd is not in fact active due to linking
-     problems during configuration tests, but dolfin builds
-     successfully without it. Closes: #822971.
- 
-   [ Johannes Ring ]
 +  * New upstream release.
 +  * d/control:
 +    - Update package names (libdolfin2016.2 -> libdolfin2017.1
 +      and libdolfin2016.2-dbg -> libdolfin2017.1-dbg).
 +    - Bump minimum required version for python-dijitso and python-ffc to
 +      2017.1 in Build-Depends.
-     - Add petsc4py depends to Depends for binary package libdolfin-dev.
 +  * Move d/libdolfin2016.2.install -> d/libdolfin2017.1.install.
-   * d/rules:
-     - Let CMake figure out Python details automatically.
-     - Add petsc4py depends to libdolfin-dev.substvars.
 +
-  -- Johannes Ring <johannr at simula.no>  Thu, 11 May 2017 11:53:10 +0200
++ -- Johannes Ring <johannr at simula.no>  Tue, 30 May 2017 13:56:42 +0200
++
+ dolfin (2016.2.0-3) unstable; urgency=medium
+ 
+   [ Drew Parsons ]
+   * Enable petsc/slepc dependencies on kfreebsd. Note that PETSc
+     support in dolfin on kfreebsd is not in fact active due to linking
+     problems during configuration tests, but dolfin builds
+     successfully without it. Closes: #822971.
+ 
+   [ Johannes Ring ]
+   * Support Python 3: new packages python3-dolfin and python3-dolfin-dbg.
+ 
+  -- Drew Parsons <dparsons at debian.org>  Tue, 30 May 2017 16:17:28 +0800
  
  dolfin (2016.2.0-2) unstable; urgency=medium
  
diff --cc debian/control
index c64a375,7aa4786..bb441b6
--- a/debian/control
+++ b/debian/control
@@@ -29,13 -29,23 +29,23 @@@ Build-Depends
   mpi-default-dev,
   petsc-dev (>= 3.6.4.dfsg1-2),
   slepc-dev (>= 3.6.3.dfsg1-6),
-  python-petsc4py, python-slepc4py,
+  python-petsc4py,
+  python-slepc4py,
+  python3-petsc4py,
+  python3-slepc4py,
   pkg-config,
   python-dev,
+  python3-dev,
+  python-pkg-resources,
+  python3-pkg-resources,
 - python-ffc (>= 2016.2.0), python-ffc (<< 2016.3.0),
 - python-dijitso (>= 2016.2.0), python-dijitso (<< 2016.3.0),
 - python3-ffc (>= 2016.2.0), python3-ffc (<< 2016.3.0),
 - python3-dijitso (>= 2016.2.0), python3-dijitso (<< 2016.3.0),
 + python-ffc (>= 2017.1.0), python-ffc (<< 2017.2.0),
 + python-dijitso (>= 2017.1.0), python-dijitso (<< 2017.2.0),
++ python3-ffc (>= 2017.1.0), python3-ffc (<< 2017.2.0),
++ python3-dijitso (>= 2017.1.0), python3-dijitso (<< 2017.2.0),
   python-numpy,
+  python3-numpy,
   python-ply,
+  python3-ply,
   swig3.0 (>= 3.0.3)
  Standards-Version: 3.9.8
  X-Python-Version: >= 2.7
@@@ -154,7 -166,38 +166,38 @@@ Description: Python interface for DOLFI
   variational forms; automatic and efficient assembly of linear
   systems; and support for general families of finite elements.
   .
-  This package contains the Python interface for DOLFIN.
+  This package contains the Python interface for DOLFIN (Python 2).
+ 
+ Package: python3-dolfin
+ Section: python
+ Architecture: any
+ Depends:
+  libdolfin-dev (= ${binary:Version}),
 - libdolfin2016.2 (= ${binary:Version}),
++ libdolfin2017.1 (= ${binary:Version}),
+  python3-ffc (>= ${source:Upstream-Version}), python3-ffc (<< ${source:Next-Upstream-Version}),
+  python3-dijitso (>= ${source:Upstream-Version}), python3-dijitso (<< ${source:Next-Upstream-Version}),
+  python3-instant (>= ${source:Upstream-Version}), python3-instant (<< ${source:Next-Upstream-Version}),
+  python3-numpy,
+  python3-ply,
+  python3-six,
+  python3-sympy,
+  python3-ufl (>= ${source:Upstream-Version}), python3-ufl (<< ${source:Next-Upstream-Version}),
+  ${python3-petsc4py:Depends},
+  ${misc:Depends},
+  ${python3:Depends},
+  ${shlibs:Depends},
+  ${swig:Depends}
+ Suggests: dolfin-doc
+ Description: Python interface for DOLFIN (Python 3)
+  DOLFIN is the Python and C++ interface of the FEniCS project for the
+  automated solution of differential equations, providing a consistent
+  PSE (Problem Solving Environment) for solving ordinary and partial
+  differential equations. Key features include a simple, consistent and
+  intuitive object-oriented API; automatic and efficient evaluation of
+  variational forms; automatic and efficient assembly of linear
+  systems; and support for general families of finite elements.
+  .
+  This package contains the Python interface for DOLFIN (Python 3).
  
  Package: python-dolfin-dbg
  Section: debug

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fenics/dolfin.git