[Python-modules-commits] r24324 - in packages/pyzmq/trunk/debian (5 files)

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

    Date: Sunday, May 12, 2013 @ 21:52:40
  Author: jtaylor-guest
Revision: 24324

New upstream release built with zeromq3

drop all patches

Modified:
  packages/pyzmq/trunk/debian/changelog
  packages/pyzmq/trunk/debian/control
Deleted:
  packages/pyzmq/trunk/debian/patches/cython0.19-compat.patch
  packages/pyzmq/trunk/debian/patches/fix-py3-green.patch
  packages/pyzmq/trunk/debian/patches/series

Modified: packages/pyzmq/trunk/debian/changelog
===================================================================
--- packages/pyzmq/trunk/debian/changelog	2013-05-12 19:10:17 UTC (rev 24323)
+++ packages/pyzmq/trunk/debian/changelog	2013-05-12 21:52:40 UTC (rev 24324)
@@ -1,3 +1,10 @@
+pyzmq (13.1.0-1) unstable; urgency=low
+
+  * New upstream release built with zeromq3 (Closes: #698830)
+    - drop all patches
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Sun, 12 May 2013 13:59:20 +0200
+
 pyzmq (2.2.0.1-2) unstable; urgency=low
 
   [ Julian Taylor ]

Modified: packages/pyzmq/trunk/debian/control
===================================================================
--- packages/pyzmq/trunk/debian/control	2013-05-12 19:10:17 UTC (rev 24323)
+++ packages/pyzmq/trunk/debian/control	2013-05-12 21:52:40 UTC (rev 24324)
@@ -4,10 +4,11 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Miguel Landaeta <miguel at miguel.cc>,
            Julian Taylor <jtaylor.debian at googlemail.com>
-Build-Depends: cython-dbg (>= 0.13),
+Build-Depends: cython (>= 0.13),
+               cython-dbg (>= 0.13),
                debhelper (>= 7.0.50~),
                dpkg-dev (>= 1.16.1~),
-               libzmq-dev (>= 2.2.0),
+               libzmq3-dev,
                python-all-dbg (>= 2.6.6-3~),
                python-all-dev (>= 2.6.6-3~),
                python-nose,

Deleted: packages/pyzmq/trunk/debian/patches/cython0.19-compat.patch
===================================================================
--- packages/pyzmq/trunk/debian/patches/cython0.19-compat.patch	2013-05-12 19:10:17 UTC (rev 24323)
+++ packages/pyzmq/trunk/debian/patches/cython0.19-compat.patch	2013-05-12 21:52:40 UTC (rev 24324)
@@ -1,39 +0,0 @@
-Description: Cython 0.19 disables assignment of `char *` to `str`
-Origin 22cede5dbda55dcab6a99137147e30f3be530cf1
-Applied-Upstream: v13.0.1
-Author: MinRK <benjaminrk at gmail.com>
-
---- a/zmq/utils/buffers.pxd
-+++ b/zmq/utils/buffers.pxd
-@@ -140,10 +140,11 @@ cdef inline object asbuffer(object ob, i
- 
-     cdef void *bptr = NULL
-     cdef Py_ssize_t blen = 0, bitemlen = 0
--    cdef str bfmt = None
-     cdef Py_buffer view
-     cdef int flags = PyBUF_SIMPLE
-     cdef int mode = 0
-+    
-+    bfmt = None
- 
-     mode = check_buffer(ob)
-     if mode == 0:
-@@ -179,7 +180,7 @@ cdef inline object asbuffer(object ob, i
-                     bitemlen = ob.itemsize
-                 except AttributeError:
-                     if isinstance(ob, bytes):
--                        bfmt = "B"
-+                        bfmt = b"B"
-                         bitemlen = 1
-                     else:
-                         # nothing found
-@@ -188,6 +189,9 @@ cdef inline object asbuffer(object ob, i
-     if base: base[0] = <void *>bptr
-     if size: size[0] = <Py_ssize_t>blen
-     if itemsize: itemsize[0] = <Py_ssize_t>bitemlen
-+    
-+    if PY_MAJOR_VERSION >= 3 and bfmt is not None:
-+        return bfmt.decode('ascii')
-     return bfmt
- 
- 

Deleted: packages/pyzmq/trunk/debian/patches/fix-py3-green.patch
===================================================================
--- packages/pyzmq/trunk/debian/patches/fix-py3-green.patch	2013-05-12 19:10:17 UTC (rev 24323)
+++ packages/pyzmq/trunk/debian/patches/fix-py3-green.patch	2013-05-12 21:52:40 UTC (rev 24324)
@@ -1,22 +0,0 @@
-Description: make green py3 compatible
-Applied-Upstream: 13.0.0
---- a/zmq/green/core.py
-+++ b/zmq/green/core.py
-@@ -114,7 +114,7 @@ class _Socket(_original_Socket):
-         try:
-             timeout.start()
-             self.__writable.get(block=True)
--        except gevent.Timeout, t:
-+        except gevent.Timeout as t:
-             if t is not timeout:
-                 raise
-             toc = time.time()
-@@ -138,7 +138,7 @@ class _Socket(_original_Socket):
-         try:
-             timeout.start()
-             self.__readable.get(block=True)
--        except gevent.Timeout, t:
-+        except gevent.Timeout as t:
-             if t is not timeout:
-                 raise
-             toc = time.time()

Deleted: packages/pyzmq/trunk/debian/patches/series
===================================================================
--- packages/pyzmq/trunk/debian/patches/series	2013-05-12 19:10:17 UTC (rev 24323)
+++ packages/pyzmq/trunk/debian/patches/series	2013-05-12 21:52:40 UTC (rev 24324)
@@ -1,2 +0,0 @@
-fix-py3-green.patch
-cython0.19-compat.patch