[Python-modules-commits] r3144 - in /packages/codespeak-lib/trunk: debian/changelog debian/control debian/patches/00dpatch.conf debian/patches/00list debian/patches/apigen-htmlgen.dpatch debian/patches/apigen-tracer-docstorage.dpatch debian/rules py/
bzed-guest at users.alioth.debian.org
bzed-guest at users.alioth.debian.org
Fri Aug 31 09:30:13 UTC 2007
Author: bzed-guest
Date: Fri Aug 31 09:30:13 2007
New Revision: 3144
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3144
Log:
- moving modified files from the diff.tar.gz into patches
- adding Alexandre Fayolle's work
Added:
packages/codespeak-lib/trunk/debian/patches/00dpatch.conf
packages/codespeak-lib/trunk/debian/patches/apigen-htmlgen.dpatch (with props)
packages/codespeak-lib/trunk/debian/patches/apigen-tracer-docstorage.dpatch (with props)
Removed:
packages/codespeak-lib/trunk/py/
Modified:
packages/codespeak-lib/trunk/debian/changelog
packages/codespeak-lib/trunk/debian/control
packages/codespeak-lib/trunk/debian/patches/00list
packages/codespeak-lib/trunk/debian/rules
Modified: packages/codespeak-lib/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/codespeak-lib/trunk/debian/changelog?rev=3144&op=diff
==============================================================================
--- packages/codespeak-lib/trunk/debian/changelog (original)
+++ packages/codespeak-lib/trunk/debian/changelog Fri Aug 31 09:30:13 2007
@@ -1,3 +1,11 @@
+codespeak-lib (0.9.0-4) unstable; urgency=low
+
+ * rebuild to get py2.5 support (closes: #432028)
+ * install webdata html and js files (closes: #434226)
+ * add build dependency on ssh (closes: #419969)
+
+ -- Alexandre Fayolle <afayolle at debian.org> Thu, 30 Aug 2007 15:33:09 +0200
+
codespeak-lib (0.9.0-3) unstable; urgency=low
* Added missing build dependencies on subversion and ssh
Modified: packages/codespeak-lib/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/codespeak-lib/trunk/debian/control?rev=3144&op=diff
==============================================================================
--- packages/codespeak-lib/trunk/debian/control (original)
+++ packages/codespeak-lib/trunk/debian/control Fri Aug 31 09:30:13 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Guilherme Salgado <salgado at async.com.br>
Uploaders: Alexandre Fayolle <afayolle at debian.org>
-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
+Build-Depends: python-all-dev (>= 2.3.5-10), python-central (>= 0.5.6), debhelper (>= 5.0.38), dpatch, python-docutils, xsltproc, docbook-xsl, subversion, ssh
XS-Python-Version: all
Standards-Version: 3.7.2
Added: packages/codespeak-lib/trunk/debian/patches/00dpatch.conf
URL: http://svn.debian.org/wsvn/python-modules/packages/codespeak-lib/trunk/debian/patches/00dpatch.conf?rev=3144&op=file
==============================================================================
--- packages/codespeak-lib/trunk/debian/patches/00dpatch.conf (added)
+++ packages/codespeak-lib/trunk/debian/patches/00dpatch.conf Fri Aug 31 09:30:13 2007
@@ -1,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../tarballs
Modified: packages/codespeak-lib/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/codespeak-lib/trunk/debian/patches/00list?rev=3144&op=diff
==============================================================================
--- packages/codespeak-lib/trunk/debian/patches/00list (original)
+++ packages/codespeak-lib/trunk/debian/patches/00list Fri Aug 31 09:30:13 2007
@@ -1,3 +1,5 @@
01-fix-scripts
02-fix-greenlet-bustage
03-distutils-setup
+apigen-htmlgen.dpatch
+apigen-tracer-docstorage.dpatch
Added: packages/codespeak-lib/trunk/debian/patches/apigen-htmlgen.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/codespeak-lib/trunk/debian/patches/apigen-htmlgen.dpatch?rev=3144&op=file
==============================================================================
--- packages/codespeak-lib/trunk/debian/patches/apigen-htmlgen.dpatch (added)
+++ packages/codespeak-lib/trunk/debian/patches/apigen-htmlgen.dpatch Fri Aug 31 09:30:13 2007
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## apigen-htmlgen.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad codespeak-lib~/py/apigen/htmlgen.py codespeak-lib/py/apigen/htmlgen.py
+--- codespeak-lib~/py/apigen/htmlgen.py 2007-02-14 12:13:04.000000000 +0100
++++ codespeak-lib/py/apigen/htmlgen.py 2007-08-31 11:27:25.000000000 +0200
+@@ -178,6 +178,8 @@
+ rev = None
+ if wc.check(versioned=True):
+ rev = py.path.svnwc(packageroot).info().rev
++ else:
++ rev = py.__package__.revision
+ _revcache[packageroot] = rev
+ if packageroot.basename == "py":
+ assert rev is not None
Propchange: packages/codespeak-lib/trunk/debian/patches/apigen-htmlgen.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/codespeak-lib/trunk/debian/patches/apigen-tracer-docstorage.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/codespeak-lib/trunk/debian/patches/apigen-tracer-docstorage.dpatch?rev=3144&op=file
==============================================================================
--- packages/codespeak-lib/trunk/debian/patches/apigen-tracer-docstorage.dpatch (added)
+++ packages/codespeak-lib/trunk/debian/patches/apigen-tracer-docstorage.dpatch Fri Aug 31 09:30:13 2007
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## apigen-tracer-docstorage.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad codespeak-lib~/py/apigen/tracer/docstorage.py codespeak-lib/py/apigen/tracer/docstorage.py
+--- codespeak-lib~/py/apigen/tracer/docstorage.py 2007-02-14 12:13:03.000000000 +0100
++++ codespeak-lib/py/apigen/tracer/docstorage.py 2007-08-31 11:28:17.000000000 +0200
+@@ -21,8 +21,17 @@
+ for key, value in defs.iteritems():
+ chain = key.split('.')
+ base = module
+- for elem in chain:
+- base = getattr(base, elem)
++ try:
++ for elem in chain:
++ base = getattr(base, elem)
++ except RuntimeError, exc:
++ if elem == "greenlet":
++ print exc.__class__.__name__, exc
++ print "Greenlets not supported on this platform. Skipping apigen doc for this module"
++ continue
++ else:
++ raise
++
+ if value[1] == '*':
+ d.update(get_star_import_tree(base, key))
+ else:
Propchange: packages/codespeak-lib/trunk/debian/patches/apigen-tracer-docstorage.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/codespeak-lib/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/codespeak-lib/trunk/debian/rules?rev=3144&op=diff
==============================================================================
--- packages/codespeak-lib/trunk/debian/rules (original)
+++ packages/codespeak-lib/trunk/debian/rules Fri Aug 31 09:30:13 2007
@@ -4,6 +4,7 @@
#export DH_VERBOSE=1
PYVERS := $(shell pyversions -r -v)
+DEFPY := $(shell pyversions -d -v)
#PYVER := $(shell pyversions -d -v)
DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -35,7 +36,9 @@
build-stamp: $(PYVERS:%=build-python%)
dh_clean -k
- python setup.py install --no-compile --prefix=debian/python-codespeak-lib/usr/
+ python setup.py install --no-compile --prefix=debian/python-codespeak-lib/usr
+
+ cp -v py/test/rsession/webdata/*.html py/test/rsession/webdata/*.js debian/python-codespeak-lib/usr/lib/python$(DEFPY)/site-packages/py/test/rsession/webdata/
rm -f debian/python-codespeak-lib/usr/lib/python*/site-packages/py/env.py
for f in debian/python-codespeak-lib/usr/bin/* ; do \
sed -i -e 's/from \_findpy import py/import py/' $$f ; \
More information about the Python-modules-commits
mailing list