[ecflow] 41/50: soversion 0d version 0.0.1
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 a7370d0562898180b2921433e492f0e4199c98c2
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Jul 17 11:42:46 2017 +0100
soversion 0d version 0.0.1
---
debian/control | 8 ++++----
...ow-view0.install.in => libecflow-view0d.install.in} | 0
debian/patches/format-security.patch | 5 +++++
debian/patches/minver.patch | 7 +++++++
debian/patches/python3.patch | 5 +++++
debian/patches/reproducible.patch | 5 +++++
debian/patches/soname.patch | 18 ++++++++++++++++++
debian/rules | 2 +-
8 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control
index 5eb9266..5516778 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Homepage: https://software.ecmwf.int/wiki/display/ECFLOW/The+ECFLOW+Pre-processo
Vcs-Git: git://anonscm.debian.org/debian-science/packages/eflow.git
Vcs-Browser: https://anonscm.debian.org/debian-science/packages/ecflow.git
-Package: libecflow-view0
+Package: libecflow-view0d
Section: libs
Architecture: any
Multi-Arch: same
@@ -50,7 +50,7 @@ Description: Meteorological workflow controller - server
Package: ecflow-client
Architecture: any
-Depends: libecflow-view0 ( = ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
+Depends: libecflow-view0d ( = ${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
@@ -69,7 +69,7 @@ Description: Client tools for Meteorological workflow
Package: python-ecflow
Section: python
Architecture: any
-Depends: libecflow-view0 ( = ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
+Depends: libecflow-view0d ( = ${binary:Version}), ${misc:Depends}, ${shlibs:Depends},
${python:Depends}
Description: Python libraries for ecFlow workflow tools
ecFlow is a meteorological work flow package that enables
@@ -81,7 +81,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-view0d ( = ${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/libecflow-view0.install.in b/debian/libecflow-view0d.install.in
similarity index 100%
rename from debian/libecflow-view0.install.in
rename to debian/libecflow-view0d.install.in
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch
index 7678a51..b0d0409 100644
--- a/debian/patches/format-security.patch
+++ b/debian/patches/format-security.patch
@@ -1,3 +1,8 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Fix for security-format flaw
+Last-Updated: 2017-07-10
+Forwarded: no
+
Index: ecflow-4.5.0/view/src/time.cc
===================================================================
--- ecflow-4.5.0.orig/view/src/time.cc
diff --git a/debian/patches/minver.patch b/debian/patches/minver.patch
index cd9cbf0..89d62b2 100644
--- a/debian/patches/minver.patch
+++ b/debian/patches/minver.patch
@@ -1,3 +1,10 @@
+Description: Accept/Require PYTHON_MIN_VERSION to be set.
+ This patch is needed for the Debann build process to work with both
+ py2 and py3 simultaneously.
+Author: Alastair McKinstry <mckinstry at debiab.r
+Last-Updated: 2017-07-11
+Forwarded: no
+
Index: ecflow-4.6.1/CMakeLists.txt
===================================================================
--- ecflow-4.6.1.orig/CMakeLists.txt
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 30d2d77..8d99df1 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -1,3 +1,8 @@
+Description: Fixes for both py2 and py3 simultaneously
+Author: Alastair McKinstry <mckinstry at debian.org>
+Forwarded: no
+Last-Updated: 2017-07-15
+
Index: ecflow-4.6.1/Pyext/script.py
===================================================================
--- ecflow-4.6.1.orig/Pyext/script.py
diff --git a/debian/patches/reproducible.patch b/debian/patches/reproducible.patch
index 358075f..cf617e6 100644
--- a/debian/patches/reproducible.patch
+++ b/debian/patches/reproducible.patch
@@ -1,3 +1,8 @@
+Description: Fix needed for bit-reproducibility on Debian
+Author: Alastair McKinstry <mckinstry at debian.org>
+Last-Updated: 2017-07-11
+Forwarded: no
+
Index: ecflow-4.6.1/ACore/src/Version.cpp
===================================================================
--- ecflow-4.6.1.orig/ACore/src/Version.cpp
diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch
index e69de29..365a4e8 100644
--- a/debian/patches/soname.patch
+++ b/debian/patches/soname.patch
@@ -0,0 +1,18 @@
+Description: Add a version number and name to package
+
+
+Index: ecflow-4.6.1/view/CMakeLists.txt
+===================================================================
+--- ecflow-4.6.1.orig/view/CMakeLists.txt
++++ ecflow-4.6.1/view/CMakeLists.txt
+@@ -207,7 +207,9 @@ ecbuild_add_library(TARGET ecflow_vie
+ CONDITION
+ MOTIF_FOUND AND X11_FOUND AND CMAKE_THREAD_LIBS_INIT
+ SOURCES
+- ${srcs_cc} ${srcs_c} ${srcs_cpp} ${libicon_srcs} ${libxec_srcs} ${libui_srcs}
++ ${srcs_cc} ${srcs_c} ${srcs_cpp} ${libicon_srcs} ${libxec_srcs} ${libui_srcs}
++ VERSION 0.0.1
++ SOVERSION 0d
+ TEMPLATES
+ src/array.cc
+ INCLUDES
diff --git a/debian/rules b/debian/rules
index 38541ba..5fb1b8e 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-view0d.install
PY3:=$(shell py3versions -d)
PY3AB:=$(shell py3versions -d | sed -e 's/python3\./py3/' )
PY3VER:=$(shell py3versions -d | sed -e 's/python//' )
--
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