[Python-modules-commits] r2040 - in /packages/twill/trunk/debian:
control control.in copyright
doc-base patches/01_fix_history_path.patch rules watch
arnau-guest at users.alioth.debian.org
arnau-guest at users.alioth.debian.org
Wed Apr 11 00:21:04 UTC 2007
Author: arnau-guest
Date: Wed Apr 11 00:21:04 2007
New Revision: 2040
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2040
Log:
* Add missing copyright for python modules distributed along with
twill.
* Add debian/doc-base.
* Clean debian/rules. Thanks to Piotr.
* Fix twill history path for the shell to the home directory.
* Remove useless debian/watch as the upstream author URL doesn't allow
listing.
Added:
packages/twill/trunk/debian/doc-base
packages/twill/trunk/debian/patches/01_fix_history_path.patch
Removed:
packages/twill/trunk/debian/watch
Modified:
packages/twill/trunk/debian/control
packages/twill/trunk/debian/control.in
packages/twill/trunk/debian/copyright
packages/twill/trunk/debian/rules
Modified: packages/twill/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/twill/trunk/debian/control?rev=2040&op=diff
==============================================================================
--- packages/twill/trunk/debian/control (original)
+++ packages/twill/trunk/debian/control Wed Apr 11 00:21:04 2007
@@ -10,6 +10,7 @@
Package: python-twill
Architecture: all
Depends: ${python:Depends}, python-mechanize (>= 0.1.6b), 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
Modified: packages/twill/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/python-modules/packages/twill/trunk/debian/control.in?rev=2040&op=diff
==============================================================================
--- packages/twill/trunk/debian/control.in (original)
+++ packages/twill/trunk/debian/control.in Wed Apr 11 00:21:04 2007
@@ -10,6 +10,7 @@
Package: python-twill
Architecture: all
Depends: ${python:Depends}, python-mechanize (>= 0.1.6b), 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
Modified: packages/twill/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/python-modules/packages/twill/trunk/debian/copyright?rev=2040&op=diff
==============================================================================
--- packages/twill/trunk/debian/copyright (original)
+++ packages/twill/trunk/debian/copyright Wed Apr 11 00:21:04 2007
@@ -27,6 +27,192 @@
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+In addition of twill main code, the following module are distributed
+along with twill under the following licenses:
+
+* twill/other_packages/mechanize/_beautifulsoup.py:
+
+ Copyright: Copyright (c) 2004 Leonard Richardson
+
+ License: Available under the same terms as Python. The Python
+ license is reproduced below.
+
+ PSF LICENSE AGREEMENT FOR PYTHON 2.3
+ ------------------------------------
+
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation
+ ("PSF"), and the Individual or Organization ("Licensee")
+ accessing and otherwise using Python 2.3 software in source or
+ binary form and its associated documentation.
+
+ 2. Subject to the terms and conditions of this License Agreement,
+ PSF hereby grants Licensee a nonexclusive, royalty-free,
+ world-wide license to reproduce, analyze, test, perform and/or
+ display publicly, prepare derivative works, distribute, and
+ otherwise use Python 2.3 alone or in any derivative version,
+ provided, however, that PSF's License Agreement and PSF's notice
+ of copyright, i.e., "Copyright (c) 2001, 2002 Python Software
+ Foundation; All Rights Reserved" are retained in Python 2.3 alone
+ or in any derivative version prepared by Licensee.
+
+ 3. In the event Licensee prepares a derivative work that is based on
+ or incorporates Python 2.3 or any part thereof, and wants to make
+ the derivative work available to others as provided herein, then
+ Licensee hereby agrees to include in any such work a brief
+ summary of the changes made to Python 2.3.
+
+ 4. PSF is making Python 2.3 available to Licensee on an "AS IS"
+ basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR
+ FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.3
+ WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+ 2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+ AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON
+ 2.3, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
+ POSSIBILITY THEREOF.
+
+ 6. This License Agreement will automatically terminate upon a
+ material breach of its terms and conditions.
+
+ 7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between PSF
+ and Licensee. This License Agreement does not grant permission
+ to use PSF trademarks or trade name in a trademark sense to
+ endorse or promote products or services of Licensee, or any third
+ party.
+
+ 8. By copying, installing or otherwise using Python 2.3, Licensee
+ 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
+
+ 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.
+
+twill/other_packages/mechanize:
+
+ Copyright (c) 2002-2004 John J. Lee <jjl at pobox.com>
+ Copyright (c) 2003 Andy Lester
+
+ 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
+ ------------------------------------
+
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation
+ ("PSF"), and the Individual or Organization ("Licensee")
+ accessing and otherwise using Python 2.4 software in source or
+ binary form and its associated documentation.
+
+ 2. Subject to the terms and conditions of this License Agreement,
+ PSF hereby grants Licensee a nonexclusive, royalty-free,
+ world-wide license to reproduce, analyze, test, perform and/or
+ display publicly, prepare derivative works, distribute, and
+ otherwise use Python 2.4 alone or in any derivative version,
+ provided, however, that PSF's License Agreement and PSF's notice
+ of copyright, i.e., "Copyright (c) 2001, 2002, 2003, 2004 Python
+ Software Foundation; All Rights Reserved" are retained in Python
+ 2.4 alone or in any derivative version prepared by Licensee.
+
+ 3. In the event Licensee prepares a derivative work that is based on
+ or incorporates Python 2.4 or any part thereof, and wants to make
+ the derivative work available to others as provided herein, then
+ Licensee hereby agrees to include in any such work a brief
+ summary of the changes made to Python 2.4.
+
+ 4. PSF is making Python 2.4 available to Licensee on an "AS IS"
+ basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR
+ FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.4
+ WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+ 2.4 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+ AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON
+ 2.4, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
+ POSSIBILITY THEREOF.
+
+ 6. This License Agreement will automatically terminate upon a
+ material breach of its terms and conditions.
+
+ 7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between PSF
+ and Licensee. This License Agreement does not grant permission
+ to use PSF trademarks or trade name in a trademark sense to
+ endorse or promote products or services of Licensee, or any third
+ party.
+
+ 8. By copying, installing or otherwise using Python 2.4, Licensee
+ agrees to be bound by the terms and conditions of this License
+ Agreement.
+
The Debian packaging is (C) 2007, Arnaud Fontaine <arnaud at andesi.org>
and is licensed under the GPL. On Debian systems, the complete text of
the GNU General Public License can be found in
Added: packages/twill/trunk/debian/doc-base
URL: http://svn.debian.org/wsvn/python-modules/packages/twill/trunk/debian/doc-base?rev=2040&op=file
==============================================================================
--- packages/twill/trunk/debian/doc-base (added)
+++ packages/twill/trunk/debian/doc-base Wed Apr 11 00:21:04 2007
@@ -1,0 +1,11 @@
+Document: twill
+Title: twill: a simple scripting language for Web browsing
+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
+
+Format: HTML
+Index: /usr/share/doc/python-twill/html/index.html
+Files: /usr/share/doc/python-twill/html/*.html
+
Added: packages/twill/trunk/debian/patches/01_fix_history_path.patch
URL: http://svn.debian.org/wsvn/python-modules/packages/twill/trunk/debian/patches/01_fix_history_path.patch?rev=2040&op=file
==============================================================================
--- packages/twill/trunk/debian/patches/01_fix_history_path.patch (added)
+++ packages/twill/trunk/debian/patches/01_fix_history_path.patch Wed Apr 11 00:21:04 2007
@@ -1,0 +1,29 @@
+--- twill-0.9~b1.orig/twill/shell.py
++++ twill-0.9~b1/twill/shell.py
+@@ -102,10 +102,16 @@
+ # initialize a new local namespace.
+ namespaces.new_local_dict()
+
++ # The history file name is located in the home directory of
++ # the user
++ import os
++ self._history_file = os.path.join(os.environ["HOME"],
++ ".twill_history")
++
+ # import readline history, if available.
+ if readline:
+ try:
+- readline.read_history_file('.twill-history')
++ readline.read_history_file(self._history_file)
+ except IOError:
+ pass
+
+@@ -237,6 +243,6 @@
+ def do_EOF(self, *args):
+ "Exit on CTRL-D"
+ if readline:
+- readline.write_history_file('.twill-history')
++ readline.write_history_file(self._history_file)
+
+ raise SystemExit()
+
Modified: packages/twill/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/twill/trunk/debian/rules?rev=2040&op=diff
==============================================================================
--- packages/twill/trunk/debian/rules (original)
+++ packages/twill/trunk/debian/rules Wed Apr 11 00:21:04 2007
@@ -17,8 +17,8 @@
# Install egg-info directories
DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
-DEB_PYTHON_DEFAULT_VERSION = $$(pyversions -d | sed 's/python//')
-DEB_UPSTREAM_VERSION := $$(echo $(DEB_UPSTREAM_VERSION) | sed 's/~//')
+DEB_PYTHON_DEFAULT_VERSION = $$(pyversions -vd)
+DEB_UPSTREAM_VERSION := $(subst ~,,$(DEB_UPSTREAM_VERSION))
%.1: %.dbk
cd $(<D) && $(XSLT_CMD) $(DB2MAN) $(<F)
More information about the Python-modules-commits
mailing list