diff --git a/ChangeLog b/ChangeLog
index 7d524cbe1..8f0d9526e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
------ current release ---------------------------
+1.8.0 (?)
+ + ?
+
+------ old releases ------------------------------
+
1.7.0 (5/14/2009)
+ Improved the errors when parsing a corrupt or unrecognized pending.data
or completed.data file (thanks to T. Charles Yun).
@@ -39,8 +44,6 @@
variable, $VISUAL or $EDITOR environment variable) and allows direct
editing of all editable task details.
------- old releases ------------------------------
-
1.6.1 (4/24/2009) 1b6faf57c998617024d0348a87b941a5d2ab2249
+ Fixed bug that caused new, first-time .taskrc files to be written without
including the custom report labels (thanks to P.C. Shyamshankar).
diff --git a/Makefile.in b/Makefile.in
index 6b2e84c98..ef5a3619f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -169,7 +169,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS = src
@@ -415,8 +414,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -441,8 +440,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) auto.h.in $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -452,12 +451,13 @@ ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) auto.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) auto.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -528,10 +528,6 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -558,8 +554,6 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -715,7 +709,7 @@ uninstall-man: uninstall-man1 uninstall-man5
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
+ dist-shar dist-tarZ dist-zip distcheck distclean \
distclean-generic distclean-hdr distclean-tags distcleancheck \
distdir distuninstallcheck dvi dvi-am html html-am info \
info-am install install-am install-data install-data-am \
diff --git a/NEWS b/NEWS
index 30d4f8f1e..be7085856 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Welcome to Task 1.7.0.
+Welcome to Task 1.8.0.
Task has been built and tested on the following configurations:
diff --git a/configure.ac b/configure.ac
index 6fc7c0680..8884b5530 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT(task, 1.7.0, bugs@beckingham.net)
+AC_INIT(task, 1.8.0, bugs@beckingham.net)
CFLAGS="${CFLAGS=}"
CXXFLAGS="${CXXFLAGS=}"
diff --git a/html/task.html b/html/task.html
index 13b56e377..ec9a2c840 100644
--- a/html/task.html
+++ b/html/task.html
@@ -113,26 +113,26 @@
- New in version 1.7.0 (5/14/2009)
+ New in version 1.8.0 (?)
- - Improved the errors when parsing a corrupt or unrecognized pending.data
- or completed.data file (thanks to T. Charles Yun).
-
- Added details to the "info" report about recurring tasks (thanks to T.
- Charles Yun).
-
- Now writes a sample "defaultwidth" configuration variable to the default
- .taskrc file (thanks to T. Charles Yun).
-
- Task allows commands that require an ID to now be given a sequence, which
- is a set of IDs. This allows commands like "task delete 1 2 5-10,12".
-
- Fixed bug in the ghistory report, which caused it to only show a new
- month if a task was added during that month.
-
- New command "duplicate" which allows an existing task to be duplicated,
- and also have modifications applied (thanks to David J Patrick).
-
- The "append", and "done" commands now allow modifications to be applied
- to the task(s) (thanks to David J Patrick).
-
- Improved word wrapping in various output.
-
- Fixed bug that added an extra line between header and graph in the
- ghistory report.
-
- Added simple 'taskprogram' mailing list subscribe form to the web site.
-
- For custom reports that define a "limit" to the number of rows of output
- such as "oldest" and "newest", task allows an override value. For
- example "task oldest 5" will display the 5 oldest tasks.
-
- Modified the "stats" report so that it has the same aesthetics as the
- other reports.
-
- New "timesheet" command displays tasks completed and started, per week,
- and can display multiple weeks.
-
- New tab completion script, task_completion.sh, for bash users, is installed
- to /usr/local/share/task (thanks to Federico Hernandez).
-
- Applied patch to allow task to build on Arch Linux (thanks to Johan Friis).
-
- Applied patch to fix a UUID bug on Solaris 8 (thanks to Steven de Brouwer).
-
- The task man page is now installed. Try "man task" (thanks to Federico
- Hernandez and P.C. Shyamshankar).
-
- Fixed bug that causes task to create a default .task directory, even if
- data.location specified otherwise (thanks to Federico Hernandez).
-
- New "edit" command that fires up a text editor (uses 'editor' configuration
- variable, $VISUAL or $EDITOR environment variable) and allows direct
- editing of all editable task details.
+
- ?
diff --git a/html/versions.html b/html/versions.html
index 957f38a44..1b1cda5e9 100644
--- a/html/versions.html
+++ b/html/versions.html
@@ -35,6 +35,80 @@
+
+
New in version 1.7.0 (5/14/2009)
+
+
+
+
+ - Improved the errors when parsing a corrupt or unrecognized pending.data
+ or completed.data file (thanks to T. Charles Yun).
+
- Added details to the "info" report about recurring tasks (thanks to T.
+ Charles Yun).
+
- Now writes a sample "defaultwidth" configuration variable to the default
+ .taskrc file (thanks to T. Charles Yun).
+
- Task allows commands that require an ID to now be given a sequence, which
+ is a set of IDs. This allows commands like "task delete 1 2 5-10,12".
+
- Fixed bug in the ghistory report, which caused it to only show a new
+ month if a task was added during that month.
+
- New command "duplicate" which allows an existing task to be duplicated,
+ and also have modifications applied (thanks to David J Patrick).
+
- The "append", and "done" commands now allow modifications to be applied
+ to the task(s) (thanks to David J Patrick).
+
- Improved word wrapping in various output.
+
- Fixed bug that added an extra line between header and graph in the
+ ghistory report.
+
- Added simple 'taskprogram' mailing list subscribe form to the web site.
+
- For custom reports that define a "limit" to the number of rows of output
+ such as "oldest" and "newest", task allows an override value. For
+ example "task oldest 5" will display the 5 oldest tasks.
+
- Modified the "stats" report so that it has the same aesthetics as the
+ other reports.
+
- New "timesheet" command displays tasks completed and started, per week,
+ and can display multiple weeks.
+
- New tab completion script, task_completion.sh, for bash users, is installed
+ to /usr/local/share/task (thanks to Federico Hernandez).
+
- Applied patch to allow task to build on Arch Linux (thanks to Johan Friis).
+
- Applied patch to fix a UUID bug on Solaris 8 (thanks to Steven de Brouwer).
+
- The task man page is now installed. Try "man task" (thanks to Federico
+ Hernandez and P.C. Shyamshankar).
+
- Fixed bug that causes task to create a default .task directory, even if
+ data.location specified otherwise (thanks to Federico Hernandez).
+
- New "edit" command that fires up a text editor (uses 'editor' configuration
+ variable, $VISUAL or $EDITOR environment variable) and allows direct
+ editing of all editable task details.
+
+
+
New in version 1.6.1 (4/24/2009)
diff --git a/src/Makefile.in b/src/Makefile.in
index 60381fbc4..ea3982dc4 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -50,7 +50,7 @@ am_task_OBJECTS = Config.$(OBJEXT) Date.$(OBJEXT) T.$(OBJEXT) \
util.$(OBJEXT) text.$(OBJEXT) rules.$(OBJEXT) import.$(OBJEXT)
task_OBJECTS = $(am_task_OBJECTS)
task_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -153,7 +153,6 @@ sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
task_SOURCES = Config.cpp Date.cpp T.cpp TDB.cpp Table.cpp Grid.cpp Timer.cpp color.cpp parse.cpp task.cpp command.cpp edit.cpp report.cpp util.cpp text.cpp rules.cpp import.cpp Config.h Date.h T.h TDB.h Table.h Grid.h Timer.h color.h task.h
@@ -260,8 +259,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -273,8 +272,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -284,12 +283,13 @@ ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
+ here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique