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

.gitignore

@@ -22,3 +22,6 @@ CMakeCache.txt
 CMakeFiles
 cmake_install.cmake
 install_manifest.txt
+_CPack_Packages
+CPackConfig.cmake
+CPackSourceConfig.cmake

CMakeLists.txt

@@ -57,4 +57,11 @@ configure_file (
 
 add_subdirectory (src)
 add_subdirectory (doc)
+add_subdirectory (i18n)
+add_subdirectory (scripts)
 add_subdirectory (test EXCLUDE_FROM_ALL)
+
+set (doc_FILES NEWS ChangeLog README INSTALL AUTHORS COPYING)
+foreach (doc_FILE ${doc_FILES})
+  install (FILES ${doc_FILE}  DESTINATION share/doc/task)
+endforeach (doc_FILE)

INSTALL

@@ -65,3 +65,50 @@ step 7 above, they must first be regenerated by following steps [1], [2] and
 
 ---
 
+Taskwarrior Build Notes
+----------------
+
+Taskwarrior 1.9 has dependencies that are detected by the configure program in
+almost all cases, but there are situations and operating systems that mean you
+will need to offer configure a little help.
+
+If taskwarrior will not build on your system, first take a look at the Operating
+System notes below.  If this doesn't help, then go to the Troubleshooting
+section, which includes instructions on how to contact us for help.
+
+
+
+Operating System Notes
+----------------------
+
+Haiku Alpha/R1
+  Taskwarrior must be built with gcc version 4.x, so make sure you run:
+
+    $ setgcc gcc4
+
+  To switch from gcc 2.95 to gcc 4.x.
+
+
+
+Troubleshooting
+---------------
+
+In most cases, it is sufficient to run the configure program like this:
+
+  $ ./configure
+
+Configure will run and locate all the necessary pieces for the build, and create
+a Makefile.  There may be errors and warnings when running configure, or there
+may be compiler errors and warnings when running 'make'.  Sometimes you will run
+configure with no reported problems, and the build will fail later.  This is
+almost always because configure is mistaken about some assumption.
+
+If a build does not succeed, please send the contents of the 'config.log' file
+to support@taskwarrior.org, or post a message in the support forums at
+taskwarrior.org along with the information.
+
+If configure runs, but taskwarrior does not build, when ideally you would send
+both the contents of config.log, and a transcript from the build, which is not
+written to a file and must be captured from the terminal.
+
+---

README.build

@@ -1,48 +0,0 @@
-
-Taskwarrior Build Notes
-----------------
-
-Taskwarrior 1.9 has dependencies that are detected by the configure program in
-almost all cases, but there are situations and operating systems that mean you
-will need to offer configure a little help.
-
-If taskwarrior will not build on your system, first take a look at the Operating
-System notes below.  If this doesn't help, then go to the Troubleshooting
-section, which includes instructions on how to contact us for help.
-
-
-
-Operating System Notes
-----------------------
-
-Haiku Alpha/R1
-  Taskwarrior must be built with gcc version 4.x, so make sure you run:
-
-    $ setgcc gcc4
-
-  To switch from gcc 2.95 to gcc 4.x.
-
-
-
-Troubleshooting
----------------
-
-In most cases, it is sufficient to run the configure program like this:
-
-  $ ./configure
-
-Configure will run and locate all the necessary pieces for the build, and create
-a Makefile.  There may be errors and warnings when running configure, or there
-may be compiler errors and warnings when running 'make'.  Sometimes you will run
-configure with no reported problems, and the build will fail later.  This is
-almost always because configure is mistaken about some assumption.
-
-If a build does not succeed, please send the contents of the 'config.log' file
-to support@taskwarrior.org, or post a message in the support forums at
-taskwarrior.org along with the information.
-
-If configure runs, but taskwarrior does not build, when ideally you would send
-both the contents of config.log, and a transcript from the build, which is not
-written to a file and must be captured from the terminal.
-
----

doc/CMakeLists.txt

@@ -1,10 +1,3 @@
-#set (man5_FILES taskrc.5 task-color.5 task-faq.5 task-sync.5 task-tutorial.5)
-#set (man5_DIR share/man/man5)
-
-#foreach (man_FILE ${man5_FILES})
-#  install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/man/${man_FILE}   DESTINATION ${man5_DIR})
-#endforeach (man_FILE)
-
 install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION share/man/man1
                                                     FILES_MATCHING PATTERN "*.1")
 install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION share/man/man5

i18n/CMakeLists.txt

@@ -0,0 +1,4 @@
+install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION share/doc/task/i18n
+                                                FILES_MATCHING REGEX "strings.*"
+                                                               REGEX "tips.*"
+                                                               PATTERN "CMakeFiles" EXCLUDE)

scripts/CMakeLists.txt

@@ -0,0 +1,2 @@
+install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION share/doc/task/scripts
+                                                FILES_MATCHING PATTERN "CMakeFiles" EXCLUDE)