[linbox] 01/03: Start refreshing patches and update givaro build dep.

Fri Jul 29 12:46:13 UTC 2016

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

thansen pushed a commit to branch master
in repository linbox.

commit 9bb0ba1abe73804e0c88bddd680006c09a5b7e42
Author: Tobias Hansen <thansen at debian.org>
Date:   Fri Jul 29 12:15:35 2016 +0000

    Start refreshing patches and update givaro build dep.
---
 debian/changelog                       |  5 +++++
 debian/control                         |  2 +-
 debian/patches/example.patch           | 16 ----------------
 debian/patches/fix-RR-RecCounter.patch |  8 +++-----
 debian/patches/fix-doc-path.patch      |  8 ++++----
 debian/patches/series                  |  2 --
 debian/patches/soname.patch            | 19 ++++++++++---------
 7 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 381bc9e..6ae5329 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 linbox (1.4.1-1) UNRELEASED; urgency=medium
 
+  [ Doug Torrance ]
   * New upstream version.
   * debian/watch
     - Bump to version 4 and update download location.
 
+  [ Tobias Hansen ]
+  * Update build-depends for higher givaro version.
+  * Refresh patches.
+
  -- Doug Torrance <dtorrance at piedmont.edu>  Mon, 18 Jul 2016 10:06:53 -0400
 
 linbox (1.3.2-1.1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 25e18b0..be4d58a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Lifeng Sun <lifongsun at gmail.com>
 Homepage: http://www.linalg.org/
-Build-Depends: dh-autoreconf, debhelper (>= 8.0.0), libgivaro-dev (>= 3.7.1), libgivaro-dev (<< 3.8.0), libiml-dev, libntl-dev, libgmp-dev, libatlas-dev, libgsl0-dev, liblapack-dev, fflas-ffpack, libm4ri-dev, libm4rie-dev, libmpfr-dev, gnuplot
+Build-Depends: dh-autoreconf, debhelper (>= 8.0.0), libgivaro-dev (>= 4.0), libiml-dev, libntl-dev, libgmp-dev, libatlas-dev, libgsl0-dev, liblapack-dev, fflas-ffpack, libm4ri-dev, libm4rie-dev, libmpfr-dev, gnuplot
 Build-Depends-Indep: doxygen-latex, ghostscript, graphviz, texlive-math-extra, texlive-fonts-recommended
 Standards-Version: 3.9.4
 
diff --git a/debian/patches/example.patch b/debian/patches/example.patch
index f8b6c0c..6b25e7f 100644
--- a/debian/patches/example.patch
+++ b/debian/patches/example.patch
@@ -24,19 +24,3 @@ Fix example source related issues.
  
  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/fix-RR-RecCounter.patch b/debian/patches/fix-RR-RecCounter.patch
index 66d5f6b..fa528b5 100644
--- a/debian/patches/fix-RR-RecCounter.patch
+++ b/debian/patches/fix-RR-RecCounter.patch
@@ -30,12 +30,10 @@ correctly and an IEEE Invalid Operation condition exists. The result depends on
 the FP exception model currently active and the default result is 2^31-1
 (2147483647).
 
-Index: linbox-1.3.2/linbox/algorithms/rational-reconstruction-base.h
-===================================================================
---- linbox-1.3.2.orig/linbox/algorithms/rational-reconstruction-base.h	2012-06-09 02:13:48.000000000 +0000
-+++ linbox-1.3.2/linbox/algorithms/rational-reconstruction-base.h	2013-12-31 13:40:03.000000000 +0000
+--- a/linbox/algorithms/rational-reconstruction-base.h
++++ b/linbox/algorithms/rational-reconstruction-base.h
 @@ -73,7 +73,8 @@
- 				RecCounter = (int)sqrt((double)rbound_);//RecCounter^2 < rbound_ <=(RecCounter+1)^2
+ 				RecCounter = (size_t)sqrt((double)rbound_);//RecCounter^2 < rbound_ <=(RecCounter+1)^2
  			}
  			else if (_meth == GEOMETRIC) {
 -				RecCounter = (size_t) log((double)rbound_) ;//2^RecCounter < rbound_ <=2^(RecCounter+1)
diff --git a/debian/patches/fix-doc-path.patch b/debian/patches/fix-doc-path.patch
index 9714c80..172eec1 100644
--- a/debian/patches/fix-doc-path.patch
+++ b/debian/patches/fix-doc-path.patch
@@ -3,10 +3,10 @@ developer's documentation.
 
 --- a/doc/mainpage.doxy
 +++ b/doc/mainpage.doxy
-@@ -95,12 +95,14 @@
-  * - \subpage inst. Explains how to install from sources or from the latest svn
-  * version.
-  * - \subpage arch. Describes how %LinBox is organized
+@@ -100,12 +100,14 @@
+  * .
+  *
+  * \section docu Documentation
 - * - <a href="../linbox-html/index.html"     style="color: blue  ; font-weight:
 + * - <a href="index.html"     style="color: blue  ; font-weight:
   * bold"> Documentation for Users</a>. If everything around is blue, then you
diff --git a/debian/patches/series b/debian/patches/series
index 4733501..a494a55 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 example.patch
 soname.patch
 fix-doc-path.patch
-fix-gmp-detect.patch
-linboxsage-link-iml.patch
 fix-RR-RecCounter.patch
diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch
index 4040c1c..c4b5e93 100644
--- a/debian/patches/soname.patch
+++ b/debian/patches/soname.patch
@@ -2,20 +2,21 @@ Debian specific soname.
 
 --- a/linbox/Makefile.am
 +++ b/linbox/Makefile.am
-@@ -62,6 +62,7 @@
+@@ -61,7 +61,7 @@
+     $(MPFR_LIBS) $(IML_LIBS) $(OCL_LIBS)
  
- liblinbox_la_SOURCES = dummy.C
+ #Cygwin ?
+-liblinbox_la_LDFLAGS = $(DEPS_LIBS) $(LDFLAGS) -no-undefined
++liblinbox_la_LDFLAGS = $(DEPS_LIBS) $(LDFLAGS) -no-undefined -version-info 0:0:0 -release 1.4.1
  
-+liblinbox_la_LDFLAGS = -version-info 0:0:0 -release 1.3.2
- liblinbox_la_LIBADD =           \
-     util/libutil.la             \
-     randiter/libranditer.la     \
+ 
+ #  $(top_srcdir)/benchmarks/libbenchmarks.la \
 --- a/interfaces/sage/Makefile.am
 +++ b/interfaces/sage/Makefile.am
-@@ -35,5 +35,5 @@
+@@ -38,5 +38,5 @@
  #gentoo's linbox-1.1.6-fix-undefined-symbols.patch
  liblinboxsage_la_LIBADD = $(top_builddir)/linbox/liblinbox.la
  
--liblinboxsage_la_LDFLAGS =  $(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(MAPLE_LIBS) $(LDFLAGS) -version-info 0:0:0 #-Wl,-zmuldefs
-+liblinboxsage_la_LDFLAGS =  $(GIVARO_LIBS) $(GMP_LIBS) $(NTL_LIBS) $(BLAS_LIBS) $(MAPLE_LIBS) $(LDFLAGS) -version-info 0:0:0 -release 1.3.2 #-Wl,-zmuldefs
+-liblinboxsage_la_LDFLAGS = $(DEPS_LIBS) $(LDFLAGS) -version-info 0:0:0 #-Wl,-zmuldefs
++liblinboxsage_la_LDFLAGS = $(DEPS_LIBS) $(LDFLAGS) -version-info 0:0:0 -release 1.4.1 #-Wl,-zmuldefs
  endif

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

