[med-svn] [primer3] 01/04: Fix build with gcc-7

[Andreas Tille]

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

tille pushed a commit to tag debian/2.3.7-4
in repository primer3.

commit 21dae9703aba1b4769352d7df9a4e281f8f5be37
Author: Andreas Tille <tille at debian.org>
Date:   Sat Aug 26 06:49:50 2017 +0200

    Fix build with gcc-7
---
 debian/changelog                                   |  7 +++++++
 debian/patches/gcc-7.patch                         | 22 ++++++++++++++++++++++
 ...rimer_thermodynamic_parameters_path_2_etc.patch |  2 +-
 debian/patches/series                              |  1 +
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f515012..e70881e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+primer3 (2.3.7-4) UNRELEASED; urgency=medium
+
+  * Fix build with gcc-7
+    Closes: #853621
+
+ -- Andreas Tille <tille at debian.org>  Sat, 26 Aug 2017 00:32:40 +0200
+
 primer3 (2.3.7-3) unstable; urgency=medium
 
   [ Andreas Tille ]
diff --git a/debian/patches/gcc-7.patch b/debian/patches/gcc-7.patch
new file mode 100644
index 0000000..a92d0e7
--- /dev/null
+++ b/debian/patches/gcc-7.patch
@@ -0,0 +1,22 @@
+Author:  Andreas Tille <tille at debian.org>
+Last-Update: Sat, 26 Aug 2017 00:32:40 +0200
+Bug-Debian: https://bugs.debian.org/853621
+Description: Fix build with gcc-7
+
+--- a/src/thal.c
++++ b/src/thal.c
+@@ -426,12 +426,12 @@ thal(const unsigned char *oligo_f,
+ 	       "Illegal type");
+    o->align_end_1 = -1;
+    o->align_end_2 = -1;
+-   if ('\0' == oligo_f) {
++   if ('\0' == oligo_f[0]) {
+       strcpy(o->msg, "Empty first sequence");
+       o->temp = 0.0;
+       return;
+    }
+-   if ('\0' == oligo_r) {
++   if ('\0' == oligo_r[0]) {
+       strcpy(o->msg, "Empty second sequence");
+       o->temp = 0.0;
+       return;
diff --git a/debian/patches/primer_thermodynamic_parameters_path_2_etc.patch b/debian/patches/primer_thermodynamic_parameters_path_2_etc.patch
index 6a98c75..1aa6e39 100644
--- a/debian/patches/primer_thermodynamic_parameters_path_2_etc.patch
+++ b/debian/patches/primer_thermodynamic_parameters_path_2_etc.patch
@@ -46,7 +46,7 @@ Description: Configuration in /etc
         fprintf(stderr, "Error: thermodynamic approach chosen, but path to thermodynamic parameters not specified\n");
 --- a/src/release_notes.txt
 +++ b/src/release_notes.txt
-@@ -151,9 +151,9 @@ defaults.  The default is --default_vers
+@@ -218,9 +218,9 @@ defaults.  The default is --default_vers
  1.5 IMPORTANT: because PRIMER_THERMODYNAMIC_ALIGNMENT=1,
  PRIMER_THERMODYNAMIC_PARAMETERS_PATH must point to the right location.
  This tag specifies the path to the directory that contains all the
diff --git a/debian/patches/series b/debian/patches/series
index 57fd44a..aa970b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 hardening.patch
 primer_thermodynamic_parameters_path_2_etc.patch
+gcc-7.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/primer3.git