From c60b8a1b3ea5152000ff7b782e4c55a16dd7c4fd Mon Sep 17 00:00:00 2001
From: Nate Bargmann <n0nb@n0nb.us>
Date: Sat, 18 Jan 2020 08:38:53 -0600
Subject: [PATCH 1/2] Fix 'make distcheck' failure

---
 Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index fd1076170..b5ebaaf51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,8 +22,7 @@ SUBDIRS = macros include lib \
 	tests doc
 
 ## Static list of distributed directories.
-DIST_SUBDIRS = macros include lib src dummy c++ bindings tests doc android\
-  scripts \
+DIST_SUBDIRS = macros include lib src c++ bindings tests doc android scripts \
 	$(BACKEND_LIST) $(RIG_BACKEND_LIST) $(ROT_BACKEND_LIST) $(AMP_BACKEND_LIST)
 
 # Install any third party macros into our tree for distribution

From 72caf6bebe8746f62bbd39889b11dea1c036086f Mon Sep 17 00:00:00 2001
From: Nate Bargmann <n0nb@n0nb.us>
Date: Sat, 18 Jan 2020 08:39:26 -0600
Subject: [PATCH 2/2] Update NEWS

---
 NEWS             | 5 ++++-
 README.developer | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 1b43c3842..9ae6a6253 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,7 @@ Copyright (C) 2000-2018  Stephane Fillod, and others
 Please send Hamlib bug reports to hamlib-developer@lists.sourceforge.net
 
 Version 4.0
-        2019-??-??
+        2020-??-??
         * API/ABI changes, advance ABI to 4 0 0.
         * Add GPIO and GPION options for DCD.  Jeroen Vreeken
         * New backend: ELAD FDM DUO.  Giovanni, HB9EIK.
@@ -15,6 +15,9 @@ Version 4.0
 	* New utility: rigctlcom.  Mike, W9MDB
 	* New model: FT847UNI for unidirectional early serial numbers.  Mike, W9MDB
 	* Remove GNU Texinfo files and build system dependency.
+	* Fix a lot of static code analysis errors and warnings.  Mike, W9MDB
+	* Rearrange directory structure to put rigs and rotators sources
+	  under their own subdirectories.  Mike, W9MDB
 
 Version 3.3
         2018-08-12
diff --git a/README.developer b/README.developer
index 30e788264..f94cf53db 100644
--- a/README.developer
+++ b/README.developer
@@ -38,7 +38,7 @@ utility), and USB.  Other connectivity will follow afterwards.
 General Guidelines.
 -------------------
 
-0. The top level directory looks like this as of 2020-01-163
+0. The top level directory looks like this as of 2020-01-18
 
 $ tree -d -I .git
 .