Package: funkload Severity: wishlist tags: patch Hi,
A new upstream version is available (1.10.0). I prepared a diff for this new version to make it works on Ubuntu. I add it to this bug report. I hope it can help you upgrading the package. Thanks. Regards, Julien Lavergne
diff -u funkload-1.10.0/debian/watch funkload-1.10.0/debian/watch --- funkload-1.10.0/debian/watch +++ funkload-1.10.0/debian/watch @@ -3 +3 @@ -http://funkload.nuxeo.org/ funkload-([\d+\.]+|\d+)[a-z]*\.tar\.gz +http://pypi.python.org/packages/source/f/funkload/ funkload-([\d+\.]+|\d+)[a-z]*\.tar\.gz diff -u funkload-1.10.0/debian/rules funkload-1.10.0/debian/rules --- funkload-1.10.0/debian/rules +++ funkload-1.10.0/debian/rules @@ -4,7 +4,7 @@ export DH_VERBOSE=1 -UPSTREAM_VERSION=1.6.2 +UPSTREAM_VERSION=1.10.0 DEB_PYTHON_SYSTEM=pycentral diff -u funkload-1.10.0/debian/control funkload-1.10.0/debian/control --- funkload-1.10.0/debian/control +++ funkload-1.10.0/debian/control @@ -1,16 +1,16 @@ Source: funkload Section: web Priority: extra Maintainer: Toni Mueller <[email protected]> Build-Depends: python, cdbs, debhelper (>= 5), docbook-to-man, python-docutils, python-central (>= 0.5), python-setuptools -XS-Python-Version: 2.4, 2.5 +XS-Python-Version: >= 2.5 Standards-Version: 3.8.0 Package: funkload Architecture: all Depends: python (>= 2.4), python-central (>= 0.5), python-pkg-resources, python-webunit (>= 1:1.3.8) -Conflicts: python-webunit (>= 1:1.3.9) -Recommends: tcpwatch-httpproxy, python-gdchart2, python-docutils +Conflicts: python-webunit (>= 1:1.3.9), python-setuptools +Recommends: tcpwatch-httpproxy, python-gdchart2, python-docutils, gnuplot XB-Python-Version: ${python:Versions} Description: web testing tool This web testing tool is designed to allow testing the functionality diff -u funkload-1.10.0/debian/changelog funkload-1.10.0/debian/changelog --- funkload-1.10.0/debian/changelog +++ funkload-1.10.0/debian/changelog @@ -1,3 +1,18 @@ +funkload (1.10.0-1) unstable; urgency=low + + * New upstream release. + - Fix a crash when using fl-build-report (Closes: #492755) + * debian/rules: Update upstream version. + * debian/control: + - Set XS-Python-Version to >= 2.5 instead of hardcoding versions. + - Add python-setuptools to depends, it doesn't start without it. + - Add gnuplot as recommends, it's necessary to run tests. + * debian/patches: Drop, merged upstream. + * debian/docs Update funkload.egg-info location. + * debian/watch: Update. + + -- Julien Lavergne <[email protected]> Thu, 13 Aug 2009 23:26:50 +0200 + funkload (1.6.2-6) unstable; urgency=low * changed dependencies wrt. python-webunit to require at least diff -u funkload-1.10.0/debian/docs funkload-1.10.0/debian/docs --- funkload-1.10.0/debian/docs +++ funkload-1.10.0/debian/docs @@ -8 +8 @@ -funkload.egg-info/ +src/funkload.egg-info reverted: --- funkload-1.10.0/debian/patches/01-doc-Makefile.patch +++ funkload-1.10.0.orig/debian/patches/01-doc-Makefile.patch @@ -1,11 +0,0 @@ ---- doc/Makefile.orig 2006-01-27 10:37:42.000000000 +0100 -+++ doc/Makefile 2007-12-13 23:13:00.000000000 +0100 -@@ -7,7 +7,7 @@ - TARGET := cvs.in.nuxeo.com:~/public_public_html/funkload - HTML_DOCS := README.html INSTALL.html CHANGES.html - CSS_FILE := ../funkload/data/funkload.css --RST2HTML := rst2html.py -t --stylesheet-path=$(CSS_FILE) --embed-stylesheet -+RST2HTML := rst2html -t --stylesheet-path=$(CSS_FILE) --embed-stylesheet - - all: doc epydoc - reverted: --- funkload-1.10.0/debian/patches/02-funkload-Recorder_py.patch +++ funkload-1.10.0.orig/debian/patches/02-funkload-Recorder_py.patch @@ -1,23 +0,0 @@ ---- funkload/Recorder.py.orig 2006-03-02 11:34:16.000000000 +0100 -+++ funkload/Recorder.py 2007-12-21 23:15:30.000000000 +0100 -@@ -23,6 +23,11 @@ - - Credits goes to Ian Bicking for parsing tcpwatch files. - -+In the Debian package, tcpwatch has been renamed to -+tcpwatch-httpproxy, available in the package with the -+same name. -+ -+ - $Id: Recorder.py 33463 2006-02-24 14:09:21Z bdelbosc $ - """ - import os -@@ -201,7 +206,7 @@ - def startProxy(self): - """Start a tcpwatch session.""" - self.tcpwatch_path = mkdtemp('_funkload') -- cmd = 'tcpwatch.py -p %s -s -r %s' % (self.port, -+ cmd = 'tcpwatch-httpproxy -p %s -s -r %s' % (self.port, - self.tcpwatch_path) - if self.verbose: - cmd += ' | grep "T http"' reverted: --- funkload-1.10.0/funkload.egg-info/SOURCES.txt +++ funkload-1.10.0.orig/funkload.egg-info/SOURCES.txt @@ -1,6 +1,13 @@ +CHANGES.txt +INSTALL.txt +LICENSE.txt +Makefile README.txt +THANKS +TODO.txt +ez_setup.py -setup.cfg setup.py +doc/Makefile funkload/BenchRunner.py funkload/CPS338TestCase.py funkload/CPS340DocTest.py @@ -12,6 +19,7 @@ funkload/FunkLoadDocTest.py funkload/FunkLoadTestCase.py funkload/Lipsum.py +funkload/Makefile funkload/Monitor.py funkload/PatchWebunit.py funkload/Recorder.py @@ -30,6 +38,33 @@ funkload.egg-info/requires.txt funkload.egg-info/top_level.txt funkload.egg-info/zip-safe +funkload/data/ConfigurationTestCase.tpl +funkload/data/ScriptTestCase.tpl +funkload/data/funkload.css +funkload/demo/README.txt +funkload/demo/cmf/Cmf.conf +funkload/demo/cmf/README.txt +funkload/demo/cmf/credential.conf +funkload/demo/cmf/groups.txt +funkload/demo/cmf/passwords.txt +funkload/demo/cmf/test_Cmf.py +funkload/demo/simple/README.txt +funkload/demo/simple/Simple.conf +funkload/demo/simple/monitor.conf +funkload/demo/simple/test_Simple.py +funkload/demo/xmlrpc/Credential.conf +funkload/demo/xmlrpc/Makefile +funkload/demo/xmlrpc/README.txt +funkload/demo/xmlrpc/cred.conf +funkload/demo/xmlrpc/monitor.conf +funkload/demo/xmlrpc/test_Credential.py +funkload/demo/zope/README.txt +funkload/demo/zope/Zope.conf +funkload/demo/zope/test_Zope.py +funkload/tests/__init__.py +funkload/tests/doctest_dummy.txt +funkload/tests/test_Install.py +funkload/tests/test_dummy.py scripts/fl-build-report scripts/fl-credential-ctl scripts/fl-import-from-tm-recorder @@ -37,4 +72,4 @@ scripts/fl-monitor-ctl scripts/fl-record scripts/fl-run-bench +scripts/fl-run-test -scripts/fl-run-test \ No newline at end of file
