lists.arthurdejong.org
RSS feed

webcheck branch master updated. 1.10.4-86-g55365f9

[Date Prev][Date Next] [Thread Prev][Thread Next]

webcheck branch master updated. 1.10.4-86-g55365f9



This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "webcheck".

The branch, master has been updated
       via  55365f948b6697e6bcd02bc203b93d37a285762e (commit)
       via  7865d301929403dc8cf6344edc83460354d3918c (commit)
       via  687aba347fdaffbea696cda06f56085ce870b91e (commit)
       via  55357cc95b8a95ff0beae6262b0d5f8bb96a291a (commit)
       via  6a758d9f5e6b543b3af81d4711a264d19c344e30 (commit)
      from  7e158dc6ddec72a605e5f65e4317d922c442110e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://arthurdejong.org/git/webcheck/commit/?id=55365f948b6697e6bcd02bc203b93d37a285762e

commit 55365f948b6697e6bcd02bc203b93d37a285762e
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Mon Dec 2 23:04:25 2013 +0100

    Fix setup.py script
    
    This makes the script executable, adds copyright headers and ensures
    that all needed files are installed and shipped in the source package.

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..5dabb47
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+include AUTHORS COPYING ChangeLog* HACKING NEWS TODO README run.py webcheck.1
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..e21dbfe
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,3 @@
+[sdist]
+owner=root
+group=root
diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index c17f112..982916b
--- a/setup.py
+++ b/setup.py
@@ -1,27 +1,54 @@
+#!/usr/bin/env python
+
+# setup.py - webcheck installation script
+#
+# Copyright (C) 2011 Devin Bayer
+# Copyright (C) 2013 Arthur de Jong
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+"""webcheck installation script."""
+
 from setuptools import setup, find_packages
 
 from webcheck import __version__, __homepage__
 
