[Python-modules-commits] r4011 - in packages/twill/trunk/debian (12 files)
arnau at users.alioth.debian.org
arnau at users.alioth.debian.org
Fri Dec 21 03:43:21 UTC 2007
Date: Friday, December 21, 2007 @ 03:43:19
Author: arnau
Revision: 4011
* New email address.
* Use quilt patch system instead of simple patchsys.
* Remove useless debian/control.in.
* Drop useless dependency on python-setuptools, use distutils instead.
+ Add debian/patches/03_no_setuptools.patch.
* debian/patches/01_fix_history_path.patch:
+ Check whether HOME environment variable is set before using it.
* debian/control:
+ Now depend on python-mechanize >= 0.1.7b-2 because it fixes #456944.
Added:
packages/twill/trunk/debian/patches/02_remove_ext.patch
(from rev 4004, packages/twill/trunk/debian/patches/01_remove_ext.patch)
packages/twill/trunk/debian/patches/03_no_setuptools.patch
packages/twill/trunk/debian/patches/series
Modified:
packages/twill/trunk/debian/changelog
packages/twill/trunk/debian/control
packages/twill/trunk/debian/copyright
packages/twill/trunk/debian/patches/01_fix_history_path.patch
packages/twill/trunk/debian/rules
packages/twill/trunk/debian/twill-fork.dbk
packages/twill/trunk/debian/twill-sh.dbk
Deleted:
packages/twill/trunk/debian/control.in
packages/twill/trunk/debian/patches/01_remove_ext.patch
Modified: packages/twill/trunk/debian/changelog
===================================================================
--- packages/twill/trunk/debian/changelog 2007-12-21 02:09:39 UTC (rev 4010)
+++ packages/twill/trunk/debian/changelog 2007-12-21 03:43:19 UTC (rev 4011)
@@ -1,10 +1,23 @@
-twill (0.9~b1-2) UNRELEASED; urgency=low
+twill (0.9~b1-2) unstable; urgency=low
- * Added debian/watch file
- * Vcs-Svn, Vcs-Browser and Homepage fields added
+ [ Arnaud Fontaine ]
+ * New email address.
+ * Use quilt patch system instead of simple patchsys.
+ * Remove useless debian/control.in.
+ * Drop useless dependency on python-setuptools, use distutils instead.
+ + Add debian/patches/03_no_setuptools.patch.
+ * debian/patches/01_fix_history_path.patch:
+ + Check whether HOME environment variable is set before using it.
+ * debian/control:
+ + Now depend on python-mechanize >= 0.1.7b-2 because it fixes
+ #456944.
- -- Piotr Ożarowski <piotr at debian.org> Sat, 6 Oct 2007 23:47:34 +0200
+ [ Piotr Ożarowski ]
+ * Added debian/watch file.
+ * Vcs-Svn, Vcs-Browser and Homepage fields added (dpkg support them now).
+ -- Arnaud Fontaine <arnau at debian.org> Fri, 21 Dec 2007 03:04:41 +0000
+
twill (0.9~b1-1) unstable; urgency=low
* Initial release. Closes: #387152.
Modified: packages/twill/trunk/debian/control
===================================================================
--- packages/twill/trunk/debian/control 2007-12-21 02:09:39 UTC (rev 4010)
+++ packages/twill/trunk/debian/control 2007-12-21 03:43:19 UTC (rev 4011)
@@ -1,10 +1,17 @@
Source: twill
Section: python
Priority: optional
-Maintainer: Arnaud Fontaine <arnaud at andesi.org>
+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), python-dev (>= 2.3.5-11), python-support (>= 0.3.2), patchutils (>= 0.2.25)
-Build-Depends-Indep: xsltproc, docbook-xsl, docbook-xml, python-setuptools (>= 0.6b3-1)
+Build-Depends: debhelper (>= 5.0.37.2),
+ cdbs (>= 0.4.43),
+ python-dev (>= 2.3.5-11),
+ python-support (>= 0.3.2),
+ patchutils (>= 0.2.25),
+ quilt
+Build-Depends-Indep: xsltproc,
+ docbook-xsl,
+ docbook-xml,
Standards-Version: 3.7.2
Homepage: http://twill.idyll.org/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/twill/trunk/
@@ -12,7 +19,10 @@
Package: python-twill
Architecture: all
-Depends: ${python:Depends}, python-mechanize (>= 0.1.6b), python-clientform (>= 0.2.6), python-pyparsing (>= 1.4.1)
+Depends: ${python: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
Deleted: packages/twill/trunk/debian/control.in
===================================================================
--- packages/twill/trunk/debian/control.in 2007-12-21 02:09:39 UTC (rev 4010)
+++ packages/twill/trunk/debian/control.in 2007-12-21 03:43:19 UTC (rev 4011)
@@ -1,23 +0,0 @@
-Source: twill
-Section: python
-Priority: optional
-Maintainer: Arnaud Fontaine <arnaud at andesi.org>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: @cdbs@
-Build-Depends-Indep: xsltproc, docbook-xsl, docbook-xml, python-setuptools (>= 0.6b3-1)
-Standards-Version: 3.7.2
-Homepage: http://twill.idyll.org/
-Vcs-Svn: svn://svn.debian.org/python-modules/packages/twill/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/twill/?op=log
-
-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
- Web from a command-line interface. So, you can navigate through Web
- sites that use forms, cookies, and most standard Web features.
- .
- Homepage: http://twill.idyll.org/
Modified: packages/twill/trunk/debian/copyright
===================================================================
--- packages/twill/trunk/debian/copyright 2007-12-21 02:09:39 UTC (rev 4010)
+++ packages/twill/trunk/debian/copyright 2007-12-21 03:43:19 UTC (rev 4011)
@@ -1,4 +1,4 @@
-This package was debianized by Arnaud Fontaine <arnaud at andesi.org> on
+This package was debianized by Arnaud Fontaine <arnau at debian.org> on
Sun, 08 Apr 2007 10:37:43 +0200.
It was downloaded from http://twill.idyll.org/
@@ -213,7 +213,7 @@
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>
+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
+the GNU General Public License can be found in
`/usr/share/common-licenses/GPL'.
Modified: packages/twill/trunk/debian/patches/01_fix_history_path.patch
===================================================================
--- packages/twill/trunk/debian/patches/01_fix_history_path.patch 2007-12-21 02:09:39 UTC (rev 4010)
+++ packages/twill/trunk/debian/patches/01_fix_history_path.patch 2007-12-21 03:43:19 UTC (rev 4011)
@@ -1,29 +1,35 @@
---- twill-0.9~b1.orig/twill/shell.py
-+++ twill-0.9~b1/twill/shell.py
-@@ -102,10 +102,16 @@
+Index: twill-0.9~b1/twill/shell.py
+===================================================================
+--- twill-0.9~b1.orig/twill/shell.py 2007-03-06 23:00:05.000000000 +0000
++++ twill-0.9~b1/twill/shell.py 2007-12-21 02:56:21.000000000 +0000
+@@ -102,10 +102,17 @@
# 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")
++ self._history_file = os.environ.has_key("HOME") and \
++ os.path.join(os.environ["HOME"], ".twill_history") or \
++ None
+
# import readline history, if available.
- if readline:
+- if readline:
++ if self._history_file and readline:
try:
- readline.read_history_file('.twill-history')
+ readline.read_history_file(self._history_file)
except IOError:
pass
-@@ -237,6 +243,6 @@
+@@ -236,8 +243,8 @@
+
def do_EOF(self, *args):
"Exit on CTRL-D"
- if readline:
+- if readline:
- readline.write_history_file('.twill-history')
++ if self._history_file and readline:
+ readline.write_history_file(self._history_file)
raise SystemExit()
-
\ No newline at end of file
+
Deleted: packages/twill/trunk/debian/patches/01_remove_ext.patch
===================================================================
--- packages/twill/trunk/debian/patches/01_remove_ext.patch 2007-12-21 02:09:39 UTC (rev 4010)
+++ packages/twill/trunk/debian/patches/01_remove_ext.patch 2007-12-21 03:43:19 UTC (rev 4011)
@@ -1,12 +0,0 @@
---- twill-0.9~b1.orig/setup.py
-+++ twill-0.9~b1/setup.py
-@@ -18,8 +18,7 @@
- author_email = 'titus at idyll.org',
- license='MIT',
-
-- packages = ['twill', 'twill.other_packages',
-- 'twill.other_packages.mechanize',
-+ packages = ['twill',
- 'twill.extensions',
- 'twill.extensions.match_parse'],
-
Copied: packages/twill/trunk/debian/patches/02_remove_ext.patch (from rev 4004, packages/twill/trunk/debian/patches/01_remove_ext.patch)
===================================================================
--- packages/twill/trunk/debian/patches/02_remove_ext.patch (rev 0)
+++ packages/twill/trunk/debian/patches/02_remove_ext.patch 2007-12-21 03:43:19 UTC (rev 4011)
@@ -0,0 +1,12 @@
+--- twill-0.9~b1.orig/setup.py
++++ twill-0.9~b1/setup.py
+@@ -18,8 +18,7 @@
+ author_email = 'titus at idyll.org',
+ license='MIT',
+
+- packages = ['twill', 'twill.other_packages',
+- 'twill.other_packages.mechanize',
++ packages = ['twill',
+ 'twill.extensions',
+ 'twill.extensions.match_parse'],
+
Added: packages/twill/trunk/debian/patches/03_no_setuptools.patch
===================================================================
--- packages/twill/trunk/debian/patches/03_no_setuptools.patch (rev 0)
+++ packages/twill/trunk/debian/patches/03_no_setuptools.patch 2007-12-21 03:43:19 UTC (rev 4011)
@@ -0,0 +1,27 @@
+Index: twill-0.9~b1/setup.py
+===================================================================
+--- twill-0.9~b1.orig/setup.py 2007-12-21 03:34:13.000000000 +0000
++++ twill-0.9~b1/setup.py 2007-12-21 03:34:22.000000000 +0000
+@@ -1,10 +1,6 @@
+ #!/usr/bin/env python
+
+-try:
+- from setuptools import setup
+-except ImportError:
+- print '(WARNING: importing distutils, not setuptools!)'
+- from distutils.core import setup
++from distutils.core import setup
+
+ #### twill info.
+
+@@ -22,9 +18,7 @@
+ 'twill.extensions',
+ 'twill.extensions.match_parse'],
+
+- # allow both
+- entry_points = dict(console_scripts=['twill-sh = twill.shell:main'],),
+- scripts = ['twill-fork'],
++ scripts = ['twill-fork', 'twill-sh'],
+
+ maintainer = 'C. Titus Brown',
+ maintainer_email = 'titus at caltech.edu',
Added: packages/twill/trunk/debian/patches/series
===================================================================
--- packages/twill/trunk/debian/patches/series (rev 0)
+++ packages/twill/trunk/debian/patches/series 2007-12-21 03:43:19 UTC (rev 4011)
@@ -0,0 +1,3 @@
+01_fix_history_path.patch
+02_remove_ext.patch
+03_no_setuptools.patch
Modified: packages/twill/trunk/debian/rules
===================================================================
--- packages/twill/trunk/debian/rules 2007-12-21 02:09:39 UTC (rev 4010)
+++ packages/twill/trunk/debian/rules 2007-12-21 03:43:19 UTC (rev 4011)
@@ -5,7 +5,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
# Don't compress .py files
DEB_COMPRESS_EXCLUDE := .py
@@ -15,18 +15,10 @@
XSLT_CMD = xsltproc -nonet
DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
-# Install egg-info directories
-DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
-DEB_PYTHON_DEFAULT_VERSION = $$(pyversions -vd)
-DEB_UPSTREAM_VERSION := $(subst ~,,$(DEB_UPSTREAM_VERSION))
-
%.1: %.dbk
cd $(<D) && $(XSLT_CMD) $(DB2MAN) $(<F)
install/$(DEB_PYTHON_MODULE_PACKAGE):: $(MANPAGES)
- # Rename egg-info directory to share it between several python versions
- mv debian/python-twill/usr/lib/python$(DEB_PYTHON_DEFAULT_VERSION)/site-packages/twill-$(DEB_UPSTREAM_VERSION)-py$(DEB_PYTHON_DEFAULT_VERSION).egg-info \
- debian/python-twill/usr/lib/python$(DEB_PYTHON_DEFAULT_VERSION)/site-packages/twill-$(DEB_UPSTREAM_VERSION).egg-info
clean::
- -rm -rf twill.egg-info $(MANPAGES)
+ -rm -f $(MANPAGES)
Modified: packages/twill/trunk/debian/twill-fork.dbk
===================================================================
--- packages/twill/trunk/debian/twill-fork.dbk 2007-12-21 02:09:39 UTC (rev 4010)
+++ packages/twill/trunk/debian/twill-fork.dbk 2007-12-21 03:43:19 UTC (rev 4011)
@@ -36,7 +36,7 @@
<!-- SECTION should be 1-8, maybe w/ subsection other parameters are
allowed: see man(7), man(1). -->
<!ENTITY dhsection "<manvolnum>1</manvolnum>">
- <!ENTITY dhemail "<email>arnaud at andesi.org</email>">
+ <!ENTITY dhemail "<email>arnau at debian.org</email>">
<!ENTITY dhusername "Arnaud Fontaine">
<!ENTITY dhucpackage "<refentrytitle>TWILL</refentrytitle>">
<!ENTITY dhpackage "twill-fork">
Modified: packages/twill/trunk/debian/twill-sh.dbk
===================================================================
--- packages/twill/trunk/debian/twill-sh.dbk 2007-12-21 02:09:39 UTC (rev 4010)
+++ packages/twill/trunk/debian/twill-sh.dbk 2007-12-21 03:43:19 UTC (rev 4011)
@@ -36,7 +36,7 @@
<!-- SECTION should be 1-8, maybe w/ subsection other parameters are
allowed: see man(7), man(1). -->
<!ENTITY dhsection "<manvolnum>1</manvolnum>">
- <!ENTITY dhemail "<email>arnaud at andesi.org</email>">
+ <!ENTITY dhemail "<email>arnau at debian.org</email>">
<!ENTITY dhusername "Arnaud Fontaine">
<!ENTITY dhucpackage "<refentrytitle>TWILL</refentrytitle>">
<!ENTITY dhpackage "twill-sh">
More information about the Python-modules-commits
mailing list