Commit 84da13b5 authored by Chris Lamb's avatar Chris Lamb Committed by Sebastian Ramacher

Imported Debian patch 0.9.1-3

parent fe4f5e80
codespeak-lib (0.9.1-3) unstable; urgency=low
* Add patch to fix infinitely looping Subversion tests under Subversion
1.5. (Closes: #489102)
* Move to quilt patch system.
* Add patch to make documentation generation during build more verbose.
* Remove unnecessary Lintian overrides.
* debian/control:
- Replace some obsolete Suggests
- Add Depends on ${misc:Depends}
- Bump Standards-Version to 3.8.0.
-- Chris Lamb <chris@chris-lamb.co.uk> Tue, 15 Jul 2008 19:59:14 +0100
codespeak-lib (0.9.1-2) unstable; urgency=low
* Tidy debian/rules.
......
......@@ -2,18 +2,18 @@ Source: codespeak-lib
Section: python
Priority: optional
Maintainer: Chris Lamb <chris@chris-lamb.co.uk>
Build-Depends: python-all-dev (>= 2.3.5-10), python-central (>= 0.5), debhelper (>= 5.0.37.1), dpatch, python-docutils, xsltproc, docbook-xsl, subversion, openssh-client, texlive-extra-utils
Build-Depends: python-all-dev (>= 2.3.5-10), python-central (>= 0.5), debhelper (>= 5.0.37.1), quilt, python-docutils, xsltproc, docbook-xsl, subversion, openssh-client, texlive-extra-utils
XS-Python-Version: all
Standards-Version: 3.7.3
Standards-Version: 3.8.0
Homepage: http://codespeak.net/py/
Package: python-codespeak-lib
Architecture: any
Depends: ${python:Depends}, ${shlibs:Depends}
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Conflicts: python-pylib, python2.3-codespeak-lib, python2.4-codespeak-lib
Replaces: python-pylib, python2.3-codespeak-lib, python2.4-codespeak-lib
Recommends: python-docutils
Suggests: screen, rsync, graphviz, tetex-bin, gs-gpl|gs-esp, ps2eps, subversion
Suggests: screen, rsync, graphviz, texlive, ghostscript, ps2eps, subversion
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: The pylib library containing py.test, greenlets and other niceties
......
python-codespeak-lib: script-not-executable ./usr/share/pyshared/py/execnet/script/shell.py
python-codespeak-lib: script-not-executable ./usr/share/pyshared/py/execnet/script/socketserver.py
python-codespeak-lib: script-not-executable ./usr/share/pyshared/py/misc/findmissingdocstrings.py
01-fix-scripts
02-py-test-path
03-distutils-setup
04-apigen
05-disable-buildcmodule
#! /bin/sh /usr/share/dpatch/dpatch-run
## fix-scripts.dpatch by <alf@merlin>
##
## DP: findpy not available in /usr/bin + use /usr/bin/python
01-fix-scripts.diff
@DPATCH@
findpy not available in /usr/bin + use /usr/bin/python. Patch by <alf@merlin>.
--- codespeak-lib-0.7-svn20061228.orig/py/misc/cmdline/countloc.py 2006-12-28 14:14:32.000000000 +0100
+++ codespeak-lib-0.7-svn20061228/py/misc/cmdline/countloc.py 2007-01-05 17:23:04.000000000 +0100
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02-py-test-path.dpatch by Chris Lamb <chris@chris-lamb.co.uk>
##
## DP: Workaround Python module path conflict when pypy-dev is
## DP: installed. See #463568.
02-py-test-path.diff
Workaround Python module path conflict when pypy-dev is
installed. See #463568. Patch by Chris Lamb <chris@chris-lamb.co.uk>.
@DPATCH@
diff -urNad py-0.9.1~/py/bin/py.test py-0.9.1/py/bin/py.test
--- py-0.9.1~/py/bin/py.test 2008-03-28 10:40:40.000000000 +0000
+++ py-0.9.1/py/bin/py.test 2008-04-03 23:59:12.000000000 +0100
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## 03-distutils-setup.dpatch by <alf@merlin>
##
## DP: Use stdlib's distutils for setup. The package list may be generated by:
## DP: find -name __init__.py | xargs -L1 dirname | grep -v "/testing" | sort
03-distutils-setup.diff
@DPATCH@
Use stdlib's distutils for setup. The package list may be generated by:
find -name __init__.py | xargs -L1 dirname | grep -v "/testing" | sort
Patch by <alf@merlin>.
--- pylib-0.9.0-beta.orig/setup.py 2007-01-31 23:23:24.000000000 +0100
+++ codespeak-lib-0.9.0-beta/setup.py 2007-02-13 16:32:19.000000000 +0100
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## 04-apigen.dpatch
@DPATCH@
04-apigen.dpatch
--- codespeak-lib-0.9.0.orig/py/apigen/htmlgen.py
+++ codespeak-lib-0.9.0/py/apigen/htmlgen.py
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## 05-disable-buildcmodule.dpatch by Chris Lamb <chris@chris-lamb.co.uk>
##
## DP: Ensure that builcmodule does not remove the library inside /usr/lib.
## DP: See #471844. Patch by Mark Wooding <mdw@distorted.org.uk>.
05-disable-buildcmodule.diff
Ensure that builcmodule does not remove the library inside /usr/lib.
See #471844. Patch by Mark Wooding <mdw@distorted.org.uk>.
@DPATCH@
diff -urNad py-0.9.1~/py/misc/buildcmodule.py py-0.9.1/py/misc/buildcmodule.py
--- py-0.9.1~/py/misc/buildcmodule.py 2008-03-28 10:40:38.000000000 +0000
+++ py-0.9.1/py/misc/buildcmodule.py 2008-04-04 00:09:12.000000000 +0100
......
06-subversion-looping.diff
"svn ls -v" under Subversion >= 1.5 lists ".", which was causing some
operations to loop infinitely. See #489102 and
https://codespeak.net/issue/py-dev/issue56. Patch by Chris Lamb
<chris@chris-lamb.co.uk>.
diff -urNad py/path/svn/urlcommand.py codespeak-lib-0.9.1/py/path/svn/urlcommand.py
--- a/py/path/svn/urlcommand.py 2008-07-12 03:02:11.000000000 +0100
+++ b/py/path/svn/urlcommand.py 2008-07-12 03:03:23.000000000 +0100
@@ -239,7 +239,8 @@
for lsline in lines:
if lsline:
info = InfoSvnCommand(lsline)
- nameinfo_seq.append((info._name, info))
+ if info._name != '.':
+ nameinfo_seq.append((info._name, info))
return nameinfo_seq
auth = self.auth and self.auth.makecmdoptions() or None
if self.rev is not None:
07-verbose-apigen.diff
Make the apigen stage of the build actually say something; could timeout
on slow buildds/is boring, etc. Patch by Chris Lamb <chris@chris-lamb.co.uk>.
diff -urNad py-0.9.1.orig/py/bin/_docgen.py py-0.9.1/py/bin/_docgen.py
--- py-0.9.1.orig/py/bin/_docgen.py 2008-07-04 15:35:50.000000000 +0100
+++ py-0.9.1/py/bin/_docgen.py 2008-07-04 15:35:54.000000000 +0100
@@ -17,7 +17,7 @@
cmd = ('PYTHONPATH="%s" %s python "%s" %s "%s"' %
(pypath.dirpath(), envvars, pytestpath, args, path))
print cmd
- py.process.cmdexec(cmd)
+ py.process.cmdexec(cmd, debug=True)
def build_apigen_docs(targetpath, testargs=''):
run_tests(pypath,
diff -urNad py-0.9.1.orig/py/process/cmdexec.py py-0.9.1/py/process/cmdexec.py
--- py-0.9.1.orig/py/process/cmdexec.py 2008-07-04 15:35:50.000000000 +0100
+++ py-0.9.1/py/process/cmdexec.py 2008-07-04 15:36:24.000000000 +0100
@@ -16,7 +16,7 @@
#-----------------------------------------------------------
# posix external command execution
#-----------------------------------------------------------
-def posix_exec_cmd(cmd):
+def posix_exec_cmd(cmd, debug=False):
""" return output of executing 'cmd'.
raise ExecutionFailed exeception if the command failed.
@@ -78,6 +78,8 @@
if not data:
r.close()
continue
+ if debug:
+ sys.stderr.write(data)
if r is stdout:
out.append(data)
else:
01-fix-scripts.diff
02-py-test-path.diff
03-distutils-setup.diff
04-apigen.diff
05-disable-buildcmodule.diff
06-subversion-looping.diff
07-verbose-apigen.diff
......@@ -3,7 +3,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
include /usr/share/dpatch/dpatch.make
include /usr/share/quilt/quilt.make
PYVERS := $(shell pyversions -r -v)
PYVER := $(shell pyversions -d -v)
......@@ -16,7 +16,7 @@ XP=xsltproc -''-nonet
DOCBOOK_MANPAGES=$(wildcard debian/*.xml)
MANPAGES=$(patsubst %.xml,%.1, $(DOCBOOK_MANPAGES))
build: $(DPATCH_STAMPFN) build-stamp build-doc
build: $(QUILT_STAMPFN) build-stamp build-doc
build-doc: build-doc-stamp $(MANPAGES)
ls $(MANPAGES) > debian/python-codespeak-lib.manpages
......@@ -81,9 +81,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
dh_installdirs usr/share/lintian/overrides/
dh_install -a
cp debian/lintian.override debian/python-codespeak-lib/usr/share/lintian/overrides/python-codespeak-lib
chmod 644 debian/python-codespeak-lib/usr/lib/python*/site-packages/py/execnet/script/shell.py
rm -f debian/python-codespeak-lib/usr/share/doc/python-codespeak-lib/__init__.py
find -type f -name "UNKNOWN*.egg-info" | xargs rm -f
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment