[SCM] linbox: library for exact linear algebra branch, master, updated. upstream/1.3.2-33-g6f60222

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 6f60222c5956cef2acbfc1504696349d4632fe75
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sun Jul 15 18:24:43 2012 +0800

    Ship examples within liblinbox-dev.

diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index 09d62be..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-New documentation packages.
-examples
diff --git a/debian/control b/debian/control
index 72aa26e..75c8f99 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Lifeng Sun <lifongsun at gmail.com>
 DM-Upload-Allowed: yes
 Homepage: http://www.linalg.org/
-Build-Depends: dh-autoreconf, debhelper (>= 8.0.0), libgivaro-dev (>= 3.7.0), libgivaro-dev (<< 3.8.0), libntl-dev, libgmp-dev, libatlas-dev, libgsl0-dev, liblapack-dev, fflas-ffpack
+Build-Depends: dh-autoreconf, debhelper (>= 8.0.0), libgivaro-dev (>= 3.7.0), libgivaro-dev (<< 3.8.0), libiml-dev, libntl-dev, libgmp-dev, libatlas-dev, libgsl0-dev, liblapack-dev, fflas-ffpack
 Build-Depends-Indep: doxygen-latex, ghostscript
 Standards-Version: 3.9.3
 
diff --git a/debian/liblinbox-dev.examples b/debian/liblinbox-dev.examples
index e69de29..0dd83cb 100644
--- a/debian/liblinbox-dev.examples
+++ b/debian/liblinbox-dev.examples
@@ -0,0 +1,4 @@
+examples/*.C
+examples/*.h
+examples/Readme-make
+examples/fields/*.C
diff --git a/debian/patches/example.patch b/debian/patches/example.patch
new file mode 100644
index 0000000..0985fd2
--- /dev/null
+++ b/debian/patches/example.patch
@@ -0,0 +1,40 @@
+--- a/examples/fields/modular-int.C
++++ b/examples/fields/modular-int.C
+@@ -30,8 +30,8 @@
+ 
+ #include <iostream>
+ 
+-/* the header file for modular<int>*/
+-#include "linbox/field/modular-int.h"
++/* the header file for modular*/
++#include "linbox/field/modular.h"
+ 
+ int main (int argc, char **argv)
+ {
+--- a/examples/Readme-make.in
++++ b/examples/Readme-make.in
+@@ -56,7 +56,7 @@
+ #LINBOX_BIN=@bindir@
+ 
+ %:%.C 
+-	#$(CXX) $(CPPFLAGS) $*.C -o $*  $(shell $(LINBOX_BIN)/linbox-config --cflags --libs)
++	$(CXX) $(CPPFLAGS) $*.C -o $*  $(shell $(LINBOX_BIN)/linbox-config --cflags --libs)
+ 
+ CXXFLAGS+= $(shell $(LINBOX_BIN)/linbox-config --cflags)
+ LOADLIBES+= $(shell $(LINBOX_BIN)/linbox-config --libs)
+--- a/linbox-config.in
++++ b/linbox-config.in
+@@ -74,11 +74,11 @@
+ 	;;
+ 
+     --cflags)
+-       	echo -n " -I${includedir} @GMP_CFLAGS@ @NTL_CFLAGS@ @GIVARO_CFLAGS@ @SACLIB_CFLAGS@ @LIDIA_CFLAGS@"
++       	echo -n " -I${includedir} @IML_CFLAGS@ @GMP_CFLAGS@ @NTL_CFLAGS@ @GIVARO_CFLAGS@ @SACLIB_CFLAGS@ @LIDIA_CFLAGS@"
+ 	;;
+ 
+     --libs)
+-	echo -n " -L${libdir} -llinbox @LIDIA_LIBS@  @NTL_LIBS@ @GIVARO_LIBS@ @SACLIB_LIBS@ @GMP_LIBS@ @BLAS_LIBS@"
++	echo -n " -L${libdir} -llinbox @IML_LIBS@ @LIDIA_LIBS@ @NTL_LIBS@ @GIVARO_LIBS@ @SACLIB_LIBS@ @GMP_LIBS@ @BLAS_LIBS@"
+ 	;;
+ 
+     *)
diff --git a/debian/patches/series b/debian/patches/series
index 4db24c4..5fd1c0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+example.patch
 soname.patch
diff --git a/debian/rules b/debian/rules
index d37e7e3..e357fa6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,7 @@ override_dh_auto_configure:
 		--with-blas \
 		--with-ntl \
 		--with-fplll \
+		--with-iml \
 		--with-m4ri \
 		--enable-optimization \
 		--enable-sage \

-- 
linbox: library for exact linear algebra