[lcalc] 01/03: Build with pari 2.7.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository lcalc.

commit 5e31b15ab68c985809212a1d94a62a7e8658078b
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Tue Apr 8 21:13:24 2014 +0200

    Build with pari 2.7.
---
 debian/changelog                                  |  9 ++++++++
 debian/patches/fix_pari_include.patch             | 28 +++++++++++++++++++++++
 debian/patches/{pari_2.5.patch => pari_2.7.patch} | 13 ++++++++++-
 debian/patches/series                             |  3 ++-
 4 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf7fc61..dfee3d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+lcalc (1.23+dfsg-2) UNRELEASED; urgency=medium
+
+  * Add patch fix_pari_include.patch:
+    Fix pari includes to work with Pari 2.7 in Debian. (Closes: #743327)
+  * Move pari_2.5.patch to pari_2.7.patch
+    and add add further change (call ellinit with 3 parameters). (Closes: #743327)
+
+ -- Tobias Hansen <thansen at debian.org>  Sun, 06 Apr 2014 21:28:14 +0200
+
 lcalc (1.23+dfsg-1) unstable; urgency=low
 
   * Repack tarball to remove binary file.
diff --git a/debian/patches/fix_pari_include.patch b/debian/patches/fix_pari_include.patch
new file mode 100644
index 0000000..fdf882e
--- /dev/null
+++ b/debian/patches/fix_pari_include.patch
@@ -0,0 +1,28 @@
+Description: Use the proper Pari include pari/pari.h
+ This is necessary for Pari 2.7 because it now uses multiarch
+ include paths.
+Author: Tobias Hansen <thansen at debian.org>
+Bug-Debian: http://bugs.debian.org/743327
+
+--- a/include/Lcommandline.h
++++ b/include/Lcommandline.h
+@@ -39,7 +39,7 @@
+ 
+ #include "Lcommandline_globals.h"      //command line global variables
+ #ifdef INCLUDE_PARI
+-#include "pari.h"          //for pari's elliptic curve functions
++#include "pari/pari.h"     //for pari's elliptic curve functions
+ #undef init                //pari has a '#define init pari_init' which
+                            //causes trouble with the stream.h init.
+                            //pari also causes trouble with things like abs.
+--- a/include/Lcommandline_elliptic.h
++++ b/include/Lcommandline_elliptic.h
+@@ -32,7 +32,7 @@
+ 
+ 
+ #ifdef INCLUDE_PARI
+-#include "pari.h"          //for pari's elliptic curve functions 
++#include "pari/pari.h"     //for pari's elliptic curve functions 
+ #undef init                //pari has a '#define init pari_init' which
+                            //causes trouble with the stream.h init.
+                            //pari also causes trouble with things like abs.
diff --git a/debian/patches/pari_2.5.patch b/debian/patches/pari_2.7.patch
similarity index 79%
rename from debian/patches/pari_2.5.patch
rename to debian/patches/pari_2.7.patch
index 868b686..6ff83a5 100644
--- a/debian/patches/pari_2.5.patch
+++ b/debian/patches/pari_2.7.patch
@@ -1,6 +1,8 @@
-Description: Port to pari 2.5 API
+Description: Port to pari 2.7 API
 Author: Luca Falavigna <dktrkranz at debian.org>
+        Tobias Hansen <thansen at debian.org>
 Bug-Debian: http://bugs.debian.org/635506
+            http://bugs.debian.org/743327
 
 --- a/src/Lcommandline.cc
 +++ b/src/Lcommandline.cc
@@ -32,3 +34,12 @@ Bug-Debian: http://bugs.debian.org/635506
  
      //gaffsg(a1,(GEN) F[1]);
      //gaffsg(a2,(GEN) F[2]);
+@@ -139,7 +139,7 @@
+     gaffect(strtoGEN(a4), (GEN) F[4]);
+     gaffect(strtoGEN(a6), (GEN) F[5]);
+ 
+-    E = initell(F,BIGDEFAULTPREC);
++    E = ellinit(F, NULL, BIGDEFAULTPREC);
+ 
+     C=globalreduction(E);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3a3703e..aa2e27a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 gcc.patch
-pari_2.5.patch
+pari_2.7.patch
 Makefile.patch
+fix_pari_include.patch

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