From 2c1cb03cd08e171454dee3477de6b6654c71c2d3 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@anl.gov>
Date: Mon, 29 Jul 2019 11:46:54 -0500
Subject: [PATCH 1/2] Use new CONFIG_PVACLIENT_VERSION file for SHRLIB_VERSION

---
 configure/CONFIG_PVACLIENT_VERSION | 3 +++
 configure/Makefile                 | 2 ++
 src/Makefile                       | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 configure/CONFIG_PVACLIENT_VERSION

diff --git a/configure/CONFIG_PVACLIENT_VERSION b/configure/CONFIG_PVACLIENT_VERSION
new file mode 100644
index 0000000..275091c
--- /dev/null
+++ b/configure/CONFIG_PVACLIENT_VERSION
@@ -0,0 +1,3 @@
+EPICS_PVACLIENT_MAJOR_VERSION = 4
+EPICS_PVACLIENT_MINOR_VERSION = 6
+EPICS_PVACLIENT_MAINTENANCE_VERSION = 0
diff --git a/configure/Makefile b/configure/Makefile
index aefe673..ff26361 100644
--- a/configure/Makefile
+++ b/configure/Makefile
@@ -2,6 +2,8 @@ TOP=..
 
 include $(TOP)/configure/CONFIG
 
+CFG += CONFIG_PVACLIENT_VERSION
+
 TARGETS = $(CONFIG_TARGETS)
 CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
 
diff --git a/src/Makefile b/src/Makefile
index 1e1a441..1fb968b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,7 +6,7 @@ include $(TOP)/configure/CONFIG
 LIBRARY += pvaClient
 
 # shared library ABI version.
-SHRLIB_VERSION ?= 4.5.0
+SHRLIB_VERSION ?= $(EPICS_PVACLIENT_MAJOR_VERSION).$(EPICS_PVACLIENT_MINOR_VERSION).$(EPICS_PVACLIENT_MAINTENANCE_VERSION)
 
 INC += pv/pvaClient.h
 INC += pv/pvaClientMultiChannel.h

From aba40922e6a96519c214c7644bfdf49a8bd0d7f6 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@anl.gov>
Date: Mon, 29 Jul 2019 11:47:36 -0500
Subject: [PATCH 2/2] Release notes for 4.6.0

---
 documentation/RELEASE_NOTES.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/documentation/RELEASE_NOTES.md b/documentation/RELEASE_NOTES.md
index d1f7b6e..7d34a1e 100644
--- a/documentation/RELEASE_NOTES.md
+++ b/documentation/RELEASE_NOTES.md
@@ -2,6 +2,12 @@
 
 This document summarizes the changes to the module between releases.
 
+## Release 4.6.0 (EPICS 7.0.3, Jul 2019)
+
+* pvaClient now handles exceptions from the server properly (issue #54).
+* MultiChannel classes now properly handle PV structures that don't have a top-level `value` field (issue #56), and are more tolerant of other missing fields (issue #57).
+
+
 ## Release 4.5.0 (EPICS 7.0.2.2, Apr 2019)
 
 Changes have been made for getDouble, putDouble, getDoubleArray, putDoubleArray, getString, putString, getStringArray, and putStringArray.