From e0acd6a068b136c93014af5de9ab1a734fa63292 Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Thu, 10 Feb 2011 11:19:32 +0100 Subject: [PATCH] urlwatch 1.12 released --- COPYING | 3 ++- ChangeLog | 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 | 6 +++--- urlwatch.1 | 2 +- 9 files changed, 17 insertions(+), 10 deletions(-) diff --git a/COPYING b/COPYING index f247869..d4ab983 100644 --- a/COPYING +++ b/COPYING @@ -1,9 +1,10 @@ -Copyright (c) 2008-2010 Thomas Perl +Copyright (c) 2008-2011 Thomas Perl All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright diff --git a/ChangeLog b/ChangeLog index 0c6de74..361c3b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,3 +95,9 @@ * Detect non-zero shell command exit codes and raise an error * urlwatch 1.11 released +2011-02-10 Thomas Perl + * Allow None as return value for filters + (if a filter returns None, interpret it as "don't filter") + * Update website URL, contact info and copyright years + * urlwatch 1.12 released + diff --git a/examples/hooks.py.example b/examples/hooks.py.example index 5098ad2..4b5d380 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-2011 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 164d3a8..686f53b 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-2011 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 67206fc..6ef19ba 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-2011 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 d8b6dce..493a22d 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-2011 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 52f871a..b19e953 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-2011 Thomas Perl # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/urlwatch b/urlwatch index f4b1a72..04d0de7 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-2011 Thomas Perl # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -34,10 +34,10 @@ pkgname = 'urlwatch' __author__ = 'Thomas Perl ' -__copyright__ = 'Copyright 2008-2010 Thomas Perl' +__copyright__ = 'Copyright 2008-2011 Thomas Perl' __license__ = 'BSD' __homepage__ = 'http://thp.io/2008/urlwatch/' -__version__ = '1.11' +__version__ = '1.12' user_agent = '%s/%s (+http://thp.io/2008/urlwatch/info.html)' % (pkgname, __version__) diff --git a/urlwatch.1 b/urlwatch.1 index a868f0d..7677030 100644 --- a/urlwatch.1 +++ b/urlwatch.1 @@ -1,4 +1,4 @@ -.TH URLWATCH "1" "July 2010" "urlwatch 1.11" "User Commands" +.TH URLWATCH "1" "February 2011" "urlwatch 1.12" "User Commands" .SH NAME urlwatch \- Watch web pages and arbitrary URLs for changes .SH SYNOPSIS -- 2.11.4.GIT