[ecflow] 38/50: fixes to install
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Sep 20 15:30:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository ecflow.
commit 95027abc6f837b429eb513f00e521bbb39d87b61
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Jul 17 10:32:14 2017 +0100
fixes to install
---
debian/control | 42 ++++++++++++++--------------
debian/copyright | 58 ++++++++-------------------------------
debian/ecflow-client.install.in | 2 +-
debian/libecflow-view0.install.in | 1 +
debian/libecflow_view0.install.in | 1 -
debian/patches/series | 1 +
debian/rules | 4 +--
7 files changed, 36 insertions(+), 73 deletions(-)
diff --git a/debian/control b/debian/control
index 9fb3d0a..89fc783 100644
--- a/debian/control
+++ b/debian/control
@@ -15,14 +15,25 @@ Build-Depends: debhelper (>= 10), dh-buildinfo,
slurm-client
Standards-Version: 4.0.0
X-Python-Version: >= 2.7
-Homepage: https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home
-Vcs-Git: git://anonscm.debian.org/collab-maint/eccodes.git
-Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/eccodes.git
+Homepage: https://software.ecmwf.int/wiki/display/ECFLOW/The+ECFLOW+Pre-processor
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/eflow.git
+Vcs-Browser: https://anonscm.debian.org/debian-science/packages/ecflow.git
-Package: ecflow-server
+Package: libecflow-view0
+Section: libs
Architecture: any
Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, ksh | mksh | pdksh | zsh
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Shared library for ecFlow worklow 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 ecflow tools.
+
+Package: ecflow-server
+Architecture: any
+Depends: ${python: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,8 +49,8 @@ Description: Meteorological workflow controller - server
Package: ecflow-client
Architecture: any
-Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}, libecflow_view0 ( = ${binary:Version})
+Depends: libecflow-view0 ( = ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
+ ${python: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
@@ -54,23 +65,10 @@ Description: Client tools for Meteorological workflow
.
This package contains the client tools
-Package: libecflow_view0
-Section: libs
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibd:Depends}
-Description: Shared library for ecFlow worklow 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.
-
Package: python-ecflow
Section: python
Architecture: any
-Depends: libecflow_view0 ( = ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
+Depends: libecflow-view0 ( = ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
${python:Depends}
Description: Python libraries for ecFlow workflow tools
ecFlow is a meteorological work flow package that enables
@@ -82,7 +80,7 @@ Description: Python libraries for ecFlow workflow tools
Package: python3-ecflow
Section: python
Architecture: any
-Depends: libecflow_view0 ( = ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
+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
diff --git a/debian/copyright b/debian/copyright
index f9d9f4a..4d194cd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Name: eccodes
-Upstream-Source: https://software.ecmwf.int/wiki/display/ECC/ecCodes+Home
+Upstream-Name: ecflow
+Upstream-Source: https://software.ecmwf.int/wiki/display/ECFLOW/ecFlow+Home
Files: *
-Copyright: Copyright (C) 2005-2013, ECMWF (The European Centre for Medium-Range Weather Forecasts)
+Copyright: Copyright (C) 2005-2017, ECMWF (The European Centre for Medium-Range Weather Forecasts)
License: Apache
This software is licensed under the terms of the Apache Licence Version 2.0
which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
@@ -13,33 +13,12 @@ License: Apache
The texts of this license can be found in /usr/share/common-licenses/Apache-2.0
-Files: src/grib_yacc.*
-Copyright: 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-License: GPL-with-Bison-Exception
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- The texts of this license can be found in /usr/share/common-licenses/GPL-2
- .
- As a special exception, you may create a larger work that contains
- part or all of the Bison parser skeleton and distribute that work
- under terms of your choice, so long as that work isn't itself a
- parser generator using the skeleton or a modified version thereof
- as a parser skeleton. Alternatively, if you modify or redistribute
- the parser skeleton itself, you may (at your option) remove this
- special exception, which will cause the skeleton and the resulting
- Bison output files to be licensed under the GNU General Public
- License without this special exception.
- .
- This special exception was added by the Free Software Foundation in
- version 2.2 of Bison.
-
-File: cmake/contrib/FindNumPy.cmake
-Copyright: 2012 Continuum Analytics, Inc.
-License: MIT
+Files: ACore/src/portable_binary_*
+Copyright: (C) 2002 Robert Ramey
+License: Boost
+Files: Pyext/test/TestEmbedded.cpp
+License: Boost
Files: cmake/contrib/GreatCMakeCookOff/*
Copyright: 2013 University College London
@@ -65,30 +44,15 @@ License: MIT
Files:
debian/*
-Copyright: Copyright (C) 2016, Alastair McKinstry <mckinstry at debian.org>
+Copyright: Copyright (C) 2017, Alastair McKinstry <mckinstry at debian.org>
License: Apache
-Files: perl/GRIB-API/ppport.h
-Copyright: 2001, Paul Marquess. version 2.*
-Copyright: 1999, Kenneth Albanowski. version 1.*
-License: Perl-like
- This code may be used and distributed under the same license as any
- version of Perl.
- .
- On Debian, Perl is licensed under the "Artistic" License, which may be found
- here: /usr/share/common-licenses/Artistic
-
-Filess: src/grib_accessor_class_unpack_bufr_values.c, src/grib_accessor_class_bufr_data_element.c, src/grib_accessor_class_pack_bufr_values.c
-Copyright: 2005-2016 ECMWF
-License: GPL3
- Licensed under the GNU Lesser General Public License which
- incorporates the terms and conditions of version 3 of the GNU
- General Public License.
- On Debian, this license is at /usr/share/common-licenses/GPL-3
File: cmake/contrib/GetGitRevisionDescription.cmake, cmake/contrib/GetGitRevisionDescription.cmake.in
Copyright: Iowa State University 2009-2010.
License: Boost
+
+Licsene: Boost
Distributed under the Boost Software License, Version 1.0.
This software is a collection of libraries from the Boost.org site.
Most of the libraries use the Boost Software License 1.0, which
diff --git a/debian/ecflow-client.install.in b/debian/ecflow-client.install.in
index a234309..079d847 100644
--- a/debian/ecflow-client.install.in
+++ b/debian/ecflow-client.install.in
@@ -1,5 +1,5 @@
usr/bin/ecflow_client
usr/bin/ecflow_ui
usr/bin/ecflowview
-usr/bin/ecflow_test_ui.sh
+usr/bin/ecflow_test_ui
usr/bin/ecflow_ui.x
diff --git a/debian/libecflow-view0.install.in b/debian/libecflow-view0.install.in
new file mode 100644
index 0000000..d16124e
--- /dev/null
+++ b/debian/libecflow-view0.install.in
@@ -0,0 +1 @@
+usr/lib/libecflow*so* /usr/lib/@ARCH@/
diff --git a/debian/libecflow_view0.install.in b/debian/libecflow_view0.install.in
deleted file mode 100644
index 15e4b45..0000000
--- a/debian/libecflow_view0.install.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libecflow*so /usr/lib/@ARCH@/
diff --git a/debian/patches/series b/debian/patches/series
index bb6ef5f..37afb90 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ auto_ptr.patch
python3.patch
reproducible.patch
minver.patch
+soname.patch
diff --git a/debian/rules b/debian/rules
index 357cebe..38541ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ 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)
-AUTOGENERATED:= ecflow-server.install ecflow-client.install libecflow_view0.install
+AUTOGENERATED:= ecflow-server.install ecflow-client.install libecflow-view0.install
PY3:=$(shell py3versions -d)
PY3AB:=$(shell py3versions -d | sed -e 's/python3\./py3/' )
PY3VER:=$(shell py3versions -d | sed -e 's/python//' )
@@ -30,7 +30,7 @@ CMAKE_COMMON_FLAGS = \
override_dh_auto_clean:
dh_auto_clean
- rm -f $(patsubst %, debian/%, ${AUTOGENERATED}) debian/build-*
+ rm -rf $(patsubst %, debian/%, ${AUTOGENERATED}) debian/build-*
find . -name '*.pyc' -delete
find . -name '*.job*' -delete
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ecflow.git
More information about the debian-science-commits
mailing list