[python-fann2] 05/05: Really fix double-build issue in patch

[Christian Kastner]

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

ckk pushed a commit to branch master
in repository python-fann2.

commit f6c30bf32140dfb971f2f0c7bfd8b250d52201df
Author: Christian Kastner <ckk at kvr.at>
Date:   Tue Sep 29 22:13:33 2015 +0200

    Really fix double-build issue in patch
---
 debian/patches/Improve-SWIG-invocation.patch | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/patches/Improve-SWIG-invocation.patch b/debian/patches/Improve-SWIG-invocation.patch
index c14bc29..a8eb376 100644
--- a/debian/patches/Improve-SWIG-invocation.patch
+++ b/debian/patches/Improve-SWIG-invocation.patch
@@ -5,14 +5,13 @@ Subject: Improve SWIG invocation
 Only build the extension in the build target (instead of in all targets but
 sdist), and don't install unnecessary files.
 
-Forwarded: not-needed
 Last-Update: 2015-09-29
 ---
- setup.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ setup.py | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index b4afbbb..464ad8c 100755
+index b4afbbb..6741fae 100755
 --- a/setup.py
 +++ b/setup.py
 @@ -61,7 +61,7 @@ def build_swig():
@@ -24,7 +23,7 @@ index b4afbbb..464ad8c 100755
      build_swig()
  
  
-@@ -92,7 +92,7 @@ setup(
+@@ -92,10 +92,11 @@ setup(
      ],
      keywords="ANN artificial intelligence FANN2.2.0 bindings".split(' '),
      zip_safe=False,
@@ -32,4 +31,9 @@ index b4afbbb..464ad8c 100755
 +    include_package_data=False,
      packages=find_packages(),
      py_modules=['fann2.libfann'],
-     ext_modules=[Extension('fann2._libfann', ['fann2/fann2_wrap.cxx'],
+-    ext_modules=[Extension('fann2._libfann', ['fann2/fann2_wrap.cxx'],
++    ext_modules=[Extension('fann2._libfann', ['fann2/fann2.i'],
++                           swig_opts=['-c++'],
+                            include_dirs=['./include',
+                                          '../include', 'include'],
+                            libraries=['doublefann'],

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