[pari-sage] 01/03: Integrate perl-no-dot-in-inc patch from pari[-main]

[Jerome Benoit]

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

calculus-guest pushed a commit to branch master
in repository pari-sage.

commit 104a2e5e06479d0e33c51193b89ef16a5c632a08
Author: Jerome BENOIT <quartermaster at rezozer.net>
Date:   Sat Sep 24 02:11:15 2016 +0100

    Integrate perl-no-dot-in-inc patch from pari[-main]
---
 debian/changelog                  |  6 ++++++
 debian/patches/perl-no-dot-in-inc | 38 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 debian/patches/stackwarn.patch    |  6 +++---
 4 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91f1005..27b4236 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pari (2.8-2771-gb70b447-2) unstable-sage; urgency=medium
+
+  * Apply perl-no-dot-in-inc from pari[-main]-2.7.6 (Bill Allombert).
+
+ -- Jerome Benoit <calculus at rezozer.net>  Sat, 24 Sep 2016 01:09:29 +0000
+
 pari (2.8-2771-gb70b447-1) unstable-sage; urgency=medium
 
   * Import pari snapshot from Sage 7.3.
diff --git a/debian/patches/perl-no-dot-in-inc b/debian/patches/perl-no-dot-in-inc
new file mode 100644
index 0000000..99354f3
--- /dev/null
+++ b/debian/patches/perl-no-dot-in-inc
@@ -0,0 +1,38 @@
+commit 62d4308a25987dd3c5538578ffd38d088eac2596
+Author: Bill Allombert <Bill.Allombert at math.u-bordeaux1.fr>
+Date:   Mon Sep 5 14:28:16 2016 +0200
+
+    perl: add explicit "." in @INC
+    
+    perl 5.26 will remove "." from @INC
+
+Index: pari-2.7.6/src/desc/doc_make
+===================================================================
+--- pari-2.7.6.orig/src/desc/doc_make
++++ pari-2.7.6/src/desc/doc_make
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl
++BEGIN { @INC=(".", at INC); }
+ use warnings;
+ use strict;
+ use PARI::822;
+Index: pari-2.7.6/src/desc/gen_proto
+===================================================================
+--- pari-2.7.6.orig/src/desc/gen_proto
++++ pari-2.7.6/src/desc/gen_proto
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++BEGIN { @INC=(".", at INC); }
+ use PARI::822;
+ 
+ $class=$ARGV[0];
+Index: pari-2.7.6/src/desc/merge_822
+===================================================================
+--- pari-2.7.6.orig/src/desc/merge_822
++++ pari-2.7.6/src/desc/merge_822
+@@ -1,4 +1,5 @@
+ #!/usr/bin/perl -w
++BEGIN { @INC=(".", at INC); }
+ use PARI::822;
+ 
+ open(IN, $ARGV[0]) || die "cannot find $ARGV[0]";
diff --git a/debian/patches/series b/debian/patches/series
index 7ed031b..d348dae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 enable_build_envvar
 perl-warning-non-fatal
+perl-no-dot-in-inc
 stackwarn.patch
diff --git a/debian/patches/stackwarn.patch b/debian/patches/stackwarn.patch
index a051c24..8761929 100644
--- a/debian/patches/stackwarn.patch
+++ b/debian/patches/stackwarn.patch
@@ -6,7 +6,7 @@ Date:   Thu Jan 14 10:13:39 2016 +0100
 
 --- a/src/language/init.c
 +++ b/src/language/init.c
-@@ -741,7 +741,8 @@
+@@ -742,7 +742,8 @@
    evalstate_reset();
    paristack_setsize(pari_mainstack->rsize, newsize);
    s = pari_mainstack->vsize ? pari_mainstack->vsize : pari_mainstack->rsize;
@@ -16,7 +16,7 @@ Date:   Thu Jan 14 10:13:39 2016 +0100
    pari_init_errcatch();
    cb_pari_err_recover(-1);
  }
-@@ -755,7 +756,8 @@
+@@ -756,7 +757,8 @@
      pari_mainstack_resize(pari_mainstack, newsize, vsize);
    evalstate_reset();
    s = pari_mainstack->rsize;
@@ -26,7 +26,7 @@ Date:   Thu Jan 14 10:13:39 2016 +0100
    pari_init_errcatch();
    cb_pari_err_recover(-1);
  }
-@@ -769,7 +771,8 @@
+@@ -770,7 +772,8 @@
    newsize = maxuu(minuu(newsize, vsize), pari_mainstack->size);
    pari_mainstack->size = newsize;
    pari_mainstack->bot = pari_mainstack->top - pari_mainstack->size;

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