[libfann] 11/34: d/patches: Drop patches for removed Python bindings

[Christian Kastner]

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

chrisk-guest pushed a commit to branch master
in repository libfann.

commit 0f09a20790e393c014f6c1fe690c6c7710f84502
Author: Christian Kastner <ckk at kvr.at>
Date:   Thu Oct 1 11:27:05 2015 +0200

    d/patches: Drop patches for removed Python bindings
---
 .../0005-Correct-a-typo-in-a-size-comparison.patch | 25 ------------
 .../0007-Do-not-call-swig-unconditionally.patch    | 44 ----------------------
 debian/patches/series                              |  2 -
 3 files changed, 71 deletions(-)

diff --git a/debian/patches/0005-Correct-a-typo-in-a-size-comparison.patch b/debian/patches/0005-Correct-a-typo-in-a-size-comparison.patch
deleted file mode 100644
index 885db95..0000000
--- a/debian/patches/0005-Correct-a-typo-in-a-size-comparison.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Sun, 6 Feb 2011 17:09:05 +0100
-Subject: [PATCH] Correct a typo in a size comparison
-
-Origin: http://leenissen.dk/fann/forum/viewtopic.php?f=1&t=626
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/712290
-Last-Update: 2011-02-06
----
- python/pyfann/pyfann.i |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/python/pyfann/pyfann.i b/python/pyfann/pyfann.i
-index 47b17ba..ec55535 100644
---- a/python/pyfann/pyfann.i
-+++ b/python/pyfann/pyfann.i
-@@ -108,7 +108,7 @@
-     for (j = 0; j< num; j++)
-     {
-         PyObject* o1=PySequence_GetItem($input,j);
--        if ((unsigned int)PySequence_Length(o1) == dim) {
-+        if ((unsigned int)PySequence_Length(o1) != dim) {
-             PyErr_SetString(PyExc_ValueError,"Size mismatch. All items must be of the same size");
-             SWIG_fail;
-         }
--- 
diff --git a/debian/patches/0007-Do-not-call-swig-unconditionally.patch b/debian/patches/0007-Do-not-call-swig-unconditionally.patch
deleted file mode 100644
index 52c016d..0000000
--- a/debian/patches/0007-Do-not-call-swig-unconditionally.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Mon, 3 Mar 2014 01:29:39 +0100
-Subject: Do not call swig unconditionally
-
-every time setup.py is used, especially when using setup.py install.
-The bug upstream refers to is not reproducible here.
----
- python/setup.py | 13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
-Index: libfann-2.1.0~beta~dfsg/python/setup.py
-===================================================================
---- libfann-2.1.0~beta~dfsg.orig/python/setup.py	2014-03-03 02:04:00.000000000 +0100
-+++ libfann-2.1.0~beta~dfsg/python/setup.py	2014-03-03 17:29:44.288988000 +0100
-@@ -19,11 +19,6 @@
- documented, and fast. 
- """
- 
--#These lines are needed to circumvent a bug in distutils
--swig_cmd = 'swig -c++ -python pyfann/pyfann.i'
--print 'Running SWIG before:', swig_cmd
--os.system(swig_cmd)
--
- #This utility function searches for files
- def hunt_files(root, which):
-     return glob.glob(os.path.join(root, which))
-@@ -40,11 +35,12 @@
-     url='http://sourceforge.net/projects/fann/',
-     license='GNU LESSER GENERAL PUBLIC LICENSE (LGPL)',
-     py_modules=['pyfann.libfann'],
--    ext_modules=[Extension('pyfann._libfann',['pyfann/pyfann_wrap.cxx'], 
--                            include_dirs=['../src/include'], 
--                            extra_objects=['../src/.libs/doublefann.o'],
--                            define_macros=[("SWIG_COMPILE",None)]
--                            ),
-+    ext_modules=[Extension('pyfann._libfann',['pyfann/pyfann.i'],
-+                            swig_opts=['-c++', '-I../src/include'],
-+                            include_dirs=['../src/include'],
-+                            library_dirs=['../src/.libs/'],
-+                            libraries=['doublefann']
-+                            )
-                 ]
- )
- 
diff --git a/debian/patches/series b/debian/patches/series
index f7562b9..ead6463 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 0002-Link-against-libm.patch
 0004-Portable-handling-for-va_list.patch
-0005-Correct-a-typo-in-a-size-comparison.patch
-0007-Do-not-call-swig-unconditionally.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libfann.git