[SCM] lcalc: program for computing zeros and values of L-functions branch, master, updated. debian/0.0.20080205-1-2-g297eaff

[Tobias Hansen]

The following commit has been merged in the master branch:
commit 38020096687d051f719661359bf56aca11b87307
Author: Luca Falavigna <dktrkranz at debian.org>
Date:   Sun Aug 14 15:38:48 2011 +0200

    Imported Debian patch 0.0.20080205-1.1

diff --git a/debian/changelog b/debian/changelog
index 2639f09..59b8d67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+lcalc (0.0.20080205-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/gcc.patch:
+    - Fix FTBFS with newer gcc (Closes: #624986).
+  * debian/patches/pari_2.5.patch:
+    - Port to pari 2.5 API (Closes: #635506).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sun, 14 Aug 2011 15:38:48 +0200
+
 lcalc (0.0.20080205-1) unstable; urgency=low
 
   * Initial release (Closes: #480088).
diff --git a/debian/patches/gcc.patch b/debian/patches/gcc.patch
new file mode 100644
index 0000000..bdcfe75
--- /dev/null
+++ b/debian/patches/gcc.patch
@@ -0,0 +1,31 @@
+Index: lcalc-0.0.20080205/src/Lglobals.cc
+===================================================================
+--- lcalc-0.0.20080205.orig/src/Lglobals.cc	2011-08-14 15:40:07.580779750 +0200
++++ lcalc-0.0.20080205/src/Lglobals.cc	2011-08-14 15:43:45.080786413 +0200
+@@ -21,6 +21,7 @@
+ */
+ 
+ #include "Lglobals.h"
++#include <limits>
+ 
+ 
+ //-----Global variables---------------------------------------
+Index: lcalc-0.0.20080205/include/Lcommon.h
+===================================================================
+--- lcalc-0.0.20080205.orig/include/Lcommon.h	2011-08-14 15:43:54.724786708 +0200
++++ lcalc-0.0.20080205/include/Lcommon.h	2011-08-14 15:44:03.524786973 +0200
+@@ -26,10 +26,10 @@
+ inline double to_double(const double& x) { return x; }
+ #endif
+ //inline double to_double(const long double& x) { return x; }
+-inline double to_double(const int& x) { return x; }
+-inline double to_double(const long long& x) { return x; }
+-inline double to_double(const short& x) { return x; }
+-inline double to_double(const char& x) { return x; }
++//inline double to_double(const int& x) { return x; }
++//inline double to_double(const long long& x) { return x; }
++//inline double to_double(const short& x) { return x; }
++//inline double to_double(const char& x) { return x; }
+ #define Int(x) (int)(to_double(x))
+ #define Long(x) (Long)(to_double(x))
+ #define double(x) (double)(to_double(x))
diff --git a/debian/patches/pari_2.5.patch b/debian/patches/pari_2.5.patch
new file mode 100644
index 0000000..450b0f2
--- /dev/null
+++ b/debian/patches/pari_2.5.patch
@@ -0,0 +1,34 @@
+Index: lcalc-0.0.20080205/src/Lcommandline.cc
+===================================================================
+--- lcalc-0.0.20080205.orig/src/Lcommandline.cc	2011-08-14 15:38:30.412776773 +0200
++++ lcalc-0.0.20080205/src/Lcommandline.cc	2011-08-14 15:38:27.912776697 +0200
+@@ -422,7 +422,7 @@
+ 
+ #ifdef INCLUDE_PARI
+         if(do_elliptic_curve){
+-             allocatemoremem((int) N_terms*16+1000000); //XXXXXXXXX this should depend on whether we're double or long double or mpfr double
++             allocatemem((int) N_terms*16+1000000); //XXXXXXXXX this should depend on whether we're double or long double or mpfr double
+              if (my_verbose>0) cout << "Will precompute " << N_terms << " elliptic L-function dirichlet coefficients..." << endl;
+              initialize_new_L(a1,a2,a3,a4,a6,N_terms); 
+         }
+Index: lcalc-0.0.20080205/src/Lcommandline_elliptic.cc
+===================================================================
+--- lcalc-0.0.20080205.orig/src/Lcommandline_elliptic.cc	2011-08-14 15:38:30.352776771 +0200
++++ lcalc-0.0.20080205/src/Lcommandline_elliptic.cc	2011-08-14 15:38:27.912776697 +0200
+@@ -121,11 +121,11 @@
+ 
+ 
+     F = cgetg(6, t_VEC);
+-    F[1] = lgeti(BIGDEFAULTPREC);
+-    F[2] = lgeti(BIGDEFAULTPREC);
+-    F[3] = lgeti(BIGDEFAULTPREC);
+-    F[4] = lgeti(BIGDEFAULTPREC);
+-    F[5] = lgeti(BIGDEFAULTPREC);
++    F[1] = (long)cgeti(BIGDEFAULTPREC);
++    F[2] = (long)cgeti(BIGDEFAULTPREC);
++    F[3] = (long)cgeti(BIGDEFAULTPREC);
++    F[4] = (long)cgeti(BIGDEFAULTPREC);
++    F[5] = (long)cgeti(BIGDEFAULTPREC);
+ 
+     //gaffsg(a1,(GEN) F[1]);
+     //gaffsg(a2,(GEN) F[2]);
diff --git a/debian/patches/series b/debian/patches/series
index 7c7eee8..47f7164 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 lcalc-const-fixes.patch
+gcc.patch
+pari_2.5.patch

-- 
lcalc: program for computing zeros and values of L-functions