Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Support for EPICS v3.15.6 #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add Support for EPICS v3.15.6 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe76c97
Add support for EPICS v3.15.6
dxmaxwell Nov 29, 2018
99fd83e
Update changelog for v2.12-5
dxmaxwell Nov 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> Fri, 27 Oct 2017 17:38:29 -0500
[ Dylan Maxwell ]
* Add support for EPICS v3.15.6

-- Dylan Maxwell <[email protected]> Thu, 29 Nov 2018 12:02:32 -0500

cothread (2.12-4) unstable; urgency=low

Expand Down
4 changes: 2 additions & 2 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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
Expand Down
9 changes: 5 additions & 4 deletions debian/patches/0003-simpler-debian-specific-load_ca.py.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.

Expand Down Expand Up @@ -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")
Expand Down