From 6b1ba31334bd8d778a65fb90d80f05d360e717c8 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Wed, 18 Dec 2019 12:29:21 +0100
Subject: [PATCH] Switch to semvers 2.0

---
 CMakeLists.txt | 2 +-
 ChangeLog      | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a235062a..892db2b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ set(PACKAGE_TARNAME "${PACKAGE}-${PACKAGE_VERSION}")
 
 # Dont forget to put a dash in front of the release candidate!!!
 # That is how it is done with semantic versioning!
-set(RELEASE_CANDIDATE "-b1")
+set(RELEASE_CANDIDATE "-beta.1")
 
 set(GETDNS_VERSION "${PACKAGE_VERSION}${RELEASE_CANDIDATE}")
 set(GETDNS_NUMERIC_VERSION 0x0105ffc1)
diff --git a/ChangeLog b/ChangeLog
index 7832f0c3..1240c339 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,13 @@
-* 2019-11: Version 1.6.0-beta1
+* 2019-12-20: Version 1.6.0-beta.1
   * Migration of build system to cmake. Build now works on Ubuntu,
-    Windows 10 and macOS. Some notes on minor differences in the new cmake build:
+    Windows 10 and macOS.
+    Some notes on minor differences in the new cmake build:
       * OpenSSL 1.0.2 or higher is now required
       * libunbound 1.5.9 is now required
       * Only libidn2 2.0.0 and later is supported (not libidn)
       * Windows uses ENABLE_STUB_ONLY=ON as the default
-      * Unit and regression tests work on Linux/macOS (but not Windows yet)
+      * Unit and regression tests work on Linux/macOS
+        (but not Windows yet)
 
 * 2019-04-03: Version 1.5.2
   * PR #424: Two small trust anchor fetcher fixes