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

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

    Date: Monday, October 20, 2014 @ 18:43:16
  Author: jtaylor-guest
Revision: 31177

refresh patches, remove upstream applied monitor-test.patch

Modified:
  packages/pyzmq/trunk/debian/changelog
  packages/pyzmq/trunk/debian/patches/cffi-fix.patch
  packages/pyzmq/trunk/debian/patches/noncopysend-test.patch
  packages/pyzmq/trunk/debian/patches/series
Deleted:
  packages/pyzmq/trunk/debian/patches/monitor-test.patch

Modified: packages/pyzmq/trunk/debian/changelog
===================================================================
--- packages/pyzmq/trunk/debian/changelog	2014-10-20 18:43:10 UTC (rev 31176)
+++ packages/pyzmq/trunk/debian/changelog	2014-10-20 18:43:16 UTC (rev 31177)
@@ -1,6 +1,7 @@
 pyzmq (14.4.0-1) unstable; urgency=medium
 
   * New upstream release
+  * refresh patches, remove upstream applied monitor-test.patch
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Mon, 20 Oct 2014 20:15:43 +0200
 

Modified: packages/pyzmq/trunk/debian/patches/cffi-fix.patch
===================================================================
--- packages/pyzmq/trunk/debian/patches/cffi-fix.patch	2014-10-20 18:43:10 UTC (rev 31176)
+++ packages/pyzmq/trunk/debian/patches/cffi-fix.patch	2014-10-20 18:43:16 UTC (rev 31177)
@@ -9,8 +9,10 @@
  list.
 Bug: https://bitbucket.org/cffi/cffi/issue/109/enable-sane-packaging-for-cffi
 
---- a/zmq/backend/cffi/__init__.py
-+++ b/zmq/backend/cffi/__init__.py
+Index: pyzmq/zmq/backend/cffi/__init__.py
+===================================================================
+--- pyzmq.orig/zmq/backend/cffi/__init__.py
++++ pyzmq/zmq/backend/cffi/__init__.py
 @@ -3,6 +3,40 @@
  # Copyright (C) PyZMQ Developers
  # Distributed under the terms of the Modified BSD License.
@@ -52,11 +54,13 @@
  from zmq.backend.cffi import (constants, error, message, context, socket,
                             _poll, devices, utils)
  
---- a/zmq/backend/cffi/_cffi.py
-+++ b/zmq/backend/cffi/_cffi.py
-@@ -106,10 +106,10 @@ int get_ipc_path_max_len(void);
- 
+Index: pyzmq/zmq/backend/cffi/_cffi.py
+===================================================================
+--- pyzmq.orig/zmq/backend/cffi/_cffi.py
++++ pyzmq/zmq/backend/cffi/_cffi.py
+@@ -18,10 +18,10 @@ base_zmq_version = (3,2,2)
  def load_compiler_config():
+     """load pyzmq compiler arguments"""
      import zmq
 -    zmq_dir = dirname(zmq.__file__)
 +    zmq_dir = "zmq"

Deleted: packages/pyzmq/trunk/debian/patches/monitor-test.patch
===================================================================
--- packages/pyzmq/trunk/debian/patches/monitor-test.patch	2014-10-20 18:43:10 UTC (rev 31176)
+++ packages/pyzmq/trunk/debian/patches/monitor-test.patch	2014-10-20 18:43:16 UTC (rev 31177)
@@ -1,36 +0,0 @@
-Description: handle freebsd connecting without delay
-Bug: https://github.com/zeromq/pyzmq/pull/558
---- a/zmq/tests/test_monitor.py
-+++ b/zmq/tests/test_monitor.py
-@@ -35,11 +35,13 @@ class TestSocketMonitor(BaseZMQTestCase)
-         # test receive event for connect event
-         s_rep.connect("tcp://127.0.0.1:6666")
-         m = recv_monitor_message(s_event)
--        self.assertEqual(m['event'], zmq.EVENT_CONNECT_DELAYED)
--        self.assertEqual(m['endpoint'], b"tcp://127.0.0.1:6666")
--        # test receive event for connected event
--        m = recv_monitor_message(s_event)
-+        if m['event'] == zmq.EVENT_CONNECT_DELAYED:
-+            self.assertEqual(m['endpoint'], b"tcp://127.0.0.1:6666")
-+            # test receive event for connected event
-+            m = recv_monitor_message(s_event)
-         self.assertEqual(m['event'], zmq.EVENT_CONNECTED)
-+        self.assertEqual(m['endpoint'], b"tcp://127.0.0.1:6666")
-+
- 
-     @skip_lt_4
-     def test_monitor_connected(self):
-@@ -56,8 +58,9 @@ class TestSocketMonitor(BaseZMQTestCase)
-         # test receive event for connect event
-         s_rep.connect("tcp://127.0.0.1:6667")
-         m = recv_monitor_message(s_event)
--        self.assertEqual(m['event'], zmq.EVENT_CONNECT_DELAYED)
--        self.assertEqual(m['endpoint'], b"tcp://127.0.0.1:6667")
--        # test receive event for connected event
--        m = recv_monitor_message(s_event)
-+        if m['event'] == zmq.EVENT_CONNECT_DELAYED:
-+            self.assertEqual(m['endpoint'], b"tcp://127.0.0.1:6667")
-+            # test receive event for connected event
-+            m = recv_monitor_message(s_event)
-         self.assertEqual(m['event'], zmq.EVENT_CONNECTED)
-+        self.assertEqual(m['endpoint'], b"tcp://127.0.0.1:6667")

Modified: packages/pyzmq/trunk/debian/patches/noncopysend-test.patch
===================================================================
--- packages/pyzmq/trunk/debian/patches/noncopysend-test.patch	2014-10-20 18:43:10 UTC (rev 31176)
+++ packages/pyzmq/trunk/debian/patches/noncopysend-test.patch	2014-10-20 18:43:16 UTC (rev 31177)
@@ -3,8 +3,10 @@
 Author: Julian Taylor <jtaylor.debian at googlemail.com>
 Forwarded: not-needed
 
---- a/zmq/tests/test_message.py
-+++ b/zmq/tests/test_message.py
+Index: pyzmq/zmq/tests/test_message.py
+===================================================================
+--- pyzmq.orig/zmq/tests/test_message.py
++++ pyzmq/zmq/tests/test_message.py
 @@ -324,10 +324,8 @@ class TestFrame(BaseZMQTestCase):
          for i in range(1,len(shapes)+1):
              shape = shapes[:i]

Modified: packages/pyzmq/trunk/debian/patches/series
===================================================================
--- packages/pyzmq/trunk/debian/patches/series	2014-10-20 18:43:10 UTC (rev 31176)
+++ packages/pyzmq/trunk/debian/patches/series	2014-10-20 18:43:16 UTC (rev 31177)
@@ -1,3 +1,2 @@
 noncopysend-test.patch
 cffi-fix.patch
-monitor-test.patch