From a36eb974ee87a403ce8875865816f632a5178300 Mon Sep 17 00:00:00 2001
From: Federico Hernandez <f@ederi.co>
Date: Tue, 17 Feb 2015 00:04:04 +0100
Subject: [PATCH] Bumped version number to 2.4.2

---
 CMakeLists.txt |  2 +-
 ChangeLog      |  6 ++++--
 NEWS           | 37 +++++--------------------------------
 3 files changed, 10 insertions(+), 35 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de312e6a2..dbbedb345 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ include (CheckStructHasMember)
 set (HAVE_CMAKE true)
 
 project (task)
-set (PROJECT_VERSION "2.4.1")
+set (PROJECT_VERSION "2.4.2")
 
 OPTION(USE_GNUTLS "Build gnutls support." ON)
 
diff --git a/ChangeLog b/ChangeLog
index 0ce7c8487..ed252c790 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2.4.2 () -
+
+------ current release ---------------------------
+
 2.4.1 (2015-02-16) 82e019a4a8b20de63d53b51d59b8d1c89d3c05b2
 
 - TW-1457 Non-existent attributes are not properly handled (thanks to Tomas
@@ -46,8 +50,6 @@
   Sujeevan Vijayakumaran).
 - New 'recurrence' configuration setting can disable recurring task generation.
 
------- current release ---------------------------
-
 2.4.0 (2015-01-01) 670102842c39bdc62ef84ae4b679a8f5a2d89523
 
 - TD-42 Cannot compile taskd - GNUTLS_VERSION undefined in diag.cpp (thanks
diff --git a/NEWS b/NEWS
index 5bdcbb205..cf3c312e9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,43 +1,16 @@
 
-New Features in taskwarrior 2.4.1
+New Features in taskwarrior 2.4.2
 
-  - New German translation.
-  - Hook scripts are now under much stricter control.
+New commands in taskwarrior 2.4.2
 
-New commands in taskwarrior 2.4.1
+New configuration options in taskwarrior 2.4.2
 
-  - None
+Newly deprecated features in taskwarrior 2.4.2
 
-New configuration options in taskwarrior 2.4.1
-
-  - The 'date.iso' setting allows you to enable (default) or disable support
-    for ISO-8601 dates.  This is because some of you have 'dateformat' settings
-    that conflict.
-  - The 'recurrence' setting enables (default) or disables recurring task
-    instance generation.
-
-Newly deprecated features in taskwarrior 2.4.1
-
-  - None
-
-Removed features in 2.4.1
-
-  - None
+Removed features in 2.4.2
 
 Known Issues
 
-  - If you upgraded from Taskwarrior 2.3.0, you will need one of the following
-    settings to allow continued syncing to a Taskserver:
-
-      $ task config taskd.trust strict
-      $ task config taskd.trust 'ignore hostname'
-      $ task config taskd.trust 'allow all'
-
-    These are presented in order of preference from most to least secure, and
-    depend on how your certs were generated.
-
-  - https://bug.tasktools.org/
-
 Taskwarrior has been built and tested on the following configurations:
 
   * OS X 10.10 Yosemite