[apophenia] 04/07: Imported Debian patch 0.999c+ds-1 (refresh)

[Jerome Benoit]

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

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

commit d1dd6395f1805b76a64997aee1a980833f5e1d4e
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Tue Dec 16 14:21:57 2014 +0100

    Imported Debian patch 0.999c+ds-1 (refresh)
---
 debian/changelog                           |  4 ++-
 debian/patches/series                      |  2 +-
 debian/patches/upstream-wipeout-exit.patch | 39 ------------------------------
 3 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cb83661..1901861 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,9 @@ apophenia (0.999c+ds-1) unstable; urgency=medium
 
   * New upstream version (Closes: #764904).
   * Debianization:
-    - debian/repack, refresh.
+    - debian/repack, refresh;
+    - debian/patches/upstream-wipeout-exit.patch, remove as it has been
+      integrated by the upstream author.
 
  -- Jerome Benoit <calculus at rezozer.net>  Wed, 10 Dec 2014 19:55:14 +0000
 
diff --git a/debian/patches/series b/debian/patches/series
index 3f54874..c7425e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-upstream-wipeout-exit.patch
+upstream-update-libtool.patch
 upstream-update-docs_doxygen_conf_in.patch
 debianization.patch
 debianization-help2man.patch
diff --git a/debian/patches/upstream-wipeout-exit.patch b/debian/patches/upstream-wipeout-exit.patch
deleted file mode 100644
index 92f1727..0000000
--- a/debian/patches/upstream-wipeout-exit.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: wipe out exit calls
- Wipe out exit calls as reported by lintian (shlib-calls-exit tag);
- meant to be submitted to the upstream maintainer.
-Origin: debian
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-09-09
-
---- a/apop_arms.c
-+++ b/apop_arms.c
-@@ -241,7 +241,7 @@
-   assert(isfinite(q->y));
- 
-   /* guard against imprecision yielding point outside interval */
--  if ((p->x < xl) || (p->x > xr)) exit(1);
-+  Apop_stopif( ((p->x < xl) || (p->x > xr)), return,-5, "imprecision yields point outside interval");
- }
- 
- int test(arms_state *env, POINT *p, apop_arms_settings *params, gsl_rng *r){
-@@ -364,7 +364,8 @@
-     q->pl = p->pl;
-     m->pr->pl = m;
-     q->pl->pr = q;
--  } else exit(10);// this should be impossible 
-+  } else
-+    Apop_stopif(1, return 1,-5, "unexpected event"); // this should be impossible
- 
-   /* now adjust position of q within interval if too close to an endpoint */
-   ql = q->pl->pl ? q->pl->pl : q->pl;
-@@ -503,8 +504,8 @@
- double area(POINT *q){
- /* To integrate piece of exponentiated envelope to left of POINT q */ 
- 
--  if(q->pl == NULL) // this is leftmost point in envelope 
--      exit(1);
-+  if(q->pl == NULL) // this is leftmost point in envelope
-+      Apop_stopif(1, return GSL_NAN,-5, "leftmost point in envelope");
-   if(q->pl->x == q->x) // interval is zero length
-       return 0.;
-   if (fabs(q->y - q->pl->y) < YEPS) // integrate straight line piece

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