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

CMakeLists.txt

@@ -119,8 +119,8 @@ endforeach (doc_FILE)
 set (CPACK_SOURCE_GENERATOR "TGZ")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME ${PACKAGE_NAME}-${PACKAGE_VERSION})
 set (CPACK_SOURCE_IGNORE_FILES  "CMakeCache" "CMakeFiles" "CPackConfig" "CPackSourceConfig"
-                                "_CPack_Packages" "cmake_install" "install_manifest"
-                                "Makefile$" "test" "package-config" "misc/*"
-                                "src/task$" "src/libtask.a" "auto.h$"
-                                "/\\.gitignore" "/\\.git/" "swp$")
+                                "_CPack_Packages" "cmake_install" "install_manifest" "Makefile$"
+				"test" "package-config" "misc/*" "src/task$" "src/libtask.a"
+				"src/columns/libcolumns.a" "src/commands/libcommands.a"
+                                "auto.h$" "/\\.gitignore" "/\\.git/" "swp$")
 include (CPack)

ChangeLog

@@ -71,6 +71,8 @@ Bugs
  + Fixed bug #1150, which referenced deprecated features in the tutorial man
    page (thanks to Benjamin Weber).
  + Fixed bug #1154, which now allows priorities to be specified in any case.
+ + Fixed bug #1178, which included binary libraries in the released source
+   package (thanks to Jakub Wilk).
  + Improved hyphenation by splitting on commas (even if no whitespace after).
    Leads to better output of, for example, 'task show', where comma-separated
    lists are common.

test/uuid.t

@@ -33,7 +33,8 @@ use Test::More tests => 26;
 # Create the rc file.
 if (open my $fh, '>', 'uuid.rc')
 {
-  print $fh "data.location=.\n";
+  print $fh "data.location=.\n",
+            "confirmation=off\n";
   close $fh;
   ok (-r 'uuid.rc', 'Created uuid.rc');
 }