[Python-modules-commits] r28461 - in packages/pyzmq/trunk/debian (4 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Friday, April 4, 2014 @ 16:41:51
  Author: jtaylor-guest
Revision: 28461

New upstream release

drop upstream applied cython-error.patch

Modified:
  packages/pyzmq/trunk/debian/changelog
  packages/pyzmq/trunk/debian/patches/cffi-fix.patch
  packages/pyzmq/trunk/debian/patches/series
Deleted:
  packages/pyzmq/trunk/debian/patches/cython-error.patch

Modified: packages/pyzmq/trunk/debian/changelog
===================================================================
--- packages/pyzmq/trunk/debian/changelog	2014-04-04 16:41:44 UTC (rev 28460)
+++ packages/pyzmq/trunk/debian/changelog	2014-04-04 16:41:51 UTC (rev 28461)
@@ -1,10 +1,12 @@
-pyzmq (14.0.1-2) unstable; urgency=low
+pyzmq (14.1.1-1) unstable; urgency=medium
 
+  * New upstream release
+    - drop upstream applied cython-error.patch
   * fix minitornado copyright information
     thanks to Thorsten Alteholz for the report
   * bump pypy build dependency to 2.2, required for cffi patch to work.
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 11 Jan 2014 17:31:04 +0100
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Fri, 04 Apr 2014 16:33:57 +0200
 
 pyzmq (14.0.1-1) unstable; urgency=low
 

Modified: packages/pyzmq/trunk/debian/patches/cffi-fix.patch
===================================================================
--- packages/pyzmq/trunk/debian/patches/cffi-fix.patch	2014-04-04 16:41:44 UTC (rev 28460)
+++ packages/pyzmq/trunk/debian/patches/cffi-fix.patch	2014-04-04 16:41:51 UTC (rev 28461)
@@ -54,12 +54,16 @@
  
 --- a/zmq/backend/cffi/_cffi.py
 +++ b/zmq/backend/cffi/_cffi.py
-@@ -196,7 +196,7 @@ else:
+@@ -119,10 +119,10 @@ int get_ipc_path_max_len(void);
  
- 
- ffi.cdef(functions)
--zmq_utils = os.path.dirname(zmq.utils.__file__)
-+zmq_utils = "zmq/utils"
- 
- C = ffi.verify('''
-     #include <stdio.h>
+ def load_compiler_config():
+     import zmq
+-    zmq_dir = dirname(zmq.__file__)
++    zmq_dir = "zmq"
+     zmq_parent = dirname(zmq_dir)
+     
+-    fname = join(zmq_dir, 'utils', 'compiler.json')
++    fname = join(dirname(zmq.__file__), 'utils', 'compiler.json')
+     if os.path.exists(fname):
+         with open(fname) as f:
+             cfg = json.load(f)

Deleted: packages/pyzmq/trunk/debian/patches/cython-error.patch
===================================================================
--- packages/pyzmq/trunk/debian/patches/cython-error.patch	2014-04-04 16:41:44 UTC (rev 28460)
+++ packages/pyzmq/trunk/debian/patches/cython-error.patch	2014-04-04 16:41:51 UTC (rev 28461)
@@ -1,44 +0,0 @@
-Description: fix possible use of deallocated object
- __dealloc__ method might be called when the object is partially deleted, so
- e.g. its methods must not be called. Fix this by copying the code of the
- methods which require no object internals.
-Author: Julian Taylor <jtaylor.debian at googlemail.com>
-Bug: https://github.com/zeromq/pyzmq/issues/458
-
---- a/zmq/backend/cython/context.pyx
-+++ b/zmq/backend/cython/context.pyx
-@@ -94,7 +94,14 @@ cdef class Context:
-             free(self._sockets)
-             self._sockets = NULL
-             self._n_sockets = 0
--        self.term()
-+
-+        if self.handle != NULL and not self.closed and getpid() == self._pid:
-+            with nogil:
-+                rc = zmq_ctx_destroy(self.handle)
-+            _check_rc(rc)
-+            self.handle = NULL
-+            self.closed = True
-+
-     
-     cdef inline void _add_socket(self, void* handle):
-         """Add a socket handle to be closed when Context terminates.
-diff --git a/zmq/backend/cython/utils.pyx b/zmq/backend/cython/utils.pyx
-index 0b318ee..43ed3d4 100644
---- a/zmq/backend/cython/utils.pyx
-+++ b/zmq/backend/cython/utils.pyx
-@@ -64,10 +64,9 @@ cdef class Stopwatch:
-         self.watch = NULL
- 
-     def __dealloc__(self):
--        try:
--            self.stop()
--        except ZMQError:
--            pass
-+        if self.watch:
-+            zmq_stopwatch_stop(self.watch)
-+            self.watch = NULL
- 
-     def start(self):
-         """s.start()
-

Modified: packages/pyzmq/trunk/debian/patches/series
===================================================================
--- packages/pyzmq/trunk/debian/patches/series	2014-04-04 16:41:44 UTC (rev 28460)
+++ packages/pyzmq/trunk/debian/patches/series	2014-04-04 16:41:51 UTC (rev 28461)
@@ -1,3 +1,2 @@
 noncopysend-test.patch
 cffi-fix.patch
-cython-error.patch
\ No newline at end of file