[Python-modules-commits] [pymssql] 05/06: merge patched into master

[Geoffrey Thomas]

This is an automated email from the git hooks/post-receive script.

geofft-guest pushed a commit to branch 2.1.1
in repository pymssql.

commit 20f0d4b4a9199107749ed3030cd0126542fd0661
Merge: 0574fbd fa96491
Author: Geoffrey Thomas <geofft at hudson-trading.com>
Date:   Wed Nov 18 12:08:21 2015 -0500

    merge patched into master

 _mssql.pyx                                         |  2 +-
 debian/.git-dpm                                    |  4 ++--
 ...signature-declaration-definition-mismatch.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index a8eeb29,0000000..1f11e79
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 8e0065e4d92a88a538ed07f488cb3b37448aefb9
- 8e0065e4d92a88a538ed07f488cb3b37448aefb9
++fa964916fe731b5668d1448918d4569527feb0e6
++fa964916fe731b5668d1448918d4569527feb0e6
 +8e0065e4d92a88a538ed07f488cb3b37448aefb9
 +8e0065e4d92a88a538ed07f488cb3b37448aefb9
 +pymssql_2.1.1+dfsg.orig.tar.gz
 +01ff19af3925a54e7901f98eba1bcb3262532fba
 +120045
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-method-signature-declaration-definition-mismatch.patch
index 0000000,0000000..75e15d5
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-method-signature-declaration-definition-mismatch.patch
@@@ -1,0 -1,0 +1,25 @@@
++From fa964916fe731b5668d1448918d4569527feb0e6 Mon Sep 17 00:00:00 2001
++From: Ramiro Morales <ramiro at rmorales.net>
++Date: Sun, 5 Apr 2015 15:55:24 -0300
++Subject: Fix method signature declaration/definition mismatch error.
++
++Cython 0.22 is more strict about this. See
++https://github.com/cython/cython/blob/master/CHANGES.rst#022-2015-02-11
++and http://docs.cython.org/src/userguide/language_basics.html#error-return-values
++---
++ _mssql.pyx | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/_mssql.pyx b/_mssql.pyx
++index 58fccbd..bce2cdd 100644
++--- a/_mssql.pyx
+++++ b/_mssql.pyx
++@@ -819,7 +819,7 @@ cdef class MSSQLConnection:
++             return (<char *>data)[:length]
++ 
++     cdef int convert_python_value(self, object value, BYTE **dbValue,
++-            int *dbtype, int *length) except 1:
+++            int *dbtype, int *length) except -1:
++         log("_mssql.MSSQLConnection.convert_python_value()")
++         cdef int *intValue
++         cdef double *dblValue
diff --cc debian/patches/series
index 0000000,0000000..a9e07a2
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-method-signature-declaration-definition-mismatch.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pymssql.git