[boinc-app-seti] 01/01: Upload to unstable

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository boinc-app-seti.

commit ae8cad4484b13a51af1e1a51dfb7e809e354488b
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Jul 14 11:53:41 2016 +0200

    Upload to unstable
---
 debian/changelog                  |  6 ++++--
 debian/patches/isnan-fix.patch    | 16 ++++++++++++++++
 debian/patches/series             |  4 +++-
 debian/patches/upstream-fix.patch | 11 +++++++++++
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5742515..01e8983 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-boinc-app-seti (8.00~svn3363-3) UNRELEASED; urgency=medium
+boinc-app-seti (8.00~svn3363-3) unstable; urgency=medium
 
   [ Steffen Moeller ]
   * Transition to auto-dbg packages
@@ -11,8 +11,10 @@ boinc-app-seti (8.00~svn3363-3) UNRELEASED; urgency=medium
 
   [ Gianfranco Costamagna ]
   * Fix VCS fields.
+  * Remove build fix for arm, preferring upstream fix.
+  * Fix build with gcc-6 and glib-2.23 (Closes: #831186)
 
- -- Steffen Moeller <moeller at debian.org>  Sat, 14 May 2016 12:38:26 +0200
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Thu, 14 Jul 2016 11:40:51 +0200
 
 boinc-app-seti (8.00~svn3363-2) unstable; urgency=medium
 
diff --git a/debian/patches/isnan-fix.patch b/debian/patches/isnan-fix.patch
new file mode 100644
index 0000000..ec78161
--- /dev/null
+++ b/debian/patches/isnan-fix.patch
@@ -0,0 +1,16 @@
+Description: Fix isnan bad reference
+Author: Gianfranco Costamagna <locutusofborg at debian.org>
+Bug-Debian: https://bugs.debian.org/831186
+
+--- boinc-app-seti-8.00~svn3363.orig/client/vector/analyzeFuncs_vector.cpp
++++ boinc-app-seti-8.00~svn3363/client/vector/analyzeFuncs_vector.cpp
+@@ -45,9 +45,7 @@
+ #include <csignal>
+ #include <cstdlib>
+ #include <cmath>
+-#ifdef __APPLE_CC__
+ #define isnan std::isnan
+-#endif
+ #include <signal.h>
+ #include <setjmp.h>
+ #ifdef HAVE_FLOAT_H
diff --git a/debian/patches/series b/debian/patches/series
index f0fe612..b296e94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,6 @@
 006_omitting_archs.patch
 007_worker_comments.patch
 216-fix-build.patch
-fix-arm-build.patch
+#fix-arm-build.patch
+isnan-fix.patch
+upstream-fix.patch
diff --git a/debian/patches/upstream-fix.patch b/debian/patches/upstream-fix.patch
new file mode 100644
index 0000000..44140b1
--- /dev/null
+++ b/debian/patches/upstream-fix.patch
@@ -0,0 +1,11 @@
+Description: cherry-pick little upstream fix for arm
+--- boinc-app-seti-8.00~svn3363.orig/client/vector/analyzeFuncs_vfp_aux.cpp
++++ boinc-app-seti-8.00~svn3363/client/vector/analyzeFuncs_vfp_aux.cpp
+@@ -47,6 +47,7 @@
+ #include "diagnostics.h"
+ #include "asmlib.h"
+ #include "pulsefind.h"
++#include "fp_arm.h"
+ 
+ 
+ template <int x>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc-app-seti.git