+
 setup(
-    name = 'webcheck',
-    version = __version__,
-    packages = find_packages(),
-    entry_points = {
+    name='webcheck',
+    version=__version__,
+    packages=find_packages(exclude=('sqltap', )),
+    package_data={
+        'webcheck': [
+            'templates/*.html', 'static/*.*', 'static/fancytooltips/*.*',
+        ]},
+    entry_points={
         'console_scripts': [
             'webcheck = webcheck.cmd:entry_point',
         ],
     },
-    install_requires = ['setuptools', 'sqlalchemy'],
-    extras_require = {
+    install_requires=['setuptools', 'sqlalchemy', 'jinja2'],
+    extras_require={
         'tidy': ['utidylib'],
         'soup': ['beautifulsoup'],
     },
-    
-    # metadata for pypi
-    author = 'Arthur de Jong',
-    author_email = 'arthur@arthurdejong.org',
-    description = 'webcheck is a website checking tool for webmasters',
-    license = 'GPL',
-    keywords = 'spider',
-    url = __homepage__,
+    author='Arthur de Jong',
+    author_email='arthur@arthurdejong.org',
+    description='webcheck is a website checking tool for webmasters',
+    license='GPL',
+    keywords='spider',
+    url=__homepage__,
 )

http://arthurdejong.org/git/webcheck/commit/?id=7865d301929403dc8cf6344edc83460354d3918c

commit 7865d301929403dc8cf6344edc83460354d3918c
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Mon Dec 2 22:13:13 2013 +0100

    Move static files to webcheck/static
    
    This moves all static files to be installed into the webcheck Python
    path and uses pkg_resources to load the files.

diff --git a/webcheck/crawler.py b/webcheck/crawler.py
index 83d1703..b933e28 100644
--- a/webcheck/crawler.py
+++ b/webcheck/crawler.py
@@ -470,6 +470,6 @@ class Crawler(object):
                 logger.info(plugin.__name__)
                 plugin.generate(self)
         # install theme files
-        install_file('webcheck.css', True)
-        install_file('fancytooltips/fancytooltips.js', True)
-        install_file('favicon.ico', False)
+        install_file('static/webcheck.css', True)
+        install_file('static/fancytooltips/fancytooltips.js', True)
+        install_file('static/favicon.ico', False)
diff --git a/webcheck/output.py b/webcheck/output.py
index a163156..884e1bc 100644
--- a/webcheck/output.py
+++ b/webcheck/output.py
@@ -32,6 +32,7 @@ import sys
 import time
 import urllib
 import urlparse
+import pkg_resources
 
 import jinja2
 
@@ -82,35 +83,12 @@ def install_file(source, is_text=False):
     """Install the given file in the output directory.
     If the is_text flag is set to true it is assumed the file is text,
     translating line endings."""
-    # figure out mode to open the file with
-    mode = 'r'
+    sfp = pkg_resources.resource_stream(__name__, source)
     if is_text:
-        mode += 'U'
-    # check with what kind of argument we are called
-    scheme = urlparse.urlsplit(source)[0]
-    if scheme == 'file':
-        # this is a file:/// url, translate to normal path and open
-        source = urllib.url2pathname(urlparse.urlsplit(source)[2])
-    elif scheme == '' and os.path.isabs(source):
-        # this is an absolute path, just open it as is
-        pass
-    elif scheme == '':
-        # this is a relavite path, try to fetch it from the python path
-        for directory in sys.path:
-            tst = os.path.join(directory, source)
-            if os.path.isfile(tst):
-                source = tst
-                break
+        sfp = codecs.getreader('utf-8')(sfp)
     # TODO: support more schemes here
     # figure out the destination name
     target = os.path.join(config.OUTPUT_DIR, os.path.basename(source))
-    # test if source and target are the same
-    source = os.path.realpath(source)
-    if source == os.path.realpath(target):
-        logger.warn('attempt to overwrite %s with itself', source)
-        return
-    # open the input file
-    sfp = open(source, mode)
     # create file in output directory (with overwrite question)
     tfp = open_file(os.path.basename(source), is_text=is_text)
     # copy contents
diff --git a/fancytooltips/fancytooltips.css 
b/webcheck/static/fancytooltips/fancytooltips.css
similarity index 100%
rename from fancytooltips/fancytooltips.css
rename to webcheck/static/fancytooltips/fancytooltips.css
diff --git a/fancytooltips/fancytooltips.js 
b/webcheck/static/fancytooltips/fancytooltips.js
similarity index 100%
rename from fancytooltips/fancytooltips.js
rename to webcheck/static/fancytooltips/fancytooltips.js
diff --git a/fancytooltips/readme.txt b/webcheck/static/fancytooltips/readme.txt
similarity index 100%
rename from fancytooltips/readme.txt
rename to webcheck/static/fancytooltips/readme.txt
diff --git a/favicon.ico b/webcheck/static/favicon.ico
similarity index 100%
rename from favicon.ico
rename to webcheck/static/favicon.ico
diff --git a/webcheck.css b/webcheck/static/webcheck.css
similarity index 100%
rename from webcheck.css
rename to webcheck/static/webcheck.css

http://arthurdejong.org/git/webcheck/commit/?id=687aba347fdaffbea696cda06f56085ce870b91e

commit 687aba347fdaffbea696cda06f56085ce870b91e
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Mon Dec 2 18:19:39 2013 +0100

    Fix missing import

diff --git a/webcheck/crawler.py b/webcheck/crawler.py
index f16cf5a..83d1703 100644
--- a/webcheck/crawler.py
+++ b/webcheck/crawler.py
@@ -36,6 +36,7 @@ import os
 import re
 import robotparser
 import time
+import urllib
 import urllib2
 import urlparse
 

http://arthurdejong.org/git/webcheck/commit/?id=55357cc95b8a95ff0beae6262b0d5f8bb96a291a

commit 55357cc95b8a95ff0beae6262b0d5f8bb96a291a
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Mon Dec 2 18:19:30 2013 +0100

    Fix setuptools entry point invocation
    
    Reported by Emmanuel Blot, fixes 24e191f.

diff --git a/webcheck/cmd.py b/webcheck/cmd.py
index 7020a20..7047d50 100755
--- a/webcheck/cmd.py
+++ b/webcheck/cmd.py
@@ -141,4 +141,4 @@ def main(cfg):
 def entry_point():
     """setuptools entry point"""
     args = parser.parse_args()
-    main(vars(cfg))
+    main(vars(args))

http://arthurdejong.org/git/webcheck/commit/?id=6a758d9f5e6b543b3af81d4711a264d19c344e30

commit 6a758d9f5e6b543b3af81d4711a264d19c344e30
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Fri Nov 29 13:31:36 2013 +0100

    Remove Debian packaging
    
    Packaging will be moved to the Debian Python Applications Packaging Team
    (PAPT) repository.

diff --git a/.gitignore b/.gitignore
index e63768d..429abcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,11 +10,3 @@ __pycache__
 /dist
 /htmlcov
 /webcheck.egg-info
-
-# /debian/
-/debian/files
-/debian/webcheck
-/debian/webcheck.debhelper.log
-/debian/webcheck.postinst.debhelper
-/debian/webcheck.prerm.debhelper
-/debian/webcheck.substvars
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 2624df4..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,411 +0,0 @@
-webcheck (1.10.4) unstable; urgency=low
-
-  * switch to source format 3.0 (native)
-  * remove some left-over debugging code (LP: #401050)
-  * remove old /etc/webcheck removal code
-  * upgrade to standards-version 3.9.1 (no changes needed)
-  * several small bugfixes which more or less drop support for Python 2.3
-  * limit list of "referenced from" to 10 items
-  * pass char_encoding option to tidy to fix some tidy-related errors
-  * add a Referer header if possible (thanks Devin Bayer)
-
- -- Arthur de Jong <adejong@debian.org>  Sat, 11 Sep 2010 20:11:49 +0200
-
-webcheck (1.10.3) unstable; urgency=low
-
-  * take a shot at making debian/copyright machine parseable
-  * support <iframe> and some common usages of <object>
-  * fix bug in command-line parsing of short -r option
-  * implement the --userpass option to pass username and password information
-    to specific sites based on a patch by Chris Shenton
-  * handle errors while parsing more gracefully (addresses: #483579)
-  * add parsing of <script> tag and background attributes, based on a patch by
-    Robert M. Jansen
-  * fix in parsing <style> tags and support style attributes
-  * call tidy (if available) on HTML content, based on a patch by Henning
-    Sielaff
-  * fix problem with port numbers in host headers
-  * upgrade to standards-version 3.8.0 (no changes needed)
-
- -- Arthur de Jong <adejong@debian.org>  Sat, 19 Jul 2008 13:30:00 +0200
-
-webcheck (1.10.2.0) unstable; urgency=low
-
-  * Re-upload of version 1.10.2 because the previous 1.10.2 got lost somehow.
-
- -- Arthur de Jong <adejong@debian.org>  Fri, 30 May 2008 08:20:00 +0200
-
-webcheck (1.10.2) unstable; urgency=low
-
-  * changed the recommends to python-beautifulsoup to be more recent than
-    3.0.2 since that  version fixes a bug that causes severe problems for
-    webcheck (beware backporters to etch) (closes: #433446)
-  * remove old linbot provides/conflicts/replaces stuff as linbot last shipped
-    in woody
-  * move Homepage pseudo header to control header and remove XS- prefix for
-    Vcs tags
-  * add checking for bug in BeautifulSoup and issue warning if bug is found
-  * added support for Python 2.3 (alhough more recent versions of Python
-    are recommended)
-  * small documentation improvements
-
- -- Arthur de Jong <adejong@debian.org>  Fri, 20 Jul 2007 21:12:56 +0200
-
-webcheck (1.10.1) unstable; urgency=low
-
-  * some extra Unicode handling precautions
-  * fix problem in reading webcheck.dat for non-ASCII text (closes: #431625)
-  * be more verbose about HTTP retrieval failures
-  * split out URL normalization code into own module and do some basic
-    protocol-specific normalizations (closes: #425004)
-  * a number of big performance improvements
-  * fix a bug in handling some zero-size pages
-  * parse http-equiv meta HTML header to parse refresh option
-  * webcheck now requires python 2.4 or more recent
-  * added XS-Vcs-Svn and XS-Vcs-Browser as specified in #391023
-
- -- Arthur de Jong <adejong@debian.org>  Sun, 15 Jul 2007 15:00:00 +0200
-
-webcheck (1.10.0) unstable; urgency=low
-
-  * switched HTML parsing to using BeautifulSoup with a fall-back mechanism to
-    the old HTMLParser based solution
-  * the new parser is much more error-tolerant but is reportedly somewhat
-    slower and does not include line numbers in errors
-  * new features will likely only be added to the new parser
-  * some small improvements to the output to make it XHTML 1.1 compliant
-  * internal improvements for handling Unicode strings
-  * better support for parsing <applet> tags and anchors using id attributes
-  * re-enable robots.txt parsing that was disabled in 1.9.8 and add an
-    --ignore-robots option
-
- -- Arthur de Jong <adejong@debian.org>  Wed, 09 May 2007 21:48:11 +0200
-
-webcheck (1.9.8) unstable; urgency=low
-
-  * some checks for properly handling unknown and wrong encodings have been
-    added
-  * added proper error handling for SSL related socket problems (exceptions
-    are not a subclass of regular socket exceptions)
-  * a bugfix for urls that contain a user name without a password or the other
-    way around
-  * miscellaneous small report improvements
-  * switch packaging files to using latest syntax of python-support
-
- -- Arthur de Jong <adejong@debian.org>  Mon, 15 Jan 2007 21:30:00 +0100
-
-webcheck (1.9.7) unstable; urgency=low
-
-  * switch to using python-support and follow new policy (closes: #373902)
-  * upgrade to standards-version 3.7.2 (no changes needed)
-  * site data is now stored to a file while crawling the site, this can be
-    used to resume a crawl with the --continue option and for debugging
-    purposes
-  * implemented checking of link anchors
-  * small improvements to generated reports (favicon included, css fix)
-  * documentation improvements
-  * properly handle float values for --wait
-  * unreachable sites will time out faster
-  * added support for plugins that don't output html
-  * half a dozen other small bugfixes (stability fixes, code cleanups and
-    improvements)
-
- -- Arthur de Jong <adejong@debian.org>  Sun,  2 Jul 2006 23:30:00 +0200
-
-webcheck (1.9.6) unstable; urgency=low
-
-  * SECURITY FIX: a cross-site scripting vulnerability with content in the
-                  tooltips of generated report was fixed by properly escaping
-                  all output (CVE-2006-1321)
-  * urls are now url encoded into a consistent form, solving some problems
-    with urls with non-ascii characters (closes: #348377)
-  * no longer remove unreferenced redirects
-  * more debugging info in debug mode
-  * more fixes for escaping in generated reports and more support for sites
-    in different character sets
-
- -- Arthur de Jong <adejong@debian.org>  Mon, 30 Jan 2006 17:00:00 +0100
-
-webcheck (1.9.5) unstable; urgency=low
-
-  * initial (re)release of webcheck Debian package (closes: #326429)
-  * this release should fix all open bugs on the time of the former webcheck
-    page removal, except wishlist bugs #71419 (i18n) and #271085 (html
-    validation), anyone interested can refile those bugs (preferably with
-    patches or some pointers on how to implement the changes)
-  * /etc/webcheck is completely removed on upgrades since a site wide
-    configuration file is no longer supported (webcheck is a user level tool
-    that should not be configured site wide)
-
- -- Arthur de Jong <adejong@debian.org>  Fri, 30 Dec 2005 23:00:00 +0100
-
-webcheck (1.0-10) unstable; urgency=low
-
-  * orphan this package; set maintainer to
-    Debian QA Group <packages@qa.debian.org>
-    For the orphaning message see according bug entry in
-    http://bugs.debian.org/wnpp
-  * suggest real www-browser lynx as first alternative in debian/control
-  * suggest real httpd apache as first alternative in debian/control
-
- -- Bastian Kleineidam <calvin@debian.org>  Mon, 31 May 2004 20:45:56 +0200
-
-webcheck (1.0-9) unstable; urgency=low
-
-  * catch all errors on ftp.quit(), this fixes the "Malformed Url"
-    message on invalid ftp links
-
- -- Bastian Kleineidam <calvin@debian.org>  Sat, 21 Feb 2004 19:21:30 +0100
-
-webcheck (1.0-8) unstable; urgency=low
-
-  * add <link href> links which adds CSS stylesheet checking to
-    webcleaner. This partially addresses bug #201154, but background
-    image urls in stylesheets will not be checked.
-  * do not display images as default, just the links to them
-    (Closes: #172609)
-
- -- Bastian Kleineidam <calvin@debian.org>  Mon, 12 Jan 2004 13:20:25 +0100
-
-webcheck (1.0-7) unstable; urgency=low
-
-  * Python 2.3 transition upload
-  * Standards version 3.6.0
-
- -- Bastian Kleineidam <calvin@debian.org>  Sat,  9 Aug 2003 10:53:56 +0200
-
-webcheck (1.0-6) unstable; urgency=low
-
-  * Don't overwrite files without asking, added patch with
-    thanks to Jarno Elonen <elonen@iki.fi> (Closes: #188839)
-
- -- Bastian Kleineidam <calvin@debian.org>  Mon, 14 Apr 2003 01:09:39 +0200
-
-webcheck (1.0-5) unstable; urgency=low
-
-  * Use debian/compat instead of DH_COMPAT
-  * Standards version 3.5.9
-  * Add custom HEADER configuration (Closes: #159648)
-
- -- Bastian Kleineidam <calvin@debian.org>  Sat, 12 Apr 2003 13:55:38 +0200
-
-webcheck (1.0-4) unstable; urgency=low
-
-  * change docs.html to index.html in doc-base (Closes: #175281)
-  * use DH_COMPAT=4, adjust depends for this
-
- -- Bastian Kleineidam <calvin@debian.org>  Sat,  4 Jan 2003 14:07:52 +0100
-
-webcheck (1.0-3) unstable; urgency=low
-
-  * Added support for content-encoding gzip and deflate. Only the
-    http get_document routine was changed to use reportbugs urlutils.py
-    functions. (Closes: #158365).
-  * Execute permissions are unset by dh_fixperms, so run perl manually.
-    Thanks Takeshi HAMASAKI for the report (Closes: #172895)
-  * fix webcheck.1: contributers -> contributors
-
- -- Bastian Kleineidam <calvin@debian.org>  Fri, 13 Dec 2002 01:23:30 +0100
-
-webcheck (1.0-2) unstable; urgency=low
-
-  * Fix description formatting (Closes: #172449)
-  * Updated index.html documentation and manpage (Closes: #168918)
-  * Removed last references to linbot
-
- -- Bastian Kleineidam <calvin@debian.org>  Thu, 12 Dec 2002 17:09:02 +0100
-
-webcheck (1.0-1) unstable; urgency=low
-
-  * New maintainer (Closes: #170939)
-  * New upstream release and name, replaces the linbot package.
-    (Closes: #154763)
-  * Standards version 3.5.8.0
-  * Added own webcheck.png (it was missing) and blackbar.png (it was
-    corrupt in the original source)
-  * Added previous Debian fixes for linbot, slightly modified for the
-    new version
-  * Depend on the default python package in sid, this should be enough
-    for everyone. (Closes: #144597)
-
- -- Bastian Kleineidam <calvin@debian.org>  Thu,  5 Dec 2002 15:39:03 +0100
-
-linbot (1.0.0-8) unstable; urgency=low
-
-  * Shift to python2.2.
-  * Python 2.2 has nested scopes on by default and warns about using 'from
-    foo import *' other than at module level, so fix that.
-
- -- Colin Watson <cjwatson@debian.org>  Mon,  2 Sep 2002 00:48:40 +0100
-
-linbot (1.0.0-7) unstable; urgency=low
-
-  * Remove duplicates from the list of MIME types sent in Accept: lines, and
-    merge multiple Accept: lines up to a reasonable limit (closes: #147347).
-
- -- Colin Watson <cjwatson@debian.org>  Sat, 18 May 2002 16:29:18 +0100
-
-linbot (1.0.0-6) unstable; urgency=low
-
-  * myUrlLib.py: Handle SGMLParseError specially and report an unparseable
-    document rather than the confusing "Malformed URL?" (closes: #134620).
-  * robotparser.py, schemes.filelink.py: Use the re module instead of the
-    obsolete regsub and regex modules.
-
- -- Colin Watson <cjwatson@debian.org>  Thu, 21 Feb 2002 02:54:55 +0000
-
-linbot (1.0.0-5) unstable; urgency=low
-
-  * README: Fix URL of upstream home page (thanks, Karl E. Jorgensen;
-    closes: #128771).
-  * debian/copyright: Update.
-  * debian/changelog: Remove Emacs local variables.
-
- -- Colin Watson <cjwatson@debian.org>  Fri, 11 Jan 2002 17:30:33 +0000
-
-linbot (1.0.0-4) unstable; urgency=low
-
-  * myUrlLib.py: Import socket so linbot doesn't crash on non-existent URLs
-    (closes: #122900).
-
- -- Colin Watson <cjwatson@debian.org>  Sat,  8 Dec 2001 11:37:05 +0000
-
-linbot (1.0.0-3) unstable; urgency=low
-
-  * New maintainer (closes: #106562). Thanks to Matej Vela in particular for
-    doing excellent QA work on linbot.
-  * myUrlLib.py: Rename a local variable from 'string' to 'dstring' to avoid
-    clashing with the string module (closes: #121763).
-  * debian/control: Use Build-Depends-Indep rather than Build-Depends.
-  * debian/rules: Minor cleanups.
-
- -- Colin Watson <cjwatson@debian.org>  Sat,  1 Dec 2001 00:10:13 +0000
-
-linbot (1.0.0-2.1) unstable; urgency=low
-
-  * NMU
-  * Use python2.1.
-
- -- Matthias Klose <doko@debian.org>  Mon, 29 Oct 2001 00:19:24 +0100
-
-linbot (1.0.0-2) unstable; urgency=low
-
-  * Release early, release often. ;)
-  * schemes/ftplink.py: Mostly fixed up.  It now correctly parses URLs
-    (see RFC 1738), honors the specified port, handles exceptions from
-    FTP.size, closes the connection cleanly, and is actually able to
-    retrieve files.  My request for further information bounced, but I
-    believe this closes: #45763.
-  * linbot.py: Generate relative references to images, using symlinks
-    if necessary.  Closes: #75727.
-
- -- Matej Vela <vela@debian.org>  Fri, 10 Aug 2001 17:09:11 +0200
-
-linbot (1.0.0-1) unstable; urgency=high
-
-  * New upstream version.  As suggested by Gregor Hoffleit, using
-    1.0.0 instead of 1.0 to avoid adding an epoch.  Closes: #41080.
-  * Package is orphaned; maintainer set to Debian QA Group.  Bugs
-    fixed by NMUs can be closed.  Closes: #41345, #45225, #46526.
-  * linbot.gif is already included in the package.  Closes: #54861.
-  * The upstream site is down indefinitely:
-    * config.py: Set WARN_OLD_VERSION to false.
-    * debian/copyright: Refer to metalab.  Closes: #54862, #77290.
-    * debian/index.html: Left out until it's thoroughly updated.
-  * linbot.py: Don't overwrite config.HOSTS.  Closes: #68719.
-  * config.py: Applied Kevin Dalley's patch to fix typos in the
-    YANKED_URLS example.  Closes: #69899.
-  * schemes/httplink.py: Applied Francesco Potorti's patch to reset
-    redirect_depth when done with redirections.  Closes: #104408.
-  * Converted to debhelper.  The old build system is just too hairy.
-  * Restoring upstream layout, moved linbot.py and symlinked config.py
-    to .../site-packages/linbot.  Also, since Python prepends the
-    script directory to sys.path *after* resolving symlinks, replaced
-    the wrapper with a `/usr/bin/linbot -> .../linbot.py' symlink.
-  * Conforms to Standards version 3.5.6:
-    * Added build dependencies.
-    * Conforms to the FHS.  It's worth noting that /usr/lib/linbot has
-      been moved to /usr/share/linbot.  Closes: #54860.
-    * debian/copyright: Updated reference to GPL.
-
- -- Matej Vela <vela@debian.org>  Wed,  8 Aug 2001 15:05:04 +0200
-
-linbot (1.0b9-1.1) unstable; urgency=high
-
-  * Non-maintainer release.
-  * Removed dependencies on python-net,-misc and changed versioned dependency
-    on python-base (Closes: Bug#41345)
-  * Upgraded to Debian Standards-Version 3.0.1
-
- -- Stevie Strickland <sstrickl@cc.gatech.edu>  Sat, 30 Oct 1999 14:08:28 -0400
-
-linbot (1.0b9-1) unstable; urgency=high
-
-  * Upgraded to new upstream revision.  Fixes Bug#27565, Bug#26692 and
-    Bug#33057.  Thanks to <joey@kitenet.net>, Anthony Fok
-    <foka@gpu.srv.ualberta.ca> and Francesco Potorti
-    <f.potorti@cnuce.cnr.it>.
-  * Upgraded to Debian Standards-Version 2.5.0.0.
-  * Corrected build programs that prevent inclusion of pristine upstream
-    source.
-  * Corrected numerous little bugs in packaging.
-  * Corrected various documentation typos in configuration file.  Fixes
-    Bug#33056.  Thanks to Francesco Potorti <f.potorti@cnuce.cnr.it>.
-  * Removed image files no longer maintained by upstream author.  Fixes
-    Bug#29310.  Thanks to John Lines <john.lines@aeat.co.uk>.
-
- -- Jean Pierre LeJacq <jplejacq@quoininc.com>  Sun,  7 Mar 1999 20:31:30 -0500
-
-linbot (0.9-1) unstable; urgency=low
-
-  * Upgraded to new upstream revision.
-
- -- Jean Pierre LeJacq <jplejacq@quoininc.com>  Sun, 20 Dec 1998 21:36:38 -0500
-
-linbot (0.8-2) stable unstable; urgency=low
-
-  * Corrected typo in HTML documentation.
-  * Corrected minor bugs in package building scripts.
-  * Removed CVS keywords from final build.
-
- -- Jean Pierre LeJacq <jplejacq@quoininc.com>  Sun, 13 Sep 1998 20:43:45 -0400
-
-linbot (0.8-1) stable unstable; urgency=low
-
-  * Upgraded to new upstream version.
-  * Upgraded to debian policy version 2.4.1.4.
-  * Changed package building scripts to work around change in debhelper.
-  * Changed location of linbot supplied python packages to conform to
-    python standard location.  Thanks to Gregor Hoffleit
-    <flight@mathi.uni-heidelberg.DE>.  (bug #22235).
-  * Changed location of upstream source.
-  * Removed old revision of urllib.py (1.9) since linbot now works
-    with urllib.py (1.10) that ships with python-1.5.1.
-
- -- Jean Pierre LeJacq <jplejacq@quoininc.com>  Sat, 12 Sep 1998 17:24:22 -0400
-
-linbot (0.5.4-1) unstable; urgency=low
-
-  * Updated to new upstream revision.
-  * Upgraded debian package building to prevent including original
-    upstream source when only the debian revision is incremented.  Thanks
-    to Gregor Hoffleit <flight@mathi.uni-heidelberg.DE>.
-  * Moved all python files to /usr/lib/linbot/python/ since lintian warned
-    about placing files in /usr/lib/python1.5/.
-  * Provided old revision of urllib.py (1.9) since linbot currently
-    doesn't work with urllib.py (1.10) that ships with python-1.5.1.
-
- -- Jean Pierre LeJacq <jplejacq@quoininc.com>  Sat,  6 Jun 1998 11:20:19 -0400
-
-linbot (0.5.3-1) unstable; urgency=low
-
-  * Updated to new upstream revision.
-  * Upgraded HTML documentation to pass weblint and nsgmls validations.
-
- -- Jean Pierre LeJacq <jplejacq@quoininc.com>  Sat,  9 May 1998 15:39:00 -0400
-
-linbot (0.5.2-1) unstable; urgency=low
-
-  * Initial release.
-
- -- Jean Pierre LeJacq <jplejacq@quoininc.com>  Tue, 14 Apr 1998 14:31:57 -0400
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7f8f011..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 4860bd6..0000000
--- a/debian/control
+++ /dev/null
@@ -1,29 +0,0 @@
-Source: webcheck
-Section: web
-Priority: extra
-Maintainer: Arthur de Jong <adejong@debian.org>
-Standards-Version: 3.9.1
-Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: python (>= 2.6.6-3)
-X-Python-Version: >= 2.3
-Homepage: http://arthurdejong.org/webcheck/
-Vcs-Svn: http://arthurdejong.org/svn/webcheck/webcheck/
-Vcs-Browser: http://arthurdejong.org/viewvc/webcheck/webcheck/
-
-Package: webcheck
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
-Recommends: python-beautifulsoup (>= 3.0.2), python-utidylib
-Suggests: lynx | www-browser
-Description: website link and structure checker
- webcheck is a website checking tool for webmasters. It crawls a given
- website and generates a number of reports in the form of html pages.
- It is easy to use and generates simple, clear and readable reports.
- .
- Features of webcheck include:
-  * support for http, https, ftp and file schemes
-  * view the structure of a site
-  * track down broken links
-  * find potentially outdated and new pages
-  * list links pointing to external sites
-  * can run without user intervention
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index d156c65..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,62 +0,0 @@
-This is webcheck, a command line utility for crawling websites.
-
-webcheck was originally named linbot which was developed by Albert
-Hopkins (marduk) <marduk@python.net>.
-
-Versions up till 1.0 were maintained by Mike W. Meyer <mwm@mired.org> who
-changed the name to webcheck, http://www.mired.org/webcheck/.
-
-After that Arthur de Jong <arthur@arthurdejong.org> took up the work and did
-a complete rewrite, http://arthurdejong.org/webcheck/.
-
-Arthur de Jong is both the upstream and Debian package maintainer, so
-there are no differences between the Debian package and the upstream
-version.
-
-The Debian package of webcheck was previously maintained by Bastian Kleineidam
-<calvin@debian.org>. The Debian package of linbot was maintained by Colin
-Watson <cjwatson@debian.org>, Matej Vela <vela@debian.org> and Jean Pierre
-LeJacq <jplejacq@quoininc.com>.
-
-Files: *
-Copyright: Copyright (C) 1998-1999 Albert Hopkins (marduk)
-           Copyright (C) 2002 Mike W. Meyer
-           Copyright (C) 2005-2010 Arthur de Jong
-License: GPL-2+
- 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 2, or (at your option)
- any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- On Debian GNU/Linux systems, the complete text of
- the GNU General Public License can be found in
- /usr/share/common-licenses/GPL-2.
- .
- The files produced as output from the software do not automatically fall
- under the copyright of the software, unless explicitly stated otherwise.
-
-Webcheck contains the FancyTooltips javascript library to display readable
-tooltips. FancyTooltips is distributed under the MIT license and has the
-following copyright notices:
-
-Files: fancytooltips/*
-Copyright: Copyright (C) 2003 Stuart Langridge, Paul McLanahan, Peter Janes,
-                              Brad Choate
-           Copyright (C) 2003 Dunstan Orchard, Ethan Marcotte, Mark Wubben
-           Copyright (C) 2005 Victor Kulinski
-License: MIT
- As originally released by Stuart Langridge, this script is licensed under MIT
- - http://www.opensource.org/licenses/mit-license.php
- .
- "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."
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 96ccaf3..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/make -f
-
-export DH_VERBOSE=1
-
-PYBASE := usr/share/webcheck
-
-build:
-
-clean:
-       dh_testdir
-       dh_testroot
-       find . -name '*.py[co]' | xargs rm -f
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_prep
-       dh_installdirs $(PYBASE) $(PYBASE)/fancytooltips
-       find -name \*.py \
-         | xargs cp --parents --target-directory debian/webcheck/$(PYBASE)
-       cp webcheck.css debian/webcheck/$(PYBASE)/webcheck.css
-       cp fancytooltips/fancytooltips.js 
debian/webcheck/$(PYBASE)/fancytooltips/fancytooltips.js
-       cp favicon.ico debian/webcheck/$(PYBASE)/favicon.ico
-       chmod 755 debian/webcheck/$(PYBASE)/webcheck.py
-
-binary-indep: build install
-       dh_testdir
-       dh_testroot
-       dh_python2
-       dh_installdocs README TODO AUTHORS NEWS HACKING
-       dh_installman webcheck.1
-       dh_installchangelogs
-       dh_link $(PYBASE)/webcheck.py usr/bin/webcheck
-       dh_compress
-       dh_fixperms --exclude webcheck.py
-       dh_installdeb
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary-arch: build install
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 89ae9db..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (native)

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                                         |    8 -
 MANIFEST.in                                        |    1 +
 debian/changelog                                   |  411 --------------------
 debian/compat                                      |    1 -
 debian/control                                     |   29 --
 debian/copyright                                   |   62 ---
 debian/rules                                       |   46 ---
 debian/source/format                               |    1 -
 setup.cfg                                          |    3 +
 setup.py                                           |   55 ++-
 webcheck/cmd.py                                    |    2 +-
 webcheck/crawler.py                                |    7 +-
 webcheck/output.py                                 |   28 +-
 .../static/fancytooltips}/fancytooltips.css        |    0
 .../static/fancytooltips}/fancytooltips.js         |    0
 .../static/fancytooltips}/readme.txt               |    0
 favicon.ico => webcheck/static/favicon.ico         |  Bin 318 -> 318 bytes
 webcheck.css => webcheck/static/webcheck.css       |    0
 18 files changed, 53 insertions(+), 601 deletions(-)
 create mode 100644 MANIFEST.in
 delete mode 100644 debian/changelog
 delete mode 100644 debian/compat
 delete mode 100644 debian/control
 delete mode 100644 debian/copyright
 delete mode 100755 debian/rules
 delete mode 100644 debian/source/format
 create mode 100644 setup.cfg
 mode change 100644 => 100755 setup.py
 rename {fancytooltips => webcheck/static/fancytooltips}/fancytooltips.css 
(100%)
 rename {fancytooltips => webcheck/static/fancytooltips}/fancytooltips.js (100%)
 rename {fancytooltips => webcheck/static/fancytooltips}/readme.txt (100%)
 rename favicon.ico => webcheck/static/favicon.ico (100%)
 rename webcheck.css => webcheck/static/webcheck.css (100%)


hooks/post-receive
-- 
webcheck
-- 
To unsubscribe send an email to
webcheck-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/webcheck-commits/