[SCM] linbox: library for exact linear algebra branch, master, updated. debian/1.1.6_rc0-4.1-8-g9d2c312

[Lifeng Sun]

The following commit has been merged in the master branch:
commit ce65ab687043111cc056ff4121e14b2b00e0ed33
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Aug 9 15:42:42 2011 +0800

    Remove patches.
    
    * long-long-fixes.patch.
    * ffpack.h.patch.
    * build-system.patch.

diff --git a/debian/patches/build-system.patch b/debian/patches/build-system.patch
deleted file mode 100644
index a9ccd2c..0000000
--- a/debian/patches/build-system.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: linbox-1.1.6~rc0/Makefile.am
-===================================================================
---- linbox-1.1.6~rc0.orig/Makefile.am	2009-09-13 22:56:58.000000000 -0400
-+++ linbox-1.1.6~rc0/Makefile.am	2009-09-13 22:57:51.000000000 -0400
-@@ -13,3 +13,5 @@
- bin_SCRIPTS=linbox-config
- 
- VERSION=1.1.6rc0
-+
-+ACLOCAL_AMFLAGS = -I macros
-Index: linbox-1.1.6~rc0/configure.in
-===================================================================
---- linbox-1.1.6~rc0.orig/configure.in	2009-09-13 22:56:58.000000000 -0400
-+++ linbox-1.1.6~rc0/configure.in	2009-09-13 22:57:07.000000000 -0400
-@@ -2,6 +2,7 @@
- #AC_INIT(linbox/linbox.doxy)
- AC_INIT(linbox, 1.1.6rc0,linbox-use at googlegroups.com) 
- AM_INIT_AUTOMAKE([1.8 gnu no-dependencies])
-+AC_CONFIG_MACRO_DIR([macros])
- AM_CONFIG_HEADER([config.h])
- AX_PREFIX_CONFIG_H(linbox/linbox-config.h, __LINBOX)
- 
-@@ -16,7 +17,6 @@
- CFLAGS=${CFLAGS:-$DEFAULT_CFLAGS}
- CXXFLAGS=${CXXFLAGS:-$DEFAULT_CFLAGS}
- 
--AM_ACLOCAL_INCLUDE(macros)
- 
- # work around to fix the backward compatibility issue of automake 1.10 with 1.9 (pb with MKDIR_P)
- AC_SUBST([MKDIR_P])
diff --git a/debian/patches/ffpack.h.patch b/debian/patches/ffpack.h.patch
deleted file mode 100644
index 3b0bb04..0000000
--- a/debian/patches/ffpack.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/linbox/ffpack/ffpack.h	2008-07-18 12:19:25.000000000 -0700
-+++ b/linbox/ffpack/ffpack.h	2008-07-18 12:19:56.000000000 -0700
-@@ -1306,7 +1306,7 @@
- 	static std::list<Polynomial>&
- 	CharPoly( const Field& F, std::list<Polynomial>& charp, const size_t N,
- 		  typename Field::Element * A, const size_t lda,
--		  const FFPACK_CHARPOLY_TAG CharpTag= FfpackArithProg);
-+		  const FFPACK_CHARPOLY_TAG CharpTag= FfpackLUK);
- 	
- 	/**
- 	 * Compute the minimal polynomial of (A,v) using an LUP 
diff --git a/debian/patches/long-long-fixes.patch b/debian/patches/long-long-fixes.patch
deleted file mode 100644
index 6713917..0000000
--- a/debian/patches/long-long-fixes.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: linbox-1.1.6~rc0/linbox/fflas/fflas_bounds.inl
-===================================================================
---- linbox-1.1.6~rc0.orig/linbox/fflas/fflas_bounds.inl	2008-07-08 23:21:43.000000000 -0400
-+++ linbox-1.1.6~rc0/linbox/fflas/fflas_bounds.inl	2008-07-08 23:24:25.000000000 -0400
-@@ -239,9 +239,9 @@
- 
- 	FFLAS_INT_TYPE pi;
- 	F.characteristic(pi);
--	unsigned long long p = pi, p1 = 1, p2 = 1;
-+	FFLAS_INT_TYPE p = pi, p1 = 1, p2 = 1;
- 	size_t nmax = 0;
--	unsigned long long max = ( (1ULL << (DOUBLE_MANTISSA + 1) ) / (p - 1));
-+	FFLAS_INT_TYPE max = ( (FFLAS_INT_TYPE)(1ULL << (DOUBLE_MANTISSA + 1) ) / (p - 1));
- 	while ( (p1 + p2) < max ){
- 		p1*=p;
- 		p2*=p-2;
-@@ -261,9 +261,9 @@
- 
- 	FFLAS_INT_TYPE pi;
- 	F.characteristic(pi);
--	unsigned long long p = pi, p1 = 1, p2 = 1;
-+	FFLAS_INT_TYPE p = pi, p1 = 1, p2 = 1;
- 	size_t nmax = 0;
--	unsigned long long max = ( (1ULL << (FLOAT_MANTISSA + 1) ) / (p - 1));
-+	FFLAS_INT_TYPE max = ( (FFLAS_INT_TYPE)(1ULL << (FLOAT_MANTISSA + 1) ) / (p - 1));
- 	while ( (p1 + p2) < max ){
- 		p1*=p;
- 		p2*=p-2;
-@@ -282,9 +282,9 @@
- 
- 	FFLAS_INT_TYPE pi;
- 	F.characteristic (pi);
--	unsigned long long p = (pi + 1) / 2, p1 = 1;
-+	FFLAS_INT_TYPE p = (pi + 1) / 2, p1 = 1;
- 	size_t nmax = 0;
--	unsigned long long max = ((1ULL << (DOUBLE_MANTISSA + 1)) / ((unsigned long long)(p - 1)));
-+	FFLAS_INT_TYPE max = ((FFLAS_INT_TYPE)(1ULL << (DOUBLE_MANTISSA + 1)) / ((FFLAS_INT_TYPE)(p - 1)));
- 	while (p1 < max){
- 		p1 *= p;
- 		nmax++;
-@@ -302,9 +302,9 @@
- 
- 	FFLAS_INT_TYPE pi;
- 	F.characteristic (pi);
--	unsigned long long p = (pi + 1) / 2, p1 = 1;
-+	FFLAS_INT_TYPE p = (pi + 1) / 2, p1 = 1;
- 	size_t nmax = 0;
--	unsigned long long max = ((1ULL << (FLOAT_MANTISSA + 1)) / ((unsigned long long) (pi - 1)));
-+	FFLAS_INT_TYPE max = ((FFLAS_INT_TYPE)(1ULL << (FLOAT_MANTISSA + 1)) / ((FFLAS_INT_TYPE) (pi - 1)));
- 	while (p1 < max){
- 		p1 *= p;
- 		nmax++;
diff --git a/debian/patches/series b/debian/patches/series
index c4b1477..308e69f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-long-long-fixes.patch
-ffpack.h.patch
 commentator.patch
-build-system.patch

-- 
linbox: library for exact linear algebra