[SCM] pyliblo/master: Patches applied upstream.

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

The following commit has been merged in the master branch:
commit 59e6081600c56ff8f6a5728d72014d5bcd953e47
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Apr 27 13:41:06 2015 +0200

    Patches applied upstream.

diff --git a/debian/patches/01-overflow.patch b/debian/patches/01-overflow.patch
deleted file mode 100644
index 9e92d1c..0000000
--- a/debian/patches/01-overflow.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description:  Fix python tests.
-Author: Sebastian Ramacher <sramacher at debian.org> 
-Forwarded: no
-
-diff --git a/src/liblo.pyx b/src/liblo.pyx
-index 5ead6c4..e5215f4 100644
---- a/src/liblo.pyx
-+++ b/src/liblo.pyx
-@@ -25,6 +25,7 @@ from liblo cimport *
- import inspect as _inspect
- import weakref as _weakref
- 
-+from libc.stdint cimport int32_t, int64_t
- 
- class _weakref_method:
-     """
-@@ -777,10 +778,11 @@ cdef class Message:
-             lo_message_add_true(self._message)
-         elif value is False:
-             lo_message_add_false(self._message)
--        elif isinstance(value, int):
--            lo_message_add_int32(self._message, int(value))
--        elif isinstance(value, long):
--            lo_message_add_int64(self._message, long(value))
-+        elif isinstance(value, (int, long)):
-+            try:
-+                lo_message_add_int32(self._message, <int32_t>value)
-+            except OverflowError:
-+                lo_message_add_int64(self._message, <int64_t>value)
-         elif isinstance(value, float):
-             lo_message_add_float(self._message, float(value))
-         elif isinstance(value, (bytes, unicode)):
diff --git a/debian/patches/02-define-testsuite.patch b/debian/patches/02-define-testsuite.patch
deleted file mode 100644
index 6111ce9..0000000
--- a/debian/patches/02-define-testsuite.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Add test_suite to setup call
-Author: Sebastian Ramacher <sramacher at debian.org>
-Last-Update: 2014-10-05
-Forwarded: https://github.com/dsacre/pyliblo/pull/5
-
---- a/setup.py
-+++ b/setup.py
-@@ -9,8 +9,10 @@
- 
- try:
-     from setuptools import setup, Extension
-+    args = {'test_suite': 'test'}
- except ImportError:
-     from distutils.core import setup, Extension
-+    args = {}
- 
- 
- if '--with-cython' in sys.argv:
-@@ -73,5 +75,6 @@
-         ]),
-     ],
-     cmdclass = cmdclass,
--    ext_modules = ext_modules
-+    ext_modules = ext_modules,
-+    **args
- )
---- /dev/null
-+++ b/test/__init__.py
-@@ -0,0 +1 @@
-+# empty
diff --git a/debian/patches/03-py3.patch b/debian/patches/03-py3.patch
deleted file mode 100644
index 95dc1ac..0000000
--- a/debian/patches/03-py3.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Make test_server_thread.py Python 3 compatible
-Author: Sebastian Ramacher <sramacher at debian.org>
-Last-Update: 2014-10-05
-Forwarded: https://github.com/dsacre/pyliblo/pull/4
-
---- a/test/test_server_thread.py
-+++ b/test/test_server_thread.py
-@@ -1,30 +1,31 @@
- #!/usr/bin/env python
- 
-+from __future__ import print_function
- import liblo
- import time
- 
- st = liblo.ServerThread()
--print "Created Server Thread on Port", st.get_port()
-+print("Created Server Thread on Port", st.get_port())
- 
- def foo_cb(path, args, types):
--    print "foo_cb():"
-+    print("foo_cb():")
-     for a, t in zip(args, types):
--        print "received argument %s of type %s" % (a, t)
-+        print("received argument %s of type %s" % (a, t))
- 
- def bar_cb(path, args, types, src):
--    print "bar_cb():"
--    print "message from", src.get_url()
--    print "typespec:", types
-+    print("bar_cb():")
-+    print("message from", src.get_url())
-+    print("typespec:", types)
-     for a, t in zip(args, types):
--        print "received argument %s of type %s" % (a, t)
-+        print("received argument %s of type %s" % (a, t))
- 
- class Blah:
-     def __init__(self, x):
-         self.x = x
-     def baz_cb(self, path, args, types, src, user_data):
--        print "baz_cb():"
--        print args[0]
--        print "self.x is", self.x, ", user data was", user_data
-+        print("baz_cb():")
-+        print(args[0])
-+        print("self.x is", self.x, ", user data was", user_data)
- 
- st.add_method('/foo', 'ifs', foo_cb)
- st.add_method('/bar', 'hdc', bar_cb)
-@@ -35,7 +36,7 @@
- st.start()
- 
- liblo.send(st.get_port(), "/foo", 123, 456.789, "buh!")
--liblo.send(st.get_port(), "/bar", 1234567890123456L, 666, ('c', "x"))
-+liblo.send(st.get_port(), "/bar", 1234567890123456, 666, ('c', "x"))
- 
- time.sleep(1)
- st.stop()
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a79fe6b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-01-overflow.patch
-02-define-testsuite.patch
-03-py3.patch

-- 
pyliblo packaging