debian/0000775000000000000000000000000012274211752007173 5ustar debian/copyright0000664000000000000000000000644311767746763011162 0ustar This package was debianized by Arthur Korn on Tue, 20 Mar 2001 20:24:53 +0100. It was downloaded from http://swapoff.org/DevTodo Upstream Author: Copyright (c) 2000-2007 Alec Thomas with contributions from David Furodet, Michael Tilstra, Erin Quinlan, Mark Eichen, Anreas Amann, Arthur Korn, Philippe Chiasson, Matt Kraai, Matthew Russel, and Stephean Hegel. This program is distributed under the terms of the GPL, see below contrib/devtodo.bash-completion is Copyright Aaron Walker and is distributed under the terms of the GPL, see below contrib/tdrec is Copyright Brian Herlihy and is distributed under the terms of the GPL, see below contrib/todo2xhtml_css.xslt and contrib/todo.css are Copyright (c) 2004-2005 Francesco Poli, and distributed under the terms of the MIT license, see below, with an exception (see below) contrib/todo2pdf.xslt is Copyright _Mark_ contrib/todo2html-2.xslt is Copyright Daniel Patterson contrib/todo-nodone-html.xslt and contrib/todo2html.xslt are based on Daniel Patterson's version, and is Copyright Mark Eichin The Debian packaging is Copyright (c) 2001-2008 Arthur Korn and Copyright (c) 2009 Ryan Niebur, and is distributed under the terms of the GPL version 2. GPL: This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 1, or (at your option) any later version. On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL' GPLv2: This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 dated June, 1991. On Debian GNU/Linux systems, the complete text of version 2 of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2 MIT: Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. contrib/todo2xhtml_css.xslt's exception: As a special exception, when parts of this file are copied by the XSLT transformation into an output file, you may use that output file without restriction. debian/clean0000664000000000000000000000026011767746761010221 0ustar build-stamp configure-stamp config.sub config.guess debian/devtodo.bash-completion doc/Makefile.in util/Makefile.in src/Makefile.in configure Makefile.in aclocal.m4 config.log debian/changelog0000664000000000000000000003530312274211717011052 0ustar devtodo (0.1.20-6ubuntu1) trusty; urgency=low * Unconditionally add missing auto* files, resolving FTBFS. -- Daniel T Chen Tue, 04 Feb 2014 11:22:13 -0500 devtodo (0.1.20-6) unstable; urgency=low * fix SYNOPSIS spelling in manpage (Closes: #534236) * update my email address * set Standards-Version to 3.9.3 * show comments in generate mode too (Closes: #539559) * Use source format 3.0 quilt - Remove quilt dependency and README.source * Move packaging to collab-maint * Add build-{arch,indep} targets to debian/rules * Use buildflags.mk from dpkg-dev (>= 1.16.1~) for hardening * Fix spelling of omitted and separated in the manpage as well -- Ryan Niebur Mon, 18 Jun 2012 18:36:13 -0700 devtodo (0.1.20-5) unstable; urgency=low * move everything into quilt patches * debhelper 7 - move pieces out to debian/{clean,install} * Debian Policy 3.8.1 * misc:Depends * README.source * install bash completion (Closes: #483976) * fix --purge (Closes: #516604) * update todo2xhtml_css (Closes: #470705) * move TODO to debian/ * other general cleanups * add Vcs-* fields -- Ryan Niebur Thu, 09 Apr 2009 22:41:49 -0700 devtodo (0.1.20-4) unstable; urgency=low * Adopt package (Closes: #507418) * Check for errors when creating the file to prevent data loss (Closes: #511342) * Include copyright information (Closes: #470987) * add watch file * remove usr/share/man/man1 from debian/dirs, it's not needed (usr/share/devtodo is, however, as if it's not there it FTBFS) * upgrade policy to 3.8.0 - add Homepage header * don't ignore errors from make distclean -- Ryan Niebur Wed, 14 Jan 2009 22:48:13 -0800 devtodo (0.1.20-3) unstable; urgency=low * orphaned: set Maintainer to QA -- Arthur Korn Mon, 24 Nov 2008 18:18:23 +0100 devtodo (0.1.20-2) unstable; urgency=low * removed debian/conffiles as the conffile list is now created by dh_installdeb. -- Arthur Korn Sun, 13 Jan 2008 13:55:17 +0100 devtodo (0.1.20-1) unstable; urgency=low * New upstream release, closes: #457950 - todoterm.cc now includes cstdlib, closes: #417152 * standards-version 3.7.3.0 without changes * debhelper compat version updated to v6 - using dh_installman instead of dh_installmanpages -- Arthur Korn Sat, 12 Jan 2008 00:20:51 +0100 devtodo (0.1.19-4) unstable; urgency=low * Added #include for gcc-4.3, thanks Martin Michlmayr, closes: #417152 -- Arthur Korn Thu, 08 Nov 2007 21:11:32 +0100 devtodo (0.1.19-3) unstable; urgency=low * remove duplicate mention of the -c option in the manpage, closes: #408997 * Standards-Version 3.7.2.2 without changes -- Arthur Korn Mon, 12 Feb 2007 21:37:10 +0100 devtodo (0.1.19-2) unstable; urgency=low * Strip class qualification from member in declaration to make G++ 4.1 happy, closes: #355987 * Standards-Version 3.6.2.0 -> 3.7.2.0 without changes -- Arthur Korn Thu, 25 May 2006 11:31:34 +0200 devtodo (0.1.19-1) unstable; urgency=low * New upstream release * autoupdate with autoconf 1.9 and libtool 1.5.6 -- Arthur Korn Sun, 17 Jul 2005 14:37:52 +0200 devtodo (0.1.18-3) unstable; urgency=low * Standards version 3.6.1.0 -> 3.6.2.0 without changes. * links: contrib stuff is in /usr/share now, not /usr/lib, closes: #313627 * todorc: end all format strings with at least one \n, closes: #313629 * g++4: apply patch from Andreas Jochens to make it build with g++ 4.0, closes: #315116 -- Arthur Korn Sun, 17 Jul 2005 14:10:03 +0200 devtodo (0.1.18-2) unstable; urgency=low * devtodo.1: removed duplicated --comment doc * copyright: fixed upstream email address, closes: #287773 * TodoDB.cc(752): swap calls to erase() and t->db->setDirty(), so the latter is actually called on an existing object. Thanks a lot to Wesley J. Landaker and the other folks from debian-amd64@l.d.o for tracking this down. closes: #307226 -- Arthur Korn Sat, 7 May 2005 13:10:59 +0200 devtodo (0.1.18-1) unstable; urgency=low * New upstream release -- Arthur Korn Mon, 6 Sep 2004 01:16:31 +0200 devtodo (0.1.17-7) unstable; urgency=low * Improved description, fixed grammatical flaws, closes: #268500 -- Arthur Korn Sat, 28 Aug 2004 12:51:37 +0200 devtodo (0.1.17-6) unstable; urgency=low * configure.in: using AM_MAINTAINER_MODE to avoid rebuilding of Makefiles after patching (timestamp skew), closes: #267982 * rules: set CXXFLAGS not CFLAGS, export CXXFLAGS. -- Arthur Korn Wed, 25 Aug 2004 16:06:39 +0200 devtodo (0.1.17-5) unstable; urgency=low * configure.in: AC_CHECK_FUNCS( ... strftime) broken due to g++ error. Using workaround stolen from fluxbox. closes: #236012 * devtodo.1: removed %C from manpage as suggested by Alec, closes: #238576 * devtodo.1: changed references to "--format-date" to the correct "--date-format", closes: #236011 -- Arthur Korn Wed, 25 Aug 2004 11:55:52 +0200 devtodo (0.1.17-4) unstable; urgency=low * modified manpage to no longer refer to "tdl", instead use "todo --link" (tdl has a file name conflict with the tdl package, and is rarely used). closes: #262042 -- Arthur Korn Wed, 25 Aug 2004 10:34:08 +0200 devtodo (0.1.17-3) unstable; urgency=low * Standards-Version: 3.6.1.0 without changes * watch: removed it, it just wouldn't work * upstream URL changed -- Arthur Korn Fri, 19 Mar 2004 11:03:10 +0100 devtodo (0.1.17-2) unstable; urgency=low * Applied patch from Jakob Hilmer and Nicolas Boullis to fix the C++ wrt gcc 3.3, closes: #195195 * Standards-Version: 3.5.8 => 3.5.10 without changes. -- Arthur Korn Tue, 1 Jul 2003 16:41:03 +0200 devtodo (0.1.17-1) unstable; urgency=low * New upstream release - new priority "default" * debian/todorc: added comments on default priority. -- Arthur Korn Fri, 27 Dec 2002 17:54:23 +0100 devtodo (0.1.16-3) unstable; urgency=low * src/TodoDB.cc ~line 1010 (wdiff format): if (clr[0] == '+') { a = ::bold; clr = colour.substr(1); } [-else-] if (clr == "black") c = ::black; closes: #173904 -- Arthur Korn Fri, 27 Dec 2002 13:34:08 +0100 devtodo (0.1.16-2) unstable; urgency=low * moved contrib/ to /usr/lib/ * s[/home/alec/src/todo/stable/contrib/][/usr/lib/devtodo/] in debian/todorc, closes: #173907 * Suggest: xsltproc for stylesheets, added blimp about todo2html.xslt to the Description. * s/%@/$@/ in doc/scripts.sh, closes: #173909 -- Arthur Korn Mon, 23 Dec 2002 11:35:48 +0100 devtodo (0.1.16-1) unstable; urgency=low * New upstream release -- Arthur Korn Thu, 19 Dec 2002 13:06:08 +0100 devtodo (0.1.15-2) unstable; urgency=low * removing usr/bin/tdl and the tdl manpage because of conflict with the tdl package, closes: #173564, #173566 * using symlink method described in autotools-dev/README.Debian for config.sub and config.guess, Build-Depend on autotools-dev * Added debian/README * setting CFLAGS on ./configure instead on $(MAKE). -- Arthur Korn Thu, 19 Dec 2002 00:53:29 +0100 devtodo (0.1.15-1) unstable; urgency=low * New upstream release - Added --force-colour option to force use of colour even when not outputting to a terminal. Requested by James Troup. closes: #170959 - Fixed bug when displaying priorities in TODO list ("mediumriority"). reference: #155840 - tda will now merge all non-quoted arguments into one string to be used for the body text of the item to add. This lets this work: tda -p high Need to go to the shop and get some milk without needing to do: tda -p high "Need to go to the shop and get some milk" closes: #155841 * copyright: Corrected from GPL to GPLv2 * control: removed superfluous build dependency on libtool * dirs: create usr/share/man/man1 for doc/Makefile -- Arthur Korn Tue, 17 Dec 2002 13:47:52 +0100 devtodo (0.1.14-2) unstable; urgency=low * replaced --sysconfdir=$${prefix}/../etc with --sysconfdir=/etc, cause now this is substituted in the manpage, and it just looks ugly there. * removed emacs variables from debian/changelog * added uscan watchfile * ran todo -T, closes: #155840 * rules: made DEB_BUILD_OPTIONS policy 3.5.7 compliant * control: Standars-Version: 3.5.8.0 -- Arthur Korn Wed, 11 Dec 2002 23:48:54 +0100 devtodo (0.1.14-1) unstable; urgency=low * New upstream release, closes: #170109 (Nice to have such alert users.) * added debian/compat because of conffiles (#126520) -- Arthur Korn Fri, 22 Nov 2002 08:02:45 +0100 devtodo (0.1.13-1) unstable; urgency=low * New upstream release - new upstream URL - manpage updated wrt -s/--summary, closes: #115494, #117364 - validity of indexes when grafting checked earlier, closes: #115498 - -h/--help is now implemented, closes: #100390 - indexes of newly added items are now echoed, closes: #115507 - alec pointed out that this can actually be done, closes: #117086 * updated config.{sub,guess}, using those from autotools-dev 20020320.1 closes: #134736 * mv /usr/share/doc/devtodo/{examples/,}contrib -- Arthur Korn Sun, 9 Jun 2002 17:22:53 +0200 devtodo (0.1.12-1) unstable; urgency=low * New upstream release -- Arthur Korn Sun, 2 Dec 2001 15:54:10 +0100 devtodo (0.1.11-3) unstable; urgency=low * whoops, forgot to make /etc/todorc a conffile, closes: Bug#110403. -- Arthur Korn Fri, 31 Aug 2001 16:28:18 +0200 devtodo (0.1.11-2) unstable; urgency=low * One-line-change to fix behaviour when --colour is used, courtesy of Michael Tilstra. closes: Bug#108791. * New upstream http address. * Fixed upstream for some time: - by inclusion of regex.c from glibc into the source, closes: #100902 - closes: Bug#100412, Bug#103565 -- Arthur Korn Thu, 16 Aug 2001 17:01:09 +0200 devtodo (0.1.11-1) unstable; urgency=low * New upstream release - Fixes some gcc 3.0 bugs, are there more? (hopefully) closes: Bug#105018 * make rules work with subdirs in doc/examples/ (silly chmod which made the subdir's permissions 644). * synced /etc/todorc with upstream. -- Arthur Korn Thu, 9 Aug 2001 01:20:52 +0200 devtodo (0.1.9-1) unstable; urgency=low * New upstream release - now uses system readline headers. * Fixes in 0.1.8 (not packaged due to readline mess): - Numeric priorities can now be specified on the command line. picked up by Christian Kurz, closes: Bug#100412 - James Troup had the suggestion (which is now implemented) of clearing the priority as soon as the user hits a key other than enter when editing an existing item. closes: Bug#103565. * Fixed in 0.1.7 (no packages, since it introduced some nasty bugs fixed in 0.1.8): - Finally tracked down the VERY nasty (at times up to a minute or more) slowdown some users have been experiencing. It turns out that one of the recent versions of glibc has a bug in its regex code when dealing with non-multibyte characters (ie. most of the time). Thanks to Mark Eichen for pointing me towards several Debian bug tracker items about other programs having this same problem. closes: Bug#100902. * added contrib/ to the examples. * new upstream URL and email -- Arthur Korn Mon, 9 Jul 2001 15:13:36 +0200 devtodo (0.1.6-1-2) unstable; urgency=low * actually, the superfluous escape sequences where fixed with the last upstream release, closes: #98893 * pushed standards-version to 3.5.4.0, no changes required. -- Arthur Korn Sat, 2 Jun 2001 18:43:06 +0200 devtodo (0.1.6-1-1) unstable; urgency=low * New upstream release -- Arthur Korn Sat, 2 Jun 2001 16:39:57 +0200 devtodo (0.1.6-3) unstable; urgency=low * Alec got a POP account with my hoster after the mail.com breakdown, changed the upstream address in copyright. -- Arthur Korn Sat, 2 Jun 2001 16:23:31 +0200 devtodo (0.1.6-2) unstable; urgency=low * Uncommented if (options.priority != -1) t.priority = options.priority; in src/TodoDB.cc, which makes --priority work again. -- Arthur Korn Wed, 9 May 2001 20:26:58 +0200 devtodo (0.1.6-1) unstable; urgency=low * New upstream release - src/support.cc change wrt "paranoid" merged - Makefile stuff merged - DESTDIR support * synced our default todorc with upstream. I keep them separate to ensure consistency and have "paranoid" on by default. * use DESTDIR, just for the sake of using it ... ;) -- Arthur Korn Tue, 8 May 2001 19:30:08 +0200 devtodo (0.1.5-1) unstable; urgency=low * New upstream release - missed --paranoid in 0.1.4, this is default in /etc/todorc, closes: #93641 - 0.1.3 closes: #91809 * Changed src/support.cc to allow "paranoid" in todorc files. * fiddled with doc/Makefile.am (missing "-" before the "test", added $(manlinks)). -- Arthur Korn Tue, 24 Apr 2001 21:58:38 +0200 devtodo (0.1.4-1) unstable; urgency=low * New upstream release, closes: #92848, #91820, #91291, #92876, see the upstream changelog for details. * /usr/bin/todo is now a symlink to /usr/bin/devtodo, similar for the manpage. * Fixed install target for /etc/todorc to create the directory first and use $(sysconfdir); setting $(sysconfdir) properly in configure target of debian/rules. -- Arthur Korn Sun, 22 Apr 2001 17:39:01 +0200 devtodo (0.1.3-4) unstable; urgency=low * Finally fixed quotes in scripts.sh myself, closes: #92848 -- Arthur Korn Mon, 9 Apr 2001 21:52:47 +0200 devtodo (0.1.3-3) unstable; urgency=low * Added build dependency on automake. To be removed when upstream merges my changes in Makefile.am to add manpage symlinks. closes: #92328 -- Arthur Korn Sat, 31 Mar 2001 21:41:23 +0200 devtodo (0.1.3-2) unstable; urgency=low * s/priorized/prioritized/g in debian/control, closes: #91291 -- Arthur Korn Fri, 30 Mar 2001 14:57:28 +0200 devtodo (0.1.3-1) unstable; urgency=low * Initial Release. closes: #90350 * doc/Makefile.am: add symlinks from tda tde tdr and tdd to todo.1. -- Arthur Korn Tue, 20 Mar 2001 22:09:35 +0100 debian/todorc0000664000000000000000000000433411767746774010443 0ustar # # This is an example /etc/todorc file. Modify to suit. This file can also be # placed in ~/.todorc. # # Don't display children filter -children # Specify colours #colour title=+green #colour info=green #colour veryhigh=+red #colour high=yellow #colour medium=white #colour low=cyan #colour verylow=blue # Turn summary mode on #summary # Be generally paranoid about file ownerships and permissions paranoid # The database to use if --global or -G is specified global-database $HOME/.todo_global # Try binary format database, then XML #database-loaders binary,xml # Keep two backups of the database #backup 2 # Sort items by whether they are completed, then priority, then creation time # then finally by the text. sort -done,priority,-created,-text # Display date in a more Australian/UK friendly format. #date-format %d/%m/%y, %H:%M\n # Display date in American wierd-arse format. #format date=%m/%d/%y, %H:%M\n # Default display format #format display=%4>%i%[info]%f%2n.%[priority]%+1T\n #format verbose-display=%4>%i%[info]%f%2n.(added %c) %[priority]%+1T\n #format generated=%2>%i- %+1T\n #format verbose-generated=%2>%i- (added %c, completed %d) %+1T\n # User-defined formats. These can be used to use different formatted displays. # #format full-report=%i%[info]%f%2n.%[priority]%+1T%+1i%[info]Added: %[normal]%c %[info]Completed: %[normal]%d\n%+1i%[info]Duration: %[normal]%D %[info]Priority: %[normal]%p\n\n # Override the display format to use "full-report". #use-format display=full-report # Force removal of world and group permissions from database when created #on create { # exec chmod 600 $TODODB #} # When saving a database, also create a HTML version as .todo.html. # This requires the libxslt library from xmlsoft.org in addition to the XSLT # file in the devtodo contrib directory. #on save { # echo HTML created # exec xsltproc /usr/share/devtodo/todo-html.xslt $TODODB > `dirname $TODODB`/.todo.html # exec chmod 600 `dirname $TODODB`/.todo.html #} # Make todo verbose when adding, editing or changing the title so that prompts # will be displayed. on add verbose on edit verbose on title verbose # Use default priorities when editing, adding or grafting. This supresses # prompting for the priority. #priority default debian/install0000664000000000000000000000005711767746765010615 0ustar debian/todorc etc/ contrib/ usr/share/devtodo/ debian/examples0000664000000000000000000000006311767746764010761 0ustar doc/scripts.sh doc/scripts.tcsh doc/todorc.example debian/dirs0000664000000000000000000000002211767746763010076 0ustar usr/share/devtodo debian/docs0000664000000000000000000000003011767746764010065 0ustar NEWS README debian/TODO debian/patches/0000775000000000000000000000000011767754152010636 5ustar debian/patches/fix-spelling0000664000000000000000000000373711767746771013204 0ustar s/seperated/separated/ --- a/src/support.cc +++ b/src/support.cc @@ -209,7 +209,7 @@ args.addArgument('g', "graft", CommandArgs::Required); args.setHelp('g', "In conjunction with --add or --link, graft the new item to the specified item."); args.addArgument('R', "reparent", CommandArgs::Required); - args.setHelp('R', "Change the parent of the first item index to the second item index (seperated by a comma). If no second index is given the item is reparented to the root of the tree. eg. todo -R 1,2"); + args.setHelp('R', "Change the parent of the first item index to the second item index (separated by a comma). If no second index is given the item is reparented to the root of the tree. eg. todo -R 1,2"); args.addArgument('p', "priority", CommandArgs::Required); args.setHelp('p', "In conjunction with --add, set the default priority (default|veryhigh|high|medium|low|verylow)."); args.addArgument('e', "edit", CommandArgs::Required); @@ -237,7 +237,7 @@ args.addArgument('v', "verbose"); args.setHelp('v', "Display verbosely."); args.addArgument(Colour, "colour", CommandArgs::Required); - args.setHelp(Colour, "Override default colours of todo items. Multiple colours can be specified, seperated by commas. eg. high=red,medium=white. Items are bolded by prefixing them with a '+'."); + args.setHelp(Colour, "Override default colours of todo items. Multiple colours can be specified, separated by commas. eg. high=red,medium=white. Items are bolded by prefixing them with a '+'."); args.addArgument(Mono, "mono"); args.setHelp(Mono, "Disable all use of colour."); args.addArgument(ForceColour, "force-colour"); @@ -527,7 +527,7 @@ case 'R' : options.index = todo.getIndexList(i.parameter()); if (options.index.size() > 2) - throw runtime_error("--reparent accepts a maximum of two comma seperated indices"); + throw runtime_error("--reparent accepts a maximum of two comma separated indices"); options.mode = TodoDB::Reparent; break; case 'p' : debian/patches/show-comments-in-generate-mode.patch0000664000000000000000000000511311767747660017606 0ustar http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=539559 --- a/src/TodoDB.cc +++ b/src/TodoDB.cc @@ -883,27 +883,6 @@ formatItem(cout, ind, todo, options.format["verbose-display"]); else formatItem(cout, ind, todo, options.format["display"]); - if (options.comment && todo.comment != "") { - int indent = 4 * (ind + 1); - - cout << comment << string(indent, ' '); - if (options.summary) { - const string s = todo.comment; - - if (s.find('\n') != string::npos) { - if ((int)s.find('\n') < options.columns - 1 - indent) - cout << s.substr(0, s.find('\n')) << info << "+" << normal; - else - cout << s.substr(0, options.columns - 1 - indent) << info << "+" << normal; - } else - if ((int)s.size() > options.columns - 3 - indent) - cout << "(" << s.substr(0, options.columns - 3 - indent) << ")" << info << "+"; - else - cout << "(" << s << ")"; - } else - wraptext(cout, "(" + todo.comment + ")", indent, indent, options.columns); - cout << normal << endl; - } } //if (todo.filterchildren && !todo.unfilteredchildren) continue; @@ -1232,6 +1211,31 @@ } else wraptext(out, item.text, i, indent, options.columns); } + if (options.comment && item.comment != "") { + if(options.verbose) { + out << "\n" << info << string(indent, ' ') << "Comments: " << comment; + wraptext(out, item.comment, indent, indent, options.columns); + } else { + out << "\n" << comment << string(indent, ' '); + if (options.summary) { + const string s = item.comment; + + if (s.find('\n') != string::npos) { + if ((int)s.find('\n') < options.columns - 1 - indent) + out << s.substr(0, s.find('\n')) << info << "+" << normal; + else + out << s.substr(0, options.columns - 1 - indent) << info << "+" << normal; + } else + if ((int)s.size() > options.columns - 3 - indent) + out << "(" << s.substr(0, options.columns - 3 - indent) << ")" << info << "+"; + else + out << "(" << s << ")"; + } else + wraptext(out, "(" + item.comment + ")", indent, indent, options.columns); + } + out << normal; + } + break; case 't' : if (options.summary) { debian/patches/fix-spelling-in-manpage0000664000000000000000000000652611767754152015205 0ustar http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=534236 Index: devtodo/doc/devtodo.1.in =================================================================== --- devtodo.orig/doc/devtodo.1.in 2012-06-18 18:37:35.000000000 -0700 +++ devtodo/doc/devtodo.1.in 2012-06-18 18:39:51.000000000 -0700 @@ -3,7 +3,7 @@ .SH "NAME" .LP todo \- a reminder/task program aimed at developers -.SH "SYNPOSIS" +.SH "SYNOPSIS" .LP .TP \fBtodo [\fI\fP]\fP @@ -196,7 +196,7 @@ .br format generated=%2i-%T%2i (added %d, priority %p)\\n\\n .LP -There are four seperate format options: \fIdisplay\fR, \fIgenerated\fR, \fIverbose\-display\fR and \fIverbose-generated\fR. The latter two are used to format their respective text when \-\-verbose is specified as an argument to todo. +There are four separate format options: \fIdisplay\fR, \fIgenerated\fR, \fIverbose\-display\fR and \fIverbose-generated\fR. The latter two are used to format their respective text when \-\-verbose is specified as an argument to todo. .LP In addition, users can create their own format strings by simply passing a different identifier to \fIformat\fR. This can then be enabled by using \fI\-\-use\-format\fR. eg. .LP @@ -213,7 +213,7 @@ The \fI>\fR flag sets the number of spaces \fI\fR to use for all future indenting. .TP \fB%[+|-][]i\fR -Indent to depth of current item. \fI\fR specifies the depth to indent to. If \fI\fR is ommitted, the current level is used. Relative values can be used. eg. '%+1T' would indent to one level higher than the current indentation level. +Indent to depth of current item. \fI\fR specifies the depth to indent to. If \fI\fR is omitted, the current level is used. Relative values can be used. eg. '%+1T' would indent to one level higher than the current indentation level. .TP \fB%[+|-][]T\fR Display the text of the item, wrapped at 80 characters and indented to the specified level. Semantics of \fI\fR are as with \fI%i\fR. Note that wrapped text automatically adds a '\n' at the end of the text, whereas \fI%t\fR will not. @@ -257,12 +257,12 @@ .LP This will sort firstly by whether an item is completed and secondly by their text. This effectively groups items into two blocks \- those that are complete and those that aren't. .LP -The keys that are available are \fIcreated\fR, \fIcompleted\fR, \fItext\fR, \fIpriority\fR, \fIduration\fR, \fInone\fR and \fIdone\fR. Each key, except \fInone\fR can be prefixed with a - to reverse its default order and multiple keys must be seperated with a ,. +The keys that are available are \fIcreated\fR, \fIcompleted\fR, \fItext\fR, \fIpriority\fR, \fIduration\fR, \fInone\fR and \fIdone\fR. Each key, except \fInone\fR can be prefixed with a - to reverse its default order and multiple keys must be separated with a ,. .LP If multiple \-\-sort parameters are encountered the last one is used. This means that a 'sort' entry in ~/.todorc will be overridden by any on the command line. .SH "INDICES" .LP -Indicies are used as options to a variety of command line arguments. Multiple note indices are seperated with commas (spaces are \fInot\fR allowed). Children are scoped using a '.'. +Indicies are used as options to a variety of command line arguments. Multiple note indices are separated with commas (spaces are \fInot\fR allowed). Children are scoped using a '.'. .LP For example, given the following notes: debian/patches/fix-manpage-for-tdl0000664000000000000000000000070111767746770014327 0ustar the tdl binary doesn't exist, Debian already has one of them. --- a/doc/devtodo.1.in +++ b/doc/devtodo.1.in @@ -21,7 +21,7 @@ \fBtdd \fI\fP\fP Mark the specified items as being done. .TP -\fBtdl [\-g \fI\fP] \fI\fP\fP +\fBtodo \-\-link [\-g \fI\fP] \fI\fP\fP Link the specified devtodo database into the current one, optionally grafting it as a child of the specified index. .SH "DESCRIPTION" .LP debian/patches/series0000664000000000000000000000031111767751714012047 0ustar misc-changes show-comments-in-generate-mode.patch fix-manpage-for-tdl error-if-cant-open fix-endless-loop-in-purge update-todo2xhtml_css fix-spelling fix-minus-signs-in-manpage fix-spelling-in-manpage debian/patches/misc-changes0000664000000000000000000000432311767746772013135 0ustar other misc changes that I don't know the *exact* reason/bug for. --- a/src/Todo.h +++ b/src/Todo.h @@ -8,6 +8,8 @@ using namespace std; +class TodoDB; + /* Todo is the basic data structure for each entry in the .todo database. --- a/src/todoterm.cc +++ b/src/todoterm.cc @@ -2,6 +2,7 @@ #include "todoterm.h" #ifdef USETERMCAP +#include #include #include #include --- a/config.h.in +++ b/config.h.in @@ -116,5 +116,11 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* System configuration directory */ +#undef SYSCONFDIR + +/* Use termcap to get terminal width */ +#undef USETERMCAP + /* Version number of package */ #undef VERSION --- a/configure.in +++ b/configure.in @@ -1,6 +1,10 @@ -AC_INIT(src/main.cc) +AC_INIT +AC_CONFIG_SRCDIR([src/main.cc]) AM_INIT_AUTOMAKE(devtodo,0.1.20) +# don't rebuild Makefiles (=> timestamp skew due to patch) +AM_MAINTAINER_MODE + # We don't want the util source to be made into a shared lib as it's # only used locally AC_DISABLE_SHARED @@ -10,7 +14,7 @@ AC_PROG_INSTALL AC_PROG_LN_S -AC_LANG_CPLUSPLUS +AC_LANG([C++]) # Extra options AC_ARG_ENABLE(debug, @@ -25,7 +29,7 @@ # Don't use termcap to obtain window size AC_ARG_WITH(termcap, [ --without-termcap don't use termcap to obtain terminal width]) if test "${with_termcap}_" = _ -o "${with_termcap}_" = yes; then - AC_DEFINE(USETERMCAP) + AC_DEFINE(USETERMCAP, 1, [ Use termcap to get terminal width]) fi # Check for various headers and functions - although I'm not doing anything @@ -79,13 +83,14 @@ AC_SUBST(READLINE_LIBS) SYSCONFDIR="`eval echo $sysconfdir`" -AC_DEFINE_UNQUOTED(SYSCONFDIR, "$SYSCONFDIR") +AC_DEFINE_UNQUOTED(SYSCONFDIR, "$SYSCONFDIR", [System configuration directory]) AC_SUBST(SYSCONFDIR) AC_CHECK_PROG(HAVE_CRASH_CONFIG, crash-config, yes) AC_SUBST(HAVE_CRASH_CONFIG) -AM_CONFIG_HEADER(config.h) -AC_OUTPUT(Makefile src/Makefile util/Makefile doc/Makefile doc/devtodo.1 makepackages.sh devtodo.spec devtodo.list) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_FILES([Makefile src/Makefile util/Makefile doc/Makefile doc/devtodo.1 makepackages.sh devtodo.spec devtodo.list]) +AC_OUTPUT chmod +x makepackages.sh debian/patches/fix-endless-loop-in-purge0000664000000000000000000000136611767747660015511 0ustar it get's "stuck". http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=516604 --- a/src/TodoDB.cc +++ b/src/TodoDB.cc @@ -947,12 +947,11 @@ unsigned TodoDB::purge(multiset &todo, time_t age) { unsigned purged = 0; - - for (multiset::iterator i = todo.begin(); i != todo.end(); ++i) { + multiset::iterator i = todo.begin(); + while (i != todo.end()) { if (i->done && i->doneTime < age) { multiset::iterator last = i++; - - cout << i->doneTime << " < " << age << endl; + cout << last->doneTime << " < " << age << endl; last->db->setDirty(true); todo.erase(last); ++purged; @@ -960,6 +959,7 @@ if (i->child) { purged += purge(*i->child, age); } + i++; } } return purged; debian/patches/fix-minus-signs-in-manpage0000664000000000000000000001671011767746771015650 0ustar they need to be \- --- a/doc/devtodo.1.in +++ b/doc/devtodo.1.in @@ -49,7 +49,7 @@ In conjunction with \fI\-\-add\fR or \fI\-\-link\fR, graft the new item to the specified item. .TP \fB\-l, \-\-link \fI\fR\fR -Link the specified todo file into the body of this one. If the linked database has a title set, this will be used as the body of the linking item otherwise the directory name of the linked database will be used. Use --remove (or tdr) to remove linked databases - this does \fBnot\fR remove the database itself, only the link. +Link the specified todo file into the body of this one. If the linked database has a title set, this will be used as the body of the linking item otherwise the directory name of the linked database will be used. Use \-\-remove (or tdr) to remove linked databases \(hy this does \fBnot\fR remove the database itself, only the link. .TP \fB\-R,\-\-reparent \fI[,]\fR\fR Change the parent of the first item index to the second item index. If no second index is given the item is reparented to the root of the tree. @@ -121,10 +121,10 @@ Be paranoid about some settings, including permissions. .TP \fB\-\-database\-loaders \fI\fR\fR -Try the database formats in the given order. Valid formats are \fIxml\fR and \fIbinary\fR. eg. todo --database-loaders binary,xml. The default format is XML. +Try the database formats in the given order. Valid formats are \fIxml\fR and \fIbinary\fR. eg. todo \-\-database\-loaders binary,xml. The default format is XML. .TP \fB\-\-backup [\fI\fR]\fR -Backup the database up to \fI\fR times, just before it is written to. If \fI\fR is not specified, one backup will be made. The filenames used to store the backups are the default database name with their revision appended like so: .todo.1, .todo.2, etc. To actually use one of these backups, you can either mv it to .todo or use --database .todo. to explicitly specify its use. +Backup the database up to \fI\fR times, just before it is written to. If \fI\fR is not specified, one backup will be made. The filenames used to store the backups are the default database name with their revision appended like so: .todo.1, .todo.2, etc. To actually use one of these backups, you can either mv it to .todo or use \-\-database .todo. to explicitly specify its use. .TP \fB\-s, \-\-summary\fR Toggle "summary" mode, where long items are truncated to one line. @@ -133,7 +133,7 @@ Edit or show comments respectively. .TP \fB\-\-timeout [\fI