Merge branch '2.1.2' of tasktools.org:task into 2.1.2

CMakeLists.txt

@@ -1,5 +1,4 @@
 cmake_minimum_required (VERSION 2.8)
-set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
 
 include (CheckFunctionExists)
 include (CheckStructHasMember)

ChangeLog

@@ -2,6 +2,10 @@
 
 2.1.2 ()
 
+Bugs
+ + Bug fix release regarding #1104, which causes duplicate UUIDs during
+   the merge command.
+
 ------ old releases ------------------------------
 
 2.1.1 (2012-07-24) 46c5f8b826838ce96d9df7fcd3039de3c43483dd

NEWS

@@ -1,34 +1,21 @@
 
-New Features in taskwarrior 2.1.0
+New bug fixes in taskwarrior 2.1.2
 
-  - The new 'project.indented' format is available and used in the 'projects'
-    and 'summary' commands.
-  - Support for the 'scheduled' date for a task, which represent the earliest
-    opportunity to work on a task.
-  - All tasks may now be given an 'until' date, after which they will expire
-    and are deleted.
-  - Improved UTF8 handling for wide characters.
-  - User defined attributes.
-  - Partial UUIDs must now be at least 14 characters, up from 9.  This
-    disambiguates a commonly date format.
+  - Important bug fix release regarding duplicate UUIDs during the merge command.
 
-  Please refer to the ChangeLog file for full details.  There are too many to
-  list here.
+New features in taskwarrior 2.1.2
 
-New commands in taskwarrior 2.1.0
+  - None
 
-  - New 'ready' report that lists tasks ready for work, sorted by urgency.
-  - New 'udas' command shows UDA details and warnings.
-  - New '_udas' helper command lists UDA names for completion purposes.
+New commands in taskwarrior 2.1.2
 
-New configuration options in taskwarrior 2.1.0
+  - None
 
-  - urgency.scheduled.coefficient
-  - urgency.uda.<name>.coefficient
-  - color.scheduled
-  - color.blocking
+New configuration options in taskwarrior 2.1.2
 
-Newly deprecated features in taskwarrior 2.1.0
+  - None
+
+Newly deprecated features in taskwarrior 2.1.2
 
   - None
 

cmake.h.in

@@ -39,7 +39,6 @@ Override PACKAGE_LANGUAGE, then
 #cmakedefine NETBSD
 #cmakedefine HAIKU
 #cmakedefine SOLARIS
-#cmakedefine WIN32
 #cmakedefine UNKNOWN
 
 /* Found the lua library */

doc/man/task-color.5.in

@@ -1,4 +1,4 @@
-.TH task-color 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
+.TH task-color 5 2012-09-10 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 task-color \- A color tutorial for the taskwarrior command line todo manager.

doc/man/task-faq.5.in

@@ -1,4 +1,4 @@
-.TH task-faq 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
+.TH task-faq 5 2012-09-10 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 task-faq \- A FAQ for the task(1) command line todo manager.

doc/man/task-sync.5.in

@@ -1,4 +1,4 @@
-.TH task-sync 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
+.TH task-sync 5 2012-09-10 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 task-sync \- A tutorial for the task(1) data synchronization capabilities.

doc/man/task-tutorial.5.in

@@ -1,4 +1,4 @@
-.TH task-tutorial 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
+.TH task-tutorial 5 2012-09-10 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 task-tutorial \- A tutorial for the task(1) command line todo manager.

doc/man/task.1.in

@@ -1,4 +1,4 @@
-.TH task 1 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
+.TH task 1 2012-09-10 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 task \- A command line todo manager.

doc/man/taskrc.5.in

@@ -1,4 +1,4 @@
-.TH taskrc 5 2012-07-24 "${PACKAGE_STRING}" "User Manuals"
+.TH taskrc 5 2012-09-10 "${PACKAGE_STRING}" "User Manuals"
 
 .SH NAME
 taskrc \- Configuration file for the task(1) command

test/rx.t.cpp

@@ -88,7 +88,7 @@ int main (int argc, char** argv)
   ut.ok (r9.match (start, end, text),        "e there are matches");
   ut.is (start.size (), (size_t) 6,          "e == 6 matches");
 
-#ifdef DARWIN
+#if defined(DARWIN) || defined(CYGWIN) || defined(FREEBSD)
   text = "this is the end.";
   ut.pass (text + " =~ /\\bthe/");
   ut.pass (text + " =~ /the\\b/");