[Pkg-octave-commit] r2449 - octave-forge-pkgs/octave-ann/trunk/debian/patches

[Rafael Laboissiere]

Author: rafael
Date: 2008-11-11 16:17:55 +0000 (Tue, 11 Nov 2008)
New Revision: 2449

Added:
   octave-forge-pkgs/octave-ann/trunk/debian/patches/use-libann-package.diff
Modified:
   octave-forge-pkgs/octave-ann/trunk/debian/patches/series
Log:
Add patch

Modified: octave-forge-pkgs/octave-ann/trunk/debian/patches/series
===================================================================
--- octave-forge-pkgs/octave-ann/trunk/debian/patches/series	2008-11-11 16:07:38 UTC (rev 2448)
+++ octave-forge-pkgs/octave-ann/trunk/debian/patches/series	2008-11-11 16:17:55 UTC (rev 2449)
@@ -0,0 +1 @@
+use-libann-package.diff

Added: octave-forge-pkgs/octave-ann/trunk/debian/patches/use-libann-package.diff
===================================================================
--- octave-forge-pkgs/octave-ann/trunk/debian/patches/use-libann-package.diff	                        (rev 0)
+++ octave-forge-pkgs/octave-ann/trunk/debian/patches/use-libann-package.diff	2008-11-11 16:17:55 UTC (rev 2449)
@@ -0,0 +1,54 @@
+Use the libann package instead of compiling the ANN sources shipped with the
+octave-ann package.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 11 Nov 2008 16:12:20 +0000
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -3,7 +3,6 @@
+ .PHONY: all check
+ 
+ all:
+-	$(MAKE) -C ann all
+ 	$(MAKE) -C ann/bindings bindings-octave
+ 	cp ann/bindings/ann.oct .
+ 
+@@ -12,5 +11,4 @@
+ 
+ clean:
+ 	-$(RM) *.o octave-core core *.oct *~
+-	$(MAKE) -C ann clean
+ 	$(MAKE) -C ann/bindings clean
+--- a/src/ann/bindings/Makefile
++++ b/src/ann/bindings/Makefile
+@@ -1,8 +1,8 @@
+ sinclude ../../Makeconf
+ 
+ bindings-octave: ann.oct
+-ann.oct: ann_wrap.cpp ../include/ANN/ANN.h ../include/ANN/ANNperf.h ../include/ANN/ANNx.h
+-	$(MKOCTFILE) -DSTATIC_LINKED -o ann.oct -I../include -L../lib -lANN ann_wrap.cpp
++ann.oct: ann_wrap.cpp
++	$(MKOCTFILE) -DSTATIC_LINKED -o ann.oct -lann ann_wrap.cpp
+ 
+ ifdef SWIG
+ ann_wrap.cpp: ann.i
+--- a/src/ann/bindings/ann.i
++++ b/src/ann/bindings/ann.i
+@@ -90,12 +90,11 @@
+ %exception {
+   try {
+     $action;
+-  } catch (ANN_exception& e) {
+-    error("ANN fatal error: %s",e.msg.c_str());
++  } catch (...) {
++    std::cout << "unexpected ANN exception caught.\n";
+   }
+ }
+ 
+-%include "../include/ANN/ANN.h"
+-%include "../include/ANN/ANNperf.h"
+-%include "../include/ANN/ANNx.h"
+-
++%include "/usr/include/ANN/ANN.h"
++%include "/usr/include/ANN/ANNperf.h"
++%include "/usr/include/ANN/ANNx.h"