r2740 - in zodb/trunk/debian/patches (lp_135108.patch no-manuel.patch)
menesis-guest at users.alioth.debian.org
menesis-guest at users.alioth.debian.org
Wed Jul 3 23:40:55 UTC 2013
Date: Wednesday, July 3, 2013 @ 23:40:54
Author: menesis-guest
Revision: 2740
Forgot to add/remove patches
Added:
zodb/trunk/debian/patches/no-manuel.patch
Deleted:
zodb/trunk/debian/patches/lp_135108.patch
Deleted: zodb/trunk/debian/patches/lp_135108.patch
===================================================================
--- zodb/trunk/debian/patches/lp_135108.patch 2013-07-03 23:26:13 UTC (rev 2739)
+++ zodb/trunk/debian/patches/lp_135108.patch 2013-07-03 23:40:54 UTC (rev 2740)
@@ -1,14 +0,0 @@
-Fix released in 3.10.0
-Index: zodb/src/ZEO/StorageServer.py
-===================================================================
---- zodb.orig/src/ZEO/StorageServer.py
-+++ zodb/src/ZEO/StorageServer.py
-@@ -133,6 +133,8 @@ class ZEOStorage:
- addr = conn.addr
- if isinstance(addr, type("")):
- label = addr
-+ elif addr is None:
-+ label = ''
- else:
- host, port = addr
- label = str(host) + ":" + str(port)
Added: zodb/trunk/debian/patches/no-manuel.patch
===================================================================
--- zodb/trunk/debian/patches/no-manuel.patch (rev 0)
+++ zodb/trunk/debian/patches/no-manuel.patch 2013-07-03 23:40:54 UTC (rev 2740)
@@ -0,0 +1,16 @@
+Description: manuel is not packaged for Debian.
+Index: zodb/setup.py
+===================================================================
+--- zodb.orig/setup.py
++++ zodb/setup.py
+@@ -190,8 +190,8 @@ setup(name="ZODB3",
+ classifiers = filter(None, classifiers.split("\n")),
+ long_description = long_description,
+ test_suite="__main__.alltests", # to support "setup.py test"
+- tests_require = ['zope.testing', 'manuel'],
+- extras_require = dict(test=['zope.testing', 'manuel']),
++ tests_require = ['zope.testing'],
++ extras_require = dict(test=['zope.testing']),
+ install_requires = [
+ 'transaction >=1.1.0',
+ 'zc.lockfile',
More information about the pkg-zope-developers
mailing list