[Python-modules-commits] r7379 - in packages/twill/trunk/debian (6 files)
arnau at users.alioth.debian.org
arnau at users.alioth.debian.org
Thu Jan 22 01:06:40 UTC 2009
Date: Thursday, January 22, 2009 @ 01:06:40
Author: arnau
Revision: 7379
* New upstream bugfix release.
* debian/control:
+ Add ${misc:Depends} to Depends in case the result of a call to
debhelper tools adds extra dependencies.
+ Drop useless Build-Depends on patchutils.
+ Bump Standards-Version to 3.8.0.
- Add debian/README.source.
* debian/doc-base:
+ Change the section to Programming.
* debian/copyright:
+ Update copyright years.
+ Reorganize to make copyright information clearer.
Added:
packages/twill/trunk/debian/README.source
Modified:
packages/twill/trunk/debian/changelog
packages/twill/trunk/debian/control
packages/twill/trunk/debian/copyright
packages/twill/trunk/debian/doc-base
packages/twill/trunk/debian/patches/02_remove_ext.patch
Added: packages/twill/trunk/debian/README.source
===================================================================
--- packages/twill/trunk/debian/README.source (rev 0)
+++ packages/twill/trunk/debian/README.source 2009-01-22 01:06:40 UTC (rev 7379)
@@ -0,0 +1,6 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+'debian/patches' and applied during the build.
+
+You can find explanations about quilt usage in the following file:
+/usr/share/doc/quilt/README.source
Modified: packages/twill/trunk/debian/changelog
===================================================================
--- packages/twill/trunk/debian/changelog 2009-01-20 16:30:08 UTC (rev 7378)
+++ packages/twill/trunk/debian/changelog 2009-01-22 01:06:40 UTC (rev 7379)
@@ -1,12 +1,26 @@
-twill (0.9~b1-3) UNRELEASED; urgency=low
+twill (0.9-1) unstable; urgency=low
- * debian/control
- - uniforming Vcs-Browser field
- * debian/control
- - switch Vcs-Browser field to viewsvn
+ [ Arnaud Fontaine ]
+ * New upstream bugfix release.
+ * debian/control:
+ + Add ${misc:Depends} to Depends in case the result of a call to
+ debhelper tools adds extra dependencies.
+ + Drop useless Build-Depends on patchutils.
+ + Bump Standards-Version to 3.8.0.
+ - Add debian/README.source.
+ * debian/doc-base:
+ + Change the section to Programming.
+ * debian/copyright:
+ + Update copyright years.
+ + Reorganize to make copyright information clearer.
- -- Sandro Tosi <matrixhasu at gmail.com> Thu, 03 Jan 2008 12:23:07 +0100
+ [ Sandro Tosi ]
+ * debian/control:
+ - Uniforming Vcs-Browser field.
+ - Switch Vcs-Browser field to viewsvn.
+ -- Arnaud Fontaine <arnau at debian.org> Wed, 21 Jan 2009 23:54:29 +0000
+
twill (0.9~b1-2) unstable; urgency=low
[ Arnaud Fontaine ]
Modified: packages/twill/trunk/debian/control
===================================================================
--- packages/twill/trunk/debian/control 2009-01-20 16:30:08 UTC (rev 7378)
+++ packages/twill/trunk/debian/control 2009-01-22 01:06:40 UTC (rev 7379)
@@ -4,15 +4,14 @@
Maintainer: Arnaud Fontaine <arnau at debian.org>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5.0.37.2),
- cdbs (>= 0.4.43),
+ cdbs (>= 0.4.49),
python-dev (>= 2.3.5-11),
python-support (>= 0.7.1),
- patchutils (>= 0.2.25),
quilt
Build-Depends-Indep: xsltproc,
docbook-xsl,
docbook-xml,
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://twill.idyll.org/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/twill/trunk/
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/twill/trunk/
@@ -20,12 +19,13 @@
Package: python-twill
Architecture: all
Depends: ${python:Depends},
+ ${misc:Depends},
python-mechanize (>= 0.1.7b-2),
python-clientform (>= 0.2.6),
python-pyparsing (>= 1.4.1)
Recommends: doc-base
Description: A simple scripting language for Web browsing
Twill is a simple scripting language intended for programmatic or
- automated browsing of Web sites. It allows allows users to browse the
- Web from a command-line interface. So, you can navigate through Web
- sites that use forms, cookies, and most standard Web features.
+ automated browsing of Web sites. It allows users to browse the Web
+ from a command-line interface. So, you can navigate through Web sites
+ that use forms, cookies, and most standard Web features.
Modified: packages/twill/trunk/debian/copyright
===================================================================
--- packages/twill/trunk/debian/copyright 2009-01-20 16:30:08 UTC (rev 7378)
+++ packages/twill/trunk/debian/copyright 2009-01-22 01:06:40 UTC (rev 7379)
@@ -5,7 +5,7 @@
Author: C. Titus Brown <titus at caltech.edu>
-Copyright (c) 2005-2007 C. Titus Brown <titus at caltech.edu>
+Copyright (c) 2005-2009 C. Titus Brown <titus at caltech.edu>
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
@@ -30,13 +30,155 @@
In addition of twill main code, the following module are distributed
along with twill under the following licenses:
-* twill/other_packages/mechanize/_beautifulsoup.py:
+Files: twill/other_packages/_mechanize_dist/_useragent.py
+ twill/other_packages/_mechanize_dist/_opener.py
+ twill/other_packages/_mechanize_dist/_util.py
+ twill/other_packages/_mechanize_dist/_rfc3986.py
+ twill/other_packages/_mechanize_dist/_request.py
+ twill/other_packages/_mechanize_dist/_auth.py
+ twill/other_packages/_mechanize_dist/_response.py
+ twill/other_packages/_mechanize_dist/_html.py
+ twill/other_packages/_mechanize_dist/_http.py
+ Copyright 2002-2009 John J. Lee <jjl at pobox.com>
+ License:
- Copyright: Copyright (c) 2004 Leonard Richardson
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the BSD or ZPL 2.1 licenses.
- License: Available under the same terms as Python. The Python
- license is reproduced below.
+ On Debian systems, the complete text of the BSD License can be found
+ in `/usr/share/common-licenses/BSD.
+ ZPL 2.1 license
+ ---------------
+
+ A copyright notice accompanies this license document that identifies
+ the copyright holders.
+
+ This license has been certified as open source. It has also been
+ designated as GPL compatible by the Free Software Foundation (FSF).
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions in source code must retain the accompanying
+ copyright notice, this list of conditions, and the following
+ disclaimer.
+
+ 2. Redistributions in binary form must reproduce the accompanying
+ copyright notice, this list of conditions, and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ 3. Names of the copyright holders must not be used to endorse or
+ promote products derived from this software without prior
+ written permission from the copyright holders.
+
+ 4. The right to distribute this software or to use it for any
+ purpose does not give you the right to use Servicemarks (sm) or
+ Trademarks (tm) of the copyright holders. Use of them is
+ covered by separate agreement with the copyright holders.
+
+ 5. If any files are modified, you must cause the modified files to
+ carry prominent notices stating that you changed the files and
+ the date of any change.
+
+ Disclaimer
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE
+ LI ABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHET HER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
+
+
+File: twill/other_packages/_mechanize_dist/_clientcookie.py
+
+ Copyright 2002-2009 John J Lee <jjl at pobox.com>
+ Copyright 1997-2009 Gisle Aas (original libwww-perl code)
+ Copyright 2002-2009 Johnny Lee (original MSIE Perl code)
+ License:
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the BSD or ZPL 2.1 licenses.
+
+ On Debian systems, the complete text of the BSD License can be found
+ in `/usr/share/common-licenses/BSD. The complete text of ZPL 2.1
+ license is available above.
+
+
+Files: twill/other_packages/_mechanize_dist/_pullparser.py
+ twill/other_packages/_mechanize_dist/_lwpcookiejar.py
+ twill/other_packages/_mechanize_dist/_headersutil.py
+ twill/other_packages/_mechanize_dist/_mozillacookiejar.py
+ Copyright 2003-2009 John J. Lee <jjl at pobox.com>
+ Copyright 1997-2009 Gisle Aas (original libwww-perl code)
+ License:
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the BSD or ZPL 2.1 licenses.
+
+ On Debian systems, the complete text of the BSD License can be found
+ in `/usr/share/common-licenses/BSD. The complete text of ZPL 2.1
+ license is available above.
+
+ On Debian systems, the complete text of the BSD License can be found
+ in `/usr/share/common-licenses/BSD. The complete text of ZPL 2.1
+ license is available above.
+
+
+File: twill/other_packages/_mechanize_dist/_mechanize.py
+ Copyright 2003-2009 John J. Lee <jjl at pobox.com>
+ Copyright 2003-2009 Andy Lester (original Perl code)
+ License:
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the BSD or ZPL 2.1 licenses.
+
+ On Debian systems, the complete text of the BSD License can be found
+ in `/usr/share/common-licenses/BSD. The complete text of ZPL 2.1
+ license is available above.
+
+
+File: twill/other_packages/_mechanize_dist/_msiecookiejar.py
+ Copyright 2002-2009 Johnny Lee <typo_pl at hotmail.com> (MSIE Perl code)
+ Copyright 2002-2009 John J Lee <jjl at pobox.com> (The Python port)
+ License:
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the BSD or ZPL 2.1 licenses.
+
+ On Debian systems, the complete text of the BSD License can be found
+ in `/usr/share/common-licenses/BSD. The complete text of ZPL 2.1
+ license is available above.
+
+
+File: twill/other_packages/ClientForm.py
+ Copyright 2002-2009 John J. Lee <jjl at pobox.com>
+ Copyright 2005-2009 Gary Poster
+ Copyright 2005-2009 Zope Corporation
+ Copyright 1998-2009 Gisle Aas.
+ License:
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the BSD or ZPL 2.1 licenses.
+
+ On Debian systems, the complete text of the BSD License can be found
+ in `/usr/share/common-licenses/BSD. The complete text of ZPL 2.1
+ license is available above.
+
+
+File: twill/other_packages/_mechanize_dist/_beautifulsoup.py
+ Copyright (c) 2004-2009 Leonard Richardson
+ License:
+
PSF LICENSE AGREEMENT FOR PYTHON 2.3
------------------------------------
@@ -88,9 +230,10 @@
agrees to be bound by the terms and conditions of this License
Agreement.
-twill/other_packages/pyparsing.py:
- Copyright (c) 2003-2006 Paul T. McGuire
+File: twill/other_packages/pyparsing.py
+ Copyright (c) 2003-2009 Paul T. McGuire
+ License:
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
@@ -112,56 +255,11 @@
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-twill/other_packages/mechanize:
- Copyright (c) 2002-2004 John J. Lee <jjl at pobox.com>
- Copyright (c) 2003 Andy Lester
+File: twill/other_packages/subprocess.py
+ Copyright (c) 2003-2009 by Peter Astrand <astrand at lysator.liu.se>
+ License:
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- Neither the name of the contributors nor the names of their
- employers may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-twill/other_packages/ClientForm.py:
-
- Copyright 2002-2006 John J. Lee <jjl at pobox.com>
- Copyright 2005 Gary Poster
- Copyright 2005 Zope Corporation
- Copyright 1998-2000 Gisle Aas.
-
- This code is free software; you can redistribute it and/or modify it
- under the terms of the BSD or ZPL 2.1 licenses.
-
-twill/other_packages/subprocess.py:
-
- Copyright (c) 2003-2005 by Peter Astrand <astrand at lysator.liu.se>
-
PSF LICENSE AGREEMENT FOR PYTHON 2.4
------------------------------------
@@ -213,7 +311,7 @@
agrees to be bound by the terms and conditions of this License
Agreement.
-The Debian packaging is (C) 2007, Arnaud Fontaine <arnau at debian.org>
-and is licensed under the GPL. On Debian systems, the complete text of
-the GNU General Public License can be found in
-`/usr/share/common-licenses/GPL'.
+The Debian packaging is (C) 2007-2009, Arnaud Fontaine
+<arnau at debian.org> and is licensed under the GPL (version 2 or later).
+On Debian systems, the complete text of the GNU General Public License
+can be found in `/usr/share/common-licenses/GPL*'.
Modified: packages/twill/trunk/debian/doc-base
===================================================================
--- packages/twill/trunk/debian/doc-base 2009-01-20 16:30:08 UTC (rev 7378)
+++ packages/twill/trunk/debian/doc-base 2009-01-22 01:06:40 UTC (rev 7379)
@@ -3,9 +3,8 @@
Author: C. Titus Brown <titus at idyll.org>
Abstract: This documentation describes what is twill and how to use it
for programming purpose.
-Section: Apps/Programming
+Section: Programming
Format: HTML
Index: /usr/share/doc/python-twill/html/index.html
Files: /usr/share/doc/python-twill/html/*.html
-
Modified: packages/twill/trunk/debian/patches/02_remove_ext.patch
===================================================================
--- packages/twill/trunk/debian/patches/02_remove_ext.patch 2009-01-20 16:30:08 UTC (rev 7378)
+++ packages/twill/trunk/debian/patches/02_remove_ext.patch 2009-01-22 01:06:40 UTC (rev 7379)
@@ -1,12 +1,88 @@
---- twill-0.9~b1.orig/setup.py
-+++ twill-0.9~b1/setup.py
+Index: twill-0.9/setup.py
+===================================================================
+--- twill-0.9.orig/setup.py 2007-12-28 06:45:16.000000000 +0000
++++ twill-0.9/setup.py 2009-01-19 01:00:23.000000000 +0000
@@ -18,8 +18,7 @@
author_email = 'titus at idyll.org',
license='MIT',
- packages = ['twill', 'twill.other_packages',
-- 'twill.other_packages.mechanize',
+- 'twill.other_packages._mechanize_dist',
+ packages = ['twill',
'twill.extensions',
'twill.extensions.match_parse'],
+Index: twill-0.9/twill/_browser.py
+===================================================================
+--- twill-0.9.orig/twill/_browser.py 2007-12-28 06:45:16.000000000 +0000
++++ twill-0.9/twill/_browser.py 2009-01-19 01:01:30.000000000 +0000
+@@ -3,13 +3,13 @@
+ """
+
+ # wwwsearch imports
+-from _mechanize_dist import Browser as MechanizeBrowser
++from mechanize import Browser as MechanizeBrowser
+
+ import wsgi_intercept
+ from utils import FixedHTTPBasicAuthHandler, FunctioningHTTPRefreshProcessor
+
+ def build_http_handler():
+- from _mechanize_dist._urllib2 import HTTPHandler
++ from mechanize._urllib2 import HTTPHandler
+
+ class MyHTTPHandler(HTTPHandler):
+ def http_open(self, req):
+Index: twill-0.9/twill/browser.py
+===================================================================
+--- twill-0.9.orig/twill/browser.py 2007-12-28 06:45:16.000000000 +0000
++++ twill-0.9/twill/browser.py 2009-01-19 01:00:23.000000000 +0000
+@@ -10,8 +10,9 @@
+ import re
+
+ # wwwsearch imports
+-import _mechanize_dist as mechanize
+-from _mechanize_dist import BrowserStateError, LinkNotFoundError, ClientForm
++import mechanize
++import ClientForm
++from mechanize import BrowserStateError, LinkNotFoundError
+
+ # twill package imports
+ from _browser import PatchedMechanizeBrowser
+Index: twill-0.9/twill/commands.py
+===================================================================
+--- twill-0.9.orig/twill/commands.py 2007-12-28 06:45:16.000000000 +0000
++++ twill-0.9/twill/commands.py 2009-01-19 01:00:23.000000000 +0000
+@@ -4,9 +4,9 @@
+ """
+
+ import sys
+-import _mechanize_dist as mechanize
+-from _mechanize_dist import ClientForm
+-from _mechanize_dist._headersutil import is_html
++import mechanize
++import ClientForm
++from mechanize._headersutil import is_html
+
+ OUT=None
+ ERR=sys.stderr
+Index: twill-0.9/twill/utils.py
+===================================================================
+--- twill-0.9.orig/twill/utils.py 2007-12-28 06:45:16.000000000 +0000
++++ twill-0.9/twill/utils.py 2009-01-19 01:00:23.000000000 +0000
+@@ -11,11 +11,11 @@
+
+ import subprocess
+
+-import _mechanize_dist as mechanize
+-from _mechanize_dist import ClientForm
+-from _mechanize_dist._util import time
+-from _mechanize_dist._http import HTTPRefreshProcessor
+-from _mechanize_dist import BrowserStateError
++import mechanize
++import ClientForm
++from mechanize._util import time
++from mechanize._http import HTTPRefreshProcessor
++from mechanize import BrowserStateError
+
+ class ResultWrapper:
+ """
More information about the Python-modules-commits
mailing list