[ecflow] 25/50: Add python3; fixes for install locations

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository ecflow.

commit a3de9061438a3e551037e64167a17087ba28b80b
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jul 12 10:00:28 2017 +0100

    Add python3; fixes for install locations
---
 debian/control                                      | 21 ++++++++++++++++-----
 debian/ecflow-client.docs                           |  4 ++++
 ...flow-client.install => ecflow-client.install.in} |  0
 debian/ecflow-server.docs                           |  4 ++++
 ...flow-server.install => ecflow-server.install.in} |  0
 debian/libecflow0.install                           |  1 -
 debian/libecflow_view0.install.in                   |  1 +
 debian/python-ecflow.install                        |  2 +-
 debian/python3-ecflow.install                       |  1 +
 debian/rules                                        |  2 ++
 10 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 4bd8a34..26417db 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/eccodes.git
 Package: ecflow-server
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, libeccodes-data
+Depends: ${shlibs:Depends}, ${misc:Depends}, ksh | mksh | pdksh | zsh
 Description: Meteorological workflow controller - server 
  ecFlow is a work flow package that enables users to run
  a large number of programs ( with dependencies on each other
@@ -38,7 +38,7 @@ Description: Meteorological workflow controller - server
 Package: ecflow-client
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, libeccodes-data
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Client tools for Meteorological workflow
  ecFlow is a work flow package that enables users to run
  a large number of programs ( with dependencies on each other
@@ -75,6 +75,17 @@ Description: Python libraries for ecFlow workflow tools
  ecFlow is a meteorological work flow package that enables
  users to run a large number of programs ( with dependencies
  on each other and on time) in a controlled environment.
- . 
- This package contains a shared library used by both client and
- server tools.
+ .
+ This package contains Python modules used in writing ecflow scripts. 
+
+Package: python3-ecflow
+Section: python
+Architecture: any
+Depends: libecflow_view0 ( = ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
+ ${python:Depends}
+Description: Python3 libraries for ecFlow workflow tools
+ ecFlow is a meteorological work flow package that enables
+ users to run a large number of programs ( with dependencies
+ on each other and on time) in a controlled environment.
+ .
+ This package contains Python3 modules used in writing ecflow scripts. 
diff --git a/debian/ecflow-client.docs b/debian/ecflow-client.docs
new file mode 100644
index 0000000..c72be93
--- /dev/null
+++ b/debian/ecflow-client.docs
@@ -0,0 +1,4 @@
+README
+Doc/client_options.docx  
+Doc/user_manual.docx  
+Doc/user_manual.pdf
diff --git a/debian/ecflow-client.install b/debian/ecflow-client.install.in
similarity index 100%
rename from debian/ecflow-client.install
rename to debian/ecflow-client.install.in
diff --git a/debian/ecflow-server.docs b/debian/ecflow-server.docs
new file mode 100644
index 0000000..c72be93
--- /dev/null
+++ b/debian/ecflow-server.docs
@@ -0,0 +1,4 @@
+README
+Doc/client_options.docx  
+Doc/user_manual.docx  
+Doc/user_manual.pdf
diff --git a/debian/ecflow-server.install b/debian/ecflow-server.install.in
similarity index 100%
rename from debian/ecflow-server.install
rename to debian/ecflow-server.install.in
diff --git a/debian/libecflow0.install b/debian/libecflow0.install
deleted file mode 100644
index dd1c2a9..0000000
--- a/debian/libecflow0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libecflow*so
diff --git a/debian/libecflow_view0.install.in b/debian/libecflow_view0.install.in
new file mode 100644
index 0000000..15e4b45
--- /dev/null
+++ b/debian/libecflow_view0.install.in
@@ -0,0 +1 @@
+usr/lib/libecflow*so	/usr/lib/@ARCH@/
diff --git a/debian/python-ecflow.install b/debian/python-ecflow.install
index 2500355..b2cc136 100644
--- a/debian/python-ecflow.install
+++ b/debian/python-ecflow.install
@@ -1 +1 @@
-usr/lib/python*
\ No newline at end of file
+usr/lib/python2*
diff --git a/debian/python3-ecflow.install b/debian/python3-ecflow.install
new file mode 100644
index 0000000..4606faa
--- /dev/null
+++ b/debian/python3-ecflow.install
@@ -0,0 +1 @@
+usr/lib/python3*
diff --git a/debian/rules b/debian/rules
index 8cc4686..07ee994 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,8 @@ CXXFLAGS:= $(shell dpkg-buildflags --get CXXFLAGS) # -std=c++11
 DESTDIR:=`pwd`/debian/tmp/
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
+PY3VERS:=$(shell py3versions s)
+PY2VERS:=python2.7
 
 override_dh_auto_configure:
 	dh_auto_configure -- \

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