[Python-modules-commits] r18646 - in packages/python-tornado/trunk/debian/patches (2 files)

[yoh at users.alioth.debian.org]

    Date: Thursday, September 22, 2011 @ 00:43:49
  Author: yoh
Revision: 18646

updated patches [ignore-ca-certificates.patch did not apply]

Modified:
  packages/python-tornado/trunk/debian/patches/certs-path.patch
  packages/python-tornado/trunk/debian/patches/ignore-ca-certificates.patch

Modified: packages/python-tornado/trunk/debian/patches/certs-path.patch
===================================================================
--- packages/python-tornado/trunk/debian/patches/certs-path.patch	2011-09-22 00:21:55 UTC (rev 18645)
+++ packages/python-tornado/trunk/debian/patches/certs-path.patch	2011-09-22 00:43:49 UTC (rev 18646)
@@ -1,11 +1,9 @@
 Description: Looks for ca-certificates.crt at the good Debian location before trying local path
 Author: Carl Chenet <chaica at ohmytux.com>
 
-Index: facebook-tornado-778ed51/tornado/simple_httpclient.py
-===================================================================
---- facebook-tornado-778ed51.orig/tornado/simple_httpclient.py	2011-03-01 02:03:24.000000000 +0100
-+++ facebook-tornado-778ed51/tornado/simple_httpclient.py	2011-03-01 02:05:34.000000000 +0100
-@@ -27,7 +27,10 @@
+--- a/tornado/simple_httpclient.py
++++ b/tornado/simple_httpclient.py
+@@ -31,7 +31,10 @@ try:
  except ImportError:
      ssl = None
  
@@ -15,5 +13,5 @@
 +else:
 +    _DEFAULT_CA_CERTS = os.path.dirname(__file__) + '/ca-certificates.crt'
  
- class SimpleAsyncHTTPClient(object):
+ class SimpleAsyncHTTPClient(AsyncHTTPClient):
      """Non-blocking HTTP client with no external dependencies.

Modified: packages/python-tornado/trunk/debian/patches/ignore-ca-certificates.patch
===================================================================
--- packages/python-tornado/trunk/debian/patches/ignore-ca-certificates.patch	2011-09-22 00:21:55 UTC (rev 18645)
+++ packages/python-tornado/trunk/debian/patches/ignore-ca-certificates.patch	2011-09-22 00:43:49 UTC (rev 18646)
@@ -1,16 +1,14 @@
 Description: Remove the ca-certificate file from being added to the package
 Author: Carl Chenet <chaica at ohmytux.com>
 
-Index: facebook-tornado-778ed51/setup.py
-===================================================================
---- facebook-tornado-778ed51.orig/setup.py	2011-02-25 02:42:28.000000000 +0100
-+++ facebook-tornado-778ed51/setup.py	2011-02-25 02:42:50.000000000 +0100
-@@ -44,7 +44,7 @@
+--- a/setup.py
++++ b/setup.py
+@@ -44,7 +44,7 @@ distutils.core.setup(
      version=version,
-     packages = ["tornado", "tornado.test"],
+     packages = ["tornado", "tornado.test", "tornado.platform"],
      package_data = {
 -        "tornado": ["ca-certificates.crt"],
-+#        "tornado": ["ca-certificates.crt"],
-         "tornado.test": ["README", "test.crt", "test.key"],
++        # "tornado": ["ca-certificates.crt"],
+         "tornado.test": ["README", "test.crt", "test.key", "static/robots.txt"],
          },
      ext_modules = extensions,