diff --git a/debian/changelog b/debian/changelog index b658326..9a93ebb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ cothread (2.12-5) UNRELEASED; urgency=medium + [ Michael Davidsaver ] * Added libepics dependency option for base 3.15.3 and 3.16.1 - -- Michael Davidsaver Fri, 27 Oct 2017 17:38:29 -0500 + [ Dylan Maxwell ] + * Add support for EPICS v3.15.6 + + -- Dylan Maxwell Thu, 29 Nov 2018 12:02:32 -0500 cothread (2.12-4) unstable; urgency=low diff --git a/debian/control b/debian/control index a0bca17..3e493d6 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7), python-all-dev, python-all-dbg, dh-python, python-numpy, python-sphinx, - libepics3.14.11 | libepics3.14.12 | libepics3.14.12.3 | libepics3.15.3 | libepics3.16.1, + libepics3.14.11 | libepics3.14.12 | libepics3.14.12.3 | libepics3.15.3 | libepics3.15.6 | libepics3.16.1, XS-Python-Version: >= 2.7 Standards-Version: 3.8.0 Homepage: http://controls.diamond.ac.uk/downloads/python/cothread/ @@ -16,7 +16,7 @@ Package: python-cothread Architecture: any Depends: ${shlibs:Depends}, ${python:Depends}, python-setuptools, python-numpy, - libepics3.14.11 | libepics3.14.12 | libepics3.14.12.3 | libepics3.15.3 | libepics3.16.1, + libepics3.14.11 | libepics3.14.12 | libepics3.14.12.3 | libepics3.15.3 | libepics3.15.6 | libepics3.16.1, Conflicts: python-cothread-doc (<< 1.15) XB-Python-Version: ${python:Versions} Suggests: python-cothread-doc diff --git a/debian/patches/0003-simpler-debian-specific-load_ca.py.patch b/debian/patches/0003-simpler-debian-specific-load_ca.py.patch index 73a81f7..2f71b6b 100644 --- a/debian/patches/0003-simpler-debian-specific-load_ca.py.patch +++ b/debian/patches/0003-simpler-debian-specific-load_ca.py.patch @@ -4,8 +4,8 @@ Subject: simpler debian specific load_ca.py --- cothread/cadef.py | 3 +- - cothread/load_ca.py | 109 ++++++++++++++++------------------------------------ - 2 files changed, 34 insertions(+), 78 deletions(-) + cothread/load_ca.py | 110 ++++++++++++++++------------------------------------ + 2 files changed, 35 insertions(+), 78 deletions(-) diff --git a/cothread/cadef.py b/cothread/cadef.py index 6651b00..106ce84 100644 @@ -29,10 +29,10 @@ index 6651b00..106ce84 100644 # write = ca_write_access(channel_id) # diff --git a/cothread/load_ca.py b/cothread/load_ca.py -index 1184ad7..d5f831b 100644 +index 1184ad7..e5cbc51 100644 --- a/cothread/load_ca.py +++ b/cothread/load_ca.py -@@ -32,94 +32,51 @@ +@@ -32,94 +32,52 @@ # This file can also be run as a standalone script to discover the path to # libca. @@ -81,6 +81,7 @@ index 1184ad7..d5f831b 100644 + 'libca.so.3.14.12', + 'libca.so.3.14.12.3', + 'libca.so.3.15.3', ++ 'libca.so.3.15.6', + 'libca.so.3.16.1', +] +# Allow user to provide additional names (eg "libca.so.3.15:libca.so.3.15.1")