[singular] 01/01: Imported Debian patch 4.0.3-p1+ds-4: RC #837016 fix (+ typo)

[Jerome Benoit]

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

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

commit 48214bbf5ce9a8c7f82d9ef016c30e34ea0f0ee3
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Thu Sep 29 11:49:52 2016 +0100

    Imported Debian patch 4.0.3-p1+ds-4: RC #837016 fix (+ typo)
---
 debian/changelog                                   |  9 +++++
 debian/control                                     |  2 +-
 debian/patches/series                              |  1 +
 .../upstream-bug-837016-doxygen-ax-update.patch    | 17 +++++++++
 .../upstream-lintian-spelling-error-silence.patch  | 43 +++++++++++++++++++++-
 5 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4837400..461f287 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+singular (4.0.3-p1+ds-4) unstable; urgency=medium
+
+  * RC fix (Closes: #837016), fix ax_prog_doxygen.m4 update issue.
+  * Debianization:
+    - debian/patches/:
+      - d/p/upstream-lintian-spelling-error-silence.patch, refresh.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Thu, 29 Sep 2016 10:48:09 +0000
+
 singular (4.0.3-p1+ds-3) unstable; urgency=medium
 
   * RC fix (Closes: #831072), fix gcc-6 transition issue.
diff --git a/debian/control b/debian/control
index 4d93d68..15fecf3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Jerome Benoit <calculus at rezozer.net>
 Build-Depends:
  debhelper (>= 9),
- autotools-dev, autoconf-archive, dh-autoreconf, libtool, help2man,
+ autotools-dev, autoconf-archive (>= 20160320), dh-autoreconf, libtool, help2man,
  libreadline6-dev,
  libgmp-dev, libmpfr-dev, libglpk-dev, libcdd-dev, libflint-dev, libntl-dev,
  graphviz, 4ti2, normaliz, surf-alggeo,
diff --git a/debian/patches/series b/debian/patches/series
index 9331186..6586ea3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+upstream-bug-837016-doxygen-ax-update.patch
 upstream-bug-831072-gcc_6_1_1-segfault.patch
 upstream-bug-831072-hidden-segfault.patch
 upstream-lintian-spelling-error-silence.patch
diff --git a/debian/patches/upstream-bug-837016-doxygen-ax-update.patch b/debian/patches/upstream-bug-837016-doxygen-ax-update.patch
new file mode 100644
index 0000000..1d0e2b4
--- /dev/null
+++ b/debian/patches/upstream-bug-837016-doxygen-ax-update.patch
@@ -0,0 +1,17 @@
+Description: Fix FTBFS #837016 with recent ax_prog_doxygen.m4
+ Requires autoconf-archive (>= 20160320), thanks Tobias Frost.
+Forwarded: https://github.com/Singular/Sources/pull/794
+Author: Graham Inggs <ginggs at debian.org>
+Last-Update: 2016-09-29
+
+--- a/factory/Makefile.am
++++ b/factory/Makefile.am
+@@ -176,7 +176,7 @@
+ 
+ ####################################################
+ # Documentation
+-include $(srcdir)/aminclude.am
++ at DX_RULES@
+ 
+ ####################################################
+ # the precomputed GF(q)-tables
diff --git a/debian/patches/upstream-lintian-spelling-error-silence.patch b/debian/patches/upstream-lintian-spelling-error-silence.patch
index 56cc2e2..9380c85 100644
--- a/debian/patches/upstream-lintian-spelling-error-silence.patch
+++ b/debian/patches/upstream-lintian-spelling-error-silence.patch
@@ -3,10 +3,12 @@ Description: source typo
  meant to silence lintian and eventually to be submitted to the
  upstream maintainer.
 Origin: debian
-Forwarded: https://github.com/Singular/Sources/pull/761
+Forwarded:
+ https://github.com/Singular/Sources/pull/761
+ https://github.com/Singular/Sources/pull/793
 Comment: spelling-error-in-binary
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-04-27
+Last-Update: 2016-09-29
 
 --- a/Singular/feOptTab.h
 +++ b/Singular/feOptTab.h
@@ -30,3 +32,40 @@ Last-Update: 2016-04-27
          return -1;
        }
        bucket[optSum[c].set]++;
+--- a/libpolys/coeffs/longrat.cc
++++ b/libpolys/coeffs/longrat.cc
+@@ -578,7 +578,7 @@
+   if (a==INT_TO_SR(0))
+      return 0; /* rational 0*/
+   if (SR_HDL(a) & SR_INT)
+-     return 1; /* immidiate int */
++     return 1; /* immediate int */
+   int s=a->z[0]._mp_alloc;
+ //  while ((s>0) &&(a->z._mp_d[s]==0L)) s--;
+ //#if SIZEOF_LONG == 8
+--- a/libpolys/coeffs/longrat.h
++++ b/libpolys/coeffs/longrat.h
+@@ -102,7 +102,7 @@
+   n_Test(q, r);
+ 
+   if (SR_HDL(q) & SR_INT)
+-    return TRUE; // immidiate int
++    return TRUE; // immediate int
+ 
+   return ( q->s == 3 );
+ }
+--- a/factory/NTLconvert.cc
++++ b/factory/NTLconvert.cc
+@@ -205,10 +205,10 @@
+     if (!i.coeff().isImm())
+     {
+       #ifndef NOSTREAMIO
+-      cout<<"convertFacCF2NTLGF2X: coefficient not immidiate! : " << f << "\n";
++      cout<<"convertFacCF2NTLGF2X: coefficient not immediate! : " << f << "\n";
+       #else
+       //NTL_SNS
+-      printf("convertFacCF2NTLGF2X: coefficient not immidiate!");
++      printf("convertFacCF2NTLGF2X: coefficient not immediate!");
+       #endif
+       NTL_SNS exit(1);
+     }

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