tags 624986 + patch pending tags 635506 + patch pending thanks
Dear maintainer, I've prepared an NMU for lcalc (versioned as 0.0.20080205-1.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. : :' : Luca Falavigna <dktrkr...@debian.org> `. `' `-
diff -u lcalc-0.0.20080205/debian/changelog lcalc-0.0.20080205/debian/changelog
--- lcalc-0.0.20080205/debian/changelog
+++ lcalc-0.0.20080205/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 <dktrkr...@debian.org> Sun, 14 Aug 2011 15:38:48 +0200
+
lcalc (0.0.20080205-1) unstable; urgency=low
* Initial release (Closes: #480088).
diff -u lcalc-0.0.20080205/debian/patches/series lcalc-0.0.20080205/debian/patches/series
--- lcalc-0.0.20080205/debian/patches/series
+++ lcalc-0.0.20080205/debian/patches/series
@@ -1,0 +2,2 @@
+gcc.patch
+pari_2.5.patch
only in patch2:
unchanged:
--- lcalc-0.0.20080205.orig/include/Lcommon.h
+++ lcalc-0.0.20080205/include/Lcommon.h
@@ -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))
only in patch2:
unchanged:
--- lcalc-0.0.20080205.orig/debian/patches/gcc.patch
+++ lcalc-0.0.20080205/debian/patches/gcc.patch
@@ -0,0 +1,12 @@
+Index: lcalc-0.0.20080205/src/Lglobals.cc
+===================================================================
+--- lcalc-0.0.20080205.orig/src/Lglobals.cc 2011-08-14 15:37:39.716775220 +0200
++++ lcalc-0.0.20080205/src/Lglobals.cc 2011-08-14 15:37:38.336775179 +0200
+@@ -21,6 +21,7 @@
+ */
+
+ #include "Lglobals.h"
++#include <limits>
+
+
+ //-----Global variables---------------------------------------
only in patch2:
unchanged:
--- lcalc-0.0.20080205.orig/debian/patches/pari_2.5.patch
+++ lcalc-0.0.20080205/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]);
signature.asc
Description: OpenPGP digital signature
