From 27e5e1da6fef3a36e9ffa20ac1fd09eff64302da Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Sun, 28 Nov 2010 23:14:07 +0100 Subject: [PATCH] Update website URL and contact info --- COPYING | 2 +- ChangeLog | 40 ++++++++++++++++++++-------------------- README | 6 ++---- examples/hooks.py.example | 2 +- lib/urlwatch/handler.py | 2 +- lib/urlwatch/html2txt.py | 2 +- lib/urlwatch/ical2txt.py | 2 +- setup.py | 2 +- urlwatch | 8 ++++---- urlwatch.1 | 4 ++-- 10 files changed, 34 insertions(+), 36 deletions(-) diff --git a/COPYING b/COPYING index d91cf55..f247869 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2008-2010 Thomas Perl +Copyright (c) 2008-2010 Thomas Perl All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/ChangeLog b/ChangeLog index dc5aa62..0c6de74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ -2008-03-04 Thomas Perl +2008-03-04 Thomas Perl * Initial Version -2008-03-17 Thomas Perl +2008-03-17 Thomas Perl * Release version 1.0 2008-03-20 Lukas Vana @@ -9,29 +9,29 @@ * Notify users when NEW sites appear * Option "display_errors" can be set in watch.py -2008-03-22 Thomas Perl +2008-03-22 Thomas Perl * Release version 1.1 2008-05-09 Lukas Upton * Fix problem with Mac OS X 10.5.2 and Ubuntu 8.04 -2008-05-10 Thomas Perl +2008-05-10 Thomas Perl * Release version 1.2 2008-05-15 Craig Hoffman * Add support for sending a User-Agent header -2008-05-16 Thomas Perl +2008-05-16 Thomas Perl * Release version 1.3 -2008-11-14 Thomas Perl +2008-11-14 Thomas Perl + Add example for using HTML Tidy (needs python-utidylib) + Add example for using the ical2txt module (needs python-vobject) + Add ical2txt.py module for converting ics to plaintext * More comments in hooks.py for better user documentation * Release version 1.4 -2008-11-18 Thomas Perl +2008-11-18 Thomas Perl * Support for installing into the system * Use ~/.urlwatch/ for config, cache and hooks * Apply BSD license @@ -43,55 +43,55 @@ * Add manpage (urlwatch.1) * Release version 1.5 -2008-12-23 Thomas Perl +2008-12-23 Thomas Perl * Use hashlib in Python 2.5 and above for SHA-1 generation * Release version 1.6 -2009-01-03 Thomas Perl +2009-01-03 Thomas Perl * Add urlwatch.html2txt module to convert/format HTML to plaintext * Add example of using html2txt in the example hooks file * The html-to-plaintext feature has been suggested by Evert Meulie * Release version 1.7 -2009-01-05 Thomas Perl +2009-01-05 Thomas Perl * Fix a problem with relative links in Lynx' "-dump" mode -2009-01-07 Thomas Perl +2009-01-07 Thomas Perl * Fix another problem with file-relative links in html2text w/ Lynx -2009-01-12 Thomas Perl +2009-01-12 Thomas Perl * Describe ical2txt and html2txt with examples in manpage -2009-01-15 Thomas Perl +2009-01-15 Thomas Perl * Add TODO list -2009-01-20 Thomas Perl +2009-01-20 Thomas Perl * Set the socket timeout to one minute to avoid hangs -2009-07-27 Thomas Perl +2009-07-27 Thomas Perl * Catch and handle IOErrors from FTP timeouts -2009-08-01 Thomas Perl +2009-08-01 Thomas Perl * Add error handling for socket timeouts (HTTP mode) -2009-08-10 Thomas Perl +2009-08-10 Thomas Perl * Handle httplib errors (Debian bug 529740) (Thanks to Bastian Kleineidam and Franck Joncourt) * urlwatch 1.8 released -2009-09-29 Thomas Perl +2009-09-29 Thomas Perl * Support for shell pipe (|) in urls.txt * Support for If-Modified-Since header + HTTP 304 * Show previous/current timestamp in diff output * Remove TODO list * urlwatch 1.9 released -2010-05-10 Thomas Perl +2010-05-10 Thomas Perl * Get encoding from headers and convert to UTF-8 (suggested by Ján Ondrej) * urlwatch 1.10 released -2010-07-30 Thomas Perl +2010-07-30 Thomas Perl * Detect non-zero shell command exit codes and raise an error * urlwatch 1.11 released diff --git a/README b/README index fa99bbd..edb3505 100644 --- a/README +++ b/README @@ -48,9 +48,7 @@ A: Of course. See the example hooks.py file -> use html2txt.html2text(data) CONTACT ------- -If you like urlwatch, please send me feedback! - -Website: http://thpinfo.com/2008/urlwatch/ -E-Mail: thp@thpinfo.com +Website: http://thp.io/2008/urlwatch/ +E-Mail: m@thp.io Jabber/XMPP: thp@jabber.org diff --git a/examples/hooks.py.example b/examples/hooks.py.example index 1ef516f..5098ad2 100644 --- a/examples/hooks.py.example +++ b/examples/hooks.py.example @@ -1,7 +1,7 @@ # # Example hooks file for urlwatch # -# Copyright (c) 2008-2010 Thomas Perl +# Copyright (c) 2008-2010 Thomas Perl # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/lib/urlwatch/handler.py b/lib/urlwatch/handler.py index 721c990..164d3a8 100755 --- a/lib/urlwatch/handler.py +++ b/lib/urlwatch/handler.py @@ -3,7 +3,7 @@ # # urlwatch is a minimalistic URL watcher written in Python # -# Copyright (c) 2008-2010 Thomas Perl +# Copyright (c) 2008-2010 Thomas Perl # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/lib/urlwatch/html2txt.py b/lib/urlwatch/html2txt.py index e053e1e..67206fc 100644 --- a/lib/urlwatch/html2txt.py +++ b/lib/urlwatch/html2txt.py @@ -3,7 +3,7 @@ # Requirements: Either lynx (default) or html2text or simply Python (for regex) # This file is part of urlwatch # -# Copyright (c) 2009-2010 Thomas Perl +# Copyright (c) 2009-2010 Thomas Perl # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/lib/urlwatch/ical2txt.py b/lib/urlwatch/ical2txt.py index e3fdc51..d8b6dce 100644 --- a/lib/urlwatch/ical2txt.py +++ b/lib/urlwatch/ical2txt.py @@ -3,7 +3,7 @@ # Requirements: python-vobject (http://vobject.skyhouseconsulting.com/) # This file is part of urlwatch # -# Copyright (c) 2008-2010 Thomas Perl +# Copyright (c) 2008-2010 Thomas Perl # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/setup.py b/setup.py index bc55a5b..52f871a 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/python # Generic setup.py file (for urlwatch) # -# Copyright (c) 2008-2010 Thomas Perl +# Copyright (c) 2008-2010 Thomas Perl # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/urlwatch b/urlwatch index 3865359..f4b1a72 100755 --- a/urlwatch +++ b/urlwatch @@ -3,7 +3,7 @@ # # urlwatch is a minimalistic URL watcher written in Python # -# Copyright (c) 2008-2010 Thomas Perl +# Copyright (c) 2008-2010 Thomas Perl # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -33,13 +33,13 @@ pkgname = 'urlwatch' -__author__ = 'Thomas Perl ' +__author__ = 'Thomas Perl ' __copyright__ = 'Copyright 2008-2010 Thomas Perl' __license__ = 'BSD' -__homepage__ = 'http://thpinfo.com/2008/urlwatch/' +__homepage__ = 'http://thp.io/2008/urlwatch/' __version__ = '1.11' -user_agent = '%s/%s (+http://thpinfo.com/2008/urlwatch/info.html)' % (pkgname, __version__) +user_agent = '%s/%s (+http://thp.io/2008/urlwatch/info.html)' % (pkgname, __version__) # Configuration section display_errors = False diff --git a/urlwatch.1 b/urlwatch.1 index 3897f8d..a868f0d 100644 --- a/urlwatch.1 +++ b/urlwatch.1 @@ -67,6 +67,6 @@ A Python module that can be used to filter contents .B ~/.urlwatch/cache/ The state of web pages is saved in this folder .SH AUTHOR -Thomas Perl +Thomas Perl .SH WEBSITE -http://thpinfo.com/2008/urlwatch/ +http://thp.io/2008/urlwatch/ -- 2.11.4.GIT