tag 659232 patch pending
thanks

Jakub Wilk <jw...@debian.org> (09/02/2012):
> The only reason funkload needs setuptools (aka distribute) is
> because it's listed in requires.txt. Removing it from setup.py's
> install_requires will fix this problem.

Thanks, patched away from setup.py and requires.txt.

> Note that "docutils" is also listed there, even though
> python-docutils is only in Recommends. Either it should be removed
> from install_requires or moved from Recommends to Depends.

Depends it is, since I don't want to possibly break something.

Maintainer, please find attached the patch for my NMU.

Thanks to IRILL for sponsoring this BSP in Paris.

Mraw,
KiBi.
diff -Nru funkload-1.13.0/debian/changelog funkload-1.13.0/debian/changelog
--- funkload-1.13.0/debian/changelog	2010-08-08 17:24:57.000000000 +0000
+++ funkload-1.13.0/debian/changelog	2012-02-19 04:11:47.000000000 +0000
@@ -1,3 +1,16 @@
+funkload (1.13.0-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Add patch to drop setuptools from runtime dependencies:
+    - avoid-runtime-issues-with-setuptools (Closes: #659232).
+  * Move python-docutils from Recommends to Depends to be on the safe
+    side (See: #659232).
+  * Many thanks to Jakub Wilk for the hints.
+  * Set urgency to “high” for the RC bug fix.
+  * Thanks to IRILL for sponsoring this BSP in Paris.
+
+ -- Cyril Brulebois <k...@debian.org>  Sun, 19 Feb 2012 04:11:45 +0000
+
 funkload (1.13.0-1) unstable; urgency=low
 
   * new upstream release
diff -Nru funkload-1.13.0/debian/control funkload-1.13.0/debian/control
--- funkload-1.13.0/debian/control	2010-08-09 14:34:02.000000000 +0000
+++ funkload-1.13.0/debian/control	2012-02-19 03:43:48.000000000 +0000
@@ -7,8 +7,8 @@
 
 Package: funkload
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources, python-webunit (>= 1:1.3.10)
-Recommends: tcpwatch-httpproxy, gnuplot (>= 4.2), python-docutils
+Depends: ${misc:Depends}, ${python:Depends}, python-pkg-resources, python-webunit (>= 1:1.3.10), python-docutils
+Recommends: tcpwatch-httpproxy, gnuplot (>= 4.2)
 Description: web testing tool
  This web testing tool is designed to allow testing the functionality
  and performance of web applications in the same spirit as Perl's
diff -Nru funkload-1.13.0/debian/patches/avoid-runtime-issues-with-setuptools funkload-1.13.0/debian/patches/avoid-runtime-issues-with-setuptools
--- funkload-1.13.0/debian/patches/avoid-runtime-issues-with-setuptools	1970-01-01 00:00:00.000000000 +0000
+++ funkload-1.13.0/debian/patches/avoid-runtime-issues-with-setuptools	2012-02-19 04:11:28.000000000 +0000
@@ -0,0 +1,25 @@
+Description: Avoid runtime issues with missing setuptools
+ As explained by Jakub Wilk in the Debian bug report, setuptools are
+ only needed during the package build, so strip it from the runtime
+ dependencies.
+Author: Cyril Brulebois <k...@debian.org>
+Bug-Debian: http://bugs.debian.org/659232
+--- a/src/funkload.egg-info/requires.txt
++++ b/src/funkload.egg-info/requires.txt
+@@ -1,3 +1,2 @@
+ webunit  >= 1.3.8
+ docutils >= 0.3.7
+-setuptools
+\ No newline at end of file
+--- a/setup.py
++++ b/setup.py
+@@ -150,8 +150,7 @@
+     ],
+     # setuptools specific keywords
+     install_requires = ['webunit  >= 1.3.8',
+-                        'docutils >= 0.3.7',
+-                        'setuptools'],
++                        'docutils >= 0.3.7'],
+     zip_safe=True,
+     package_data={'funkload': ['data/*',
+                                'demo/simple/*', 'demo/zope/*',
diff -Nru funkload-1.13.0/debian/patches/series funkload-1.13.0/debian/patches/series
--- funkload-1.13.0/debian/patches/series	2010-08-09 07:53:02.000000000 +0000
+++ funkload-1.13.0/debian/patches/series	2012-02-19 03:51:25.000000000 +0000
@@ -1 +1,2 @@
 debian-changes-1.13.0-1
+avoid-runtime-issues-with-setuptools

Attachment: signature.asc
Description: Digital signature

Reply via email